Skip to content

Commit 8b7b0e5

Browse files
Byte-Labanakryiko
authored andcommitted
bpf: Load vmlinux btf for any struct_ops map
In libbpf, when determining whether we need to load vmlinux btf, we're currently (among other things) checking whether there is any struct_ops program present in the object. This works for most realistic struct_ops maps, as a struct_ops map is of course typically composed of one or more struct_ops programs. However, that technically need not be the case. A struct_ops interface could be defined which allows a map to be specified which one or more non-prog fields, and which provides default behavior if no struct_ops progs is actually provided otherwise. For sched_ext, for example, you technically only need to specify the name of the scheduler in the struct_ops map, with the core scheduler logic providing default behavior if no prog is actually specified. If we were to define and try to load such a struct_ops map, we would crash in libbpf when initializing it as obj->btf_vmlinux will be NULL: Reading symbols from minimal... (gdb) r Starting program: minimal_example [Thread debugging using libthread_db enabled] Using host libthread_db library "/usr/lib/libthread_db.so.1". Program received signal SIGSEGV, Segmentation fault. 0x000055555558308c in btf__type_cnt (btf=0x0) at btf.c:612 612 return btf->start_id + btf->nr_types; (gdb) bt type_name=0x5555555d99e3 "sched_ext_ops", kind=4) at btf.c:914 kind=4) at btf.c:942 type=0x7fffffffe558, type_id=0x7fffffffe548, ... data_member=0x7fffffffe568) at libbpf.c:948 kern_btf=0x0) at libbpf.c:1017 at libbpf.c:8059 So as to account for such bare-bones struct_ops maps, let's update obj_needs_vmlinux_btf() to also iterate over an obj's maps and check whether any of them are struct_ops maps. Signed-off-by: David Vernet <[email protected]> Signed-off-by: Andrii Nakryiko <[email protected]> Reviewed-by: Alan Maguire <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 483af46 commit 8b7b0e5

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

tools/lib/bpf/libbpf.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,9 +3054,15 @@ static bool prog_needs_vmlinux_btf(struct bpf_program *prog)
30543054
return false;
30553055
}
30563056

3057+
static bool map_needs_vmlinux_btf(struct bpf_map *map)
3058+
{
3059+
return bpf_map__is_struct_ops(map);
3060+
}
3061+
30573062
static bool obj_needs_vmlinux_btf(const struct bpf_object *obj)
30583063
{
30593064
struct bpf_program *prog;
3065+
struct bpf_map *map;
30603066
int i;
30613067

30623068
/* CO-RE relocations need kernel BTF, only when btf_custom_path
@@ -3081,6 +3087,11 @@ static bool obj_needs_vmlinux_btf(const struct bpf_object *obj)
30813087
return true;
30823088
}
30833089

3090+
bpf_object__for_each_map(map, obj) {
3091+
if (map_needs_vmlinux_btf(map))
3092+
return true;
3093+
}
3094+
30843095
return false;
30853096
}
30863097

0 commit comments

Comments
 (0)