diff options
| author |   Kui-Feng Lee <thinker.li@gmail.com> | 2024-01-19 14:49:57 -0800 |
|---|---|---|
| committer |   Martin KaFai Lau <martin.lau@kernel.org> | 2024-01-23 16:37:44 -0800 |
| commit | 1338b93346587a2a6ac79bbcf55ef5b357745573 (patch) | |
| tree | 3200810e4d2c138d8ecec7ab4303446db88a1bf7 /kernel/bpf/syscall.c | |
| parent | bpf: make struct_ops_map support btfs other than btf_vmlinux. (diff) | |
| download | linux-1338b93346587a2a6ac79bbcf55ef5b357745573.tar.xz linux-1338b93346587a2a6ac79bbcf55ef5b357745573.zip | |
bpf: pass btf object id in bpf_map_info.
Include btf object id (btf_obj_id) in bpf_map_info so that tools (ex:
bpftools struct_ops dump) know the correct btf from the kernel to look up
type information of struct_ops types.
Since struct_ops types can be defined and registered in a module. The
type information of a struct_ops type are defined in the btf of the
module defining it. The userspace tools need to know which btf is for
the module defining a struct_ops type.
Signed-off-by: Kui-Feng Lee <thinker.li@gmail.com>
Link: https://lore.kernel.org/r/20240119225005.668602-7-thinker.li@gmail.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Diffstat (limited to 'kernel/bpf/syscall.c')
| -rw-r--r-- | kernel/bpf/syscall.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 13193aaafb64..55b458429705 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -4691,6 +4691,8 @@ static int bpf_map_get_info_by_fd(struct file *file, info.btf_value_type_id = map->btf_value_type_id; } info.btf_vmlinux_value_type_id = map->btf_vmlinux_value_type_id; + if (map->map_type == BPF_MAP_TYPE_STRUCT_OPS) + bpf_map_struct_ops_info_fill(&info, map); if (bpf_map_is_offloaded(map)) { err = bpf_map_offload_info_fill(&info, map); |