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@xxxxxxxxxx>
---
tools/lib/bpf/libbpf.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 62a43c408d73..5ba11b249e9b 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -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;
__u32 attach_prog_fd = prog->attach_prog_fd;
- const char *name = prog->sec_name, *attach_name;
- const struct bpf_sec_def *sec = NULL;
+ const char *attach_name;
int err = 0;
- if (!name)
- return -EINVAL;
-
- 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);
+ if (!prog->sec_def || !prog->sec_def->is_attach_btf) {
+ pr_warn("failed to identify BTF ID based on ELF section name '%s'\n",
+ prog->sec_name);
return -ESRCH;
}
- attach_name = name + sec->len;
+ attach_name = prog->sec_name + prog->sec_def->len;
/* BPF program's BTF ID */
if (attach_prog_fd) {
--
2.30.2
