Commit 8cee9107 authored by Luigi Rizzo's avatar Luigi Rizzo Committed by Alexei Starovoitov

bpf, libbpf: Use valid btf in bpf_program__set_attach_target

bpf_program__set_attach_target(prog, fd, ...) will always fail when
fd = 0 (attach to a kernel symbol) because obj->btf_vmlinux is NULL
and there is no way to set it (at the moment btf_vmlinux is meant
to be temporary storage for use in bpf_object__load_xattr()).

Fix this by using libbpf_find_vmlinux_btf_id().

At some point we may want to opportunistically cache btf_vmlinux
so it can be reused with multiple programs.
Signed-off-by: default avatarLuigi Rizzo <lrizzo@google.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarAndrii Nakryiko <andriin@fb.com>
Acked-by: default avatarPetar Penkov <ppenkov@google.com>
Link: https://lore.kernel.org/bpf/20201005224528.389097-1-lrizzo@google.com
parent fd08f944
...@@ -10451,8 +10451,7 @@ int bpf_program__set_attach_target(struct bpf_program *prog, ...@@ -10451,8 +10451,7 @@ int bpf_program__set_attach_target(struct bpf_program *prog,
btf_id = libbpf_find_prog_btf_id(attach_func_name, btf_id = libbpf_find_prog_btf_id(attach_func_name,
attach_prog_fd); attach_prog_fd);
else else
btf_id = __find_vmlinux_btf_id(prog->obj->btf_vmlinux, btf_id = libbpf_find_vmlinux_btf_id(attach_func_name,
attach_func_name,
prog->expected_attach_type); prog->expected_attach_type);
if (btf_id < 0) if (btf_id < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment