Skip to contentSkip to conversation

use valid btf in bpf_program__set_attach_target(prog, 0, ...);

PATCH Superseded Luigi Rizzo 3 participants 4 messages Oct 5, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 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 using libbpf_find_vmlinux_btf_id()

(on a side note: it is unclear whether btf_vmlinux is meant to be just temporary storage for use in bpf_object__load_xattr(), or a property of bpf_object, in which case it could be initialuzed opportunistically, and properly released in bpf_object__close() ).

---
 tools/lib/bpf/libbpf.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
tools/lib/bpf/libbpf.c +2 -3
index a4f55f8a460d..33bf102259dd 100644
@@ -10353,9 +10353,8 @@ int bpf_program__set_attach_target(struct bpf_program *prog,
 		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,
-					       prog->expected_attach_type);
+		btf_id = libbpf_find_vmlinux_btf_id(attach_func_name,
+						    prog->expected_attach_type);
 
 	if (btf_id < 0)
 		return btf_id;
Signature · 1 line
2.28.0.806.g8561365e88-goog
Acked-by on v2 1/1
#1 lore raw
Quoted 11 lines · Luigi Rizzo

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 using libbpf_find_vmlinux_btf_id()

(on a side note: it is unclear whether btf_vmlinux is meant to be just temporary storage for use in bpf_object__load_xattr(), or a property of bpf_object, in which case it could be initialuzed opportunistically, and properly released in bpf_object__close() ).

It's more of a former. vmlinux BTF shouldn't be needed past bpf_object's load phase, so there is no need to keep a few megabytes of memory laying around needlessly.

Quoted 11 lines
---
 tools/lib/bpf/libbpf.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
tools/lib/bpf/libbpf.c +0 -0
index a4f55f8a460d..33bf102259dd 100644

tools/lib/bpf/libbpf.c int bpf_program__set_attach_target(struct bpf_program *prog, · line 10357

Quoted 8 lines
tools/lib/bpf/libbpf.c +2 -3
@@ -10353,9 +10353,8 @@ int bpf_program__set_attach_target(struct bpf_program *prog,
                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,
-                                              prog->expected_attach_type);
+               btf_id = libbpf_find_vmlinux_btf_id(attach_func_name,
+                                                   prog->expected_attach_type);

It's a bit inefficient, if you need to do this for a few programs, but it's ok as a fix. We'll need to unify this internal vmlinux BTF caching at some point.

Quoted 6 lines
tools/lib/bpf/libbpf.c +0 -1
        if (btf_id < 0)
                return btf_id;
--

2.28.0.806.g8561365e88-goog

maintainer
#2 lore raw
Quoted 8 lines · Andrii Nakryiko
Quoted 7 lines · Luigi Rizzo

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 using libbpf_find_vmlinux_btf_id()

Quoted 8 lines
Quoted 4 lines

(on a side note: it is unclear whether btf_vmlinux is meant to be just temporary storage for use in bpf_object__load_xattr(), or a property of bpf_object, in which case it could be initialuzed opportunistically, and properly released in bpf_object__close() ).

It's more of a former. vmlinux BTF shouldn't be needed past bpf_object's load phase, so there is no need to keep a few megabytes of memory laying around needlessly.

Could you send a v3 with updated commit message wrt side note and prepend e.g. 'bpf, libbpf: ' into subject prefix?

Please also carry Andrii's ACK forward.

Quoted 32 lines
Quoted 10 lines
---
  tools/lib/bpf/libbpf.c | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
tools/lib/bpf/libbpf.c +0 -0
index a4f55f8a460d..33bf102259dd 100644

tools/lib/bpf/libbpf.c int bpf_program__set_attach_target(struct bpf_program *prog, · line 10357

Quoted 8 lines
tools/lib/bpf/libbpf.c +2 -3
@@ -10353,9 +10353,8 @@ int bpf_program__set_attach_target(struct bpf_program *prog,
                 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,
-                                              prog->expected_attach_type);
+               btf_id = libbpf_find_vmlinux_btf_id(attach_func_name,
+                                                   prog->expected_attach_type);

It's a bit inefficient, if you need to do this for a few programs, but it's ok as a fix. We'll need to unify this internal vmlinux BTF caching at some point.

Quoted 6 lines
tools/lib/bpf/libbpf.c +0 -1
         if (btf_id < 0)
                 return btf_id;
--

2.28.0.806.g8561365e88-goog

#3 lore raw
Quoted 1 line · Daniel Borkmann

...

Quoted 4 lines

Could you send a v3 with updated commit message wrt side note and prepend e.g. 'bpf, libbpf: ' into subject prefix?

Please also carry Andrii's ACK forward.

done (note the subject change in v3)

thanks
luigi