提交 6769efd1 编写于 作者: A Andrii Nakryiko 提交者: Zheng Zengkai

libbpf: Use pre-setup sec_def in libbpf_find_attach_btf_id()

mainline inclusion
from mainline-5.16-rc1
commit f11f86a3
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5EUVD
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f11f86a3931b5d533aed1be1720fbd55bd63174d

-------------------------------------------------

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: NAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
Acked-by: NYonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20210916015836.1248906-2-andrii@kernel.org
(cherry picked from commit f11f86a3)
Signed-off-by: NWang Yufen <wangyufen@huawei.com>
上级 98162f19
...@@ -8432,19 +8432,15 @@ static int libbpf_find_attach_btf_id(struct bpf_program *prog, int *btf_obj_fd, ...@@ -8432,19 +8432,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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册