Commit f11f86a3 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

libbpf: Use pre-setup sec_def in libbpf_find_attach_btf_id() 



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: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210916015836.1248906-2-andrii@kernel.org
parent 33656275

tools/lib/bpf/libbpf.c

+5 −9
Original line number Diff line number Diff line
@@ -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) {