use valid btf in bpf_program__set_attach_target(prog, 0, ...);
PATCH 1/1 use valid btf in bpf_program__set_attach_target(prog, 0, ...);
bpf_program__set_attach_target() will always fail with fd=0 (attach to a kernel symbol) because obj->btf_vmlinux is NULL and there is no way to set it.
Fix this by explicitly calling libbpf_find_kernel_btf() in the function.
--- tools/lib/bpf/libbpf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
tools/lib/bpf/libbpf.c +6 -3
@@ -10352,10 +10352,13 @@ int bpf_program__set_attach_target(struct bpf_program *prog,if (attach_prog_fd) btf_id =libbpf_find_prog_btf_id (attach_func_name, attach_prog_fd); -else - btf_id =__find_vmlinux_btf_id (prog->obj->btf_vmlinux, - attach_func_name, +else { +struct btf *btf =libbpf_find_kernel_btf (); + + btf_id =__find_vmlinux_btf_id (btf, attach_func_name, prog->expected_attach_type); +btf__free (btf); + }if (btf_id <0 )return btf_id;
Signature · 1 line
2.28.0.806.g8561365e88-goog
Quoted 19 lines · Luigi Rizzo
bpf_program__set_attach_target()will always fail with fd=0 (attach to a kernel symbol) becauseobj->btf_vmlinuxis NULL and there is no way to set it.Fix this by explicitly calling
libbpf_find_kernel_btf()in the function.Signed-off-by Luigi Rizzo <[email protected]>--- tools/lib/bpf/libbpf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)tools/lib/bpf/libbpf.c +0
-0@@ -10352,10 +10352,13 @@ int bpf_program__set_attach_target(struct bpf_program *prog,if (attach_prog_fd) btf_id =libbpf_find_prog_btf_id (attach_func_name, attach_prog_fd);
tools/lib/bpf/libbpf.c int bpf_program__set_attach_target(struct bpf_program *prog, · line 10361
Quoted 10 lines
tools/lib/bpf/libbpf.c +6
-3-else - btf_id =__find_vmlinux_btf_id (prog->obj->btf_vmlinux, - attach_func_name, +else { +struct btf *btf =libbpf_find_kernel_btf (); + + btf_id =__find_vmlinux_btf_id (btf, attach_func_name, prog->expected_attach_type); +btf__free (btf); + }
Doesn't feel this is right fix. In libbpf, we have API function
libbpf_find_vmlinux_btf_id
just doing the above.
Also, could you point out why btf_vmlinux is NULL? Is this related to fd = 0? We probably
should fix the problem there since what if other API functions like bpf_program__set_attach_target() wants btf_vmlinux. We should not duplicate this logic to other API functions.
Quoted 4 lines
tools/lib/bpf/libbpf.c +0
-0if (btf_id <0 )return btf_id;
Quoted 29 lines · Yonghong Song
Quoted 25 lines · Luigi Rizzo
bpf_program__set_attach_target()will always fail with fd=0 (attach to a kernel symbol) becauseobj->btf_vmlinuxis NULL and there is no way to set it.Fix this by explicitly calling
libbpf_find_kernel_btf()in the function.Signed-off-by Luigi Rizzo <[email protected]>--- tools/lib/bpf/libbpf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)tools/lib/bpf/libbpf.c +3
-3@@ -10352,10 +10352,13 @@ int bpf_program__set_attach_target(struct bpf_program *prog,if (attach_prog_fd) btf_id =libbpf_find_prog_btf_id (attach_func_name, attach_prog_fd); -else - btf_id = __find_vmlinux_btf_id(prog->obj->btf_vmlinux, - attach_func_name, +else { +struct btf *btf =libbpf_find_kernel_btf (); +
Quoted 8 lines
tools/lib/bpf/libbpf.c int bpf_program__set_attach_target(struct bpf_program *prog, · line 10361
Quoted 4 lines
tools/lib/bpf/libbpf.c +3
-0+ btf_id =__find_vmlinux_btf_id (btf, attach_func_name, prog->expected_attach_type); +btf__free (btf); + }Doesn't feel this is right fix. In libbpf, we have API function
libbpf_find_vmlinux_btf_id
just doing the above.
nice, that makes the fix even simpler, will post an update:
- btf_id = __find_vmlinux_btf_id(prog->obj->btf_vmlinux,
+ btf_id = libbpf_find_vmlinux_btf_id(attach_func_name,
Quoted 6 lines
Also, could you point out why
btf_vmlinuxis NULL? Is this related to fd = 0? We probably
should fix the problem there since what if other API functions likebpf_program__set_attach_target()wantsbtf_vmlinux. We should not duplicate this logic to other API functions.
As I mentioned in a previous post, I don't know how btf_vmlinux is meant to be used. To me it looks more like temporary storage for use in bpf_object__load_xattr() than a property of bpf_object (in that case it should be released in bpf_object__close() ).
I'd probably fix the current bug now, and wait for the original author to communicate the intent and decide on followup changes.
thanks
luigi