iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libbpf: Use pre-setup sec_def in libbpf_find_attach_btf_id()

Browse Source 
Don't perform another search for sec_def inside
libbpf_find_attach_btf_id(), as each recognized bpf_program already has
prog->sec_def set.

Also remove unnecessary NULL check for prog->sec_name, as it can never
be NULL.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210916015836.1248906-2-andrii@kernel.org
This commit is contained in:
Andrii Nakryiko 2021-09-15 18:58:30 -07:00 committed by Alexei Starovoitov
parent 336562752a
commit f11f86a393
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/lib/bpf/libbpf.c
View File

@ -8461,19 +8461,15 @@ static int libbpf_find_attach_btf_id(struct bpf_program *prog, int *btf_obj_fd,
{ {
enum bpf_attach_type attach_type = prog->expected_attach_type; enum bpf_attach_type attach_type = prog->expected_attach_type;
__u32 attach_prog_fd = prog->attach_prog_fd; __u32 attach_prog_fd = prog->attach_prog_fd;
const char *name = prog->sec_name, *attach_name; const char *attach_name;
const struct bpf_sec_def *sec = NULL;
int err = 0; int err = 0;
if (!name) if (!prog->sec_def || !prog->sec_def->is_attach_btf) {
return -EINVAL; pr_warn("failed to identify BTF ID based on ELF section name '%s'\n",
prog->sec_name);
sec = find_sec_def(name);
if (!sec || !sec->is_attach_btf) {
pr_warn("failed to identify BTF ID based on ELF section name '%s'\n", name);
return -ESRCH; return -ESRCH;
} }
attach_name = name + sec->len; attach_name = prog->sec_name + prog->sec_def->len;
/* BPF program's BTF ID */ /* BPF program's BTF ID */
if (attach_prog_fd) { if (attach_prog_fd) {