Skip to content

Commit fe9d049

Browse files
eddyz87anakryiko
authored andcommitted
libbpf: Sync progs autoload with maps autocreate for struct_ops maps
Automatically select which struct_ops programs to load depending on which struct_ops maps are selected for automatic creation. E.g. for the BPF code below: SEC("struct_ops/test_1") int BPF_PROG(foo) { ... } SEC("struct_ops/test_2") int BPF_PROG(bar) { ... } SEC(".struct_ops.link") struct test_ops___v1 A = { .foo = (void *)foo }; SEC(".struct_ops.link") struct test_ops___v2 B = { .foo = (void *)foo, .bar = (void *)bar, }; And the following libbpf API calls: bpf_map__set_autocreate(skel->maps.A, true); bpf_map__set_autocreate(skel->maps.B, false); The autoload would be enabled for program 'foo' and disabled for program 'bar'. During load, for each struct_ops program P, referenced from some struct_ops map M: - set P.autoload = true if M.autocreate is true for some M; - set P.autoload = false if M.autocreate is false for all M; - don't change P.autoload, if P is not referenced from any map. Do this after bpf_object__init_kern_struct_ops_maps() to make sure that shadow vars assignment is done. Signed-off-by: Eduard Zingerman <[email protected]> Signed-off-by: Andrii Nakryiko <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 1863acc commit fe9d049

File tree

1 file changed

+43
-0
lines changed

1 file changed

+43
-0
lines changed

tools/lib/bpf/libbpf.c

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,48 @@ static bool is_valid_st_ops_program(struct bpf_object *obj,
10311031
return false;
10321032
}
10331033

1034+
/* For each struct_ops program P, referenced from some struct_ops map M,
1035+
* enable P.autoload if there are Ms for which M.autocreate is true,
1036+
* disable P.autoload if for all Ms M.autocreate is false.
1037+
* Don't change P.autoload for programs that are not referenced from any maps.
1038+
*/
1039+
static int bpf_object_adjust_struct_ops_autoload(struct bpf_object *obj)
1040+
{
1041+
struct bpf_program *prog, *slot_prog;
1042+
struct bpf_map *map;
1043+
int i, j, k, vlen;
1044+
1045+
for (i = 0; i < obj->nr_programs; ++i) {
1046+
int should_load = false;
1047+
int use_cnt = 0;
1048+
1049+
prog = &obj->programs[i];
1050+
if (prog->type != BPF_PROG_TYPE_STRUCT_OPS)
1051+
continue;
1052+
1053+
for (j = 0; j < obj->nr_maps; ++j) {
1054+
map = &obj->maps[j];
1055+
if (!bpf_map__is_struct_ops(map))
1056+
continue;
1057+
1058+
vlen = btf_vlen(map->st_ops->type);
1059+
for (k = 0; k < vlen; ++k) {
1060+
slot_prog = map->st_ops->progs[k];
1061+
if (prog != slot_prog)
1062+
continue;
1063+
1064+
use_cnt++;
1065+
if (map->autocreate)
1066+
should_load = true;
1067+
}
1068+
}
1069+
if (use_cnt)
1070+
prog->autoload = should_load;
1071+
}
1072+
1073+
return 0;
1074+
}
1075+
10341076
/* Init the map's fields that depend on kern_btf */
10351077
static int bpf_map__init_kern_struct_ops(struct bpf_map *map)
10361078
{
@@ -8175,6 +8217,7 @@ static int bpf_object_load(struct bpf_object *obj, int extra_log_level, const ch
81758217
err = err ? : bpf_object__resolve_externs(obj, obj->kconfig);
81768218
err = err ? : bpf_object__sanitize_maps(obj);
81778219
err = err ? : bpf_object__init_kern_struct_ops_maps(obj);
8220+
err = err ? : bpf_object_adjust_struct_ops_autoload(obj);
81788221
err = err ? : bpf_object__relocate(obj, obj->btf_custom_path ? : target_btf_path);
81798222
err = err ? : bpf_object__sanitize_and_load_btf(obj);
81808223
err = err ? : bpf_object__create_maps(obj);

0 commit comments

Comments
 (0)