bpf: use proper target btf when exporting attach_btf_obj_id
Subsystems (4)
PATCH 1/2 bpf: use proper target btf when exporting attach_btf_obj_id
When attaching to program, the program itself might not be attached to anything (and, hence, might not have attach_btf), so we can't unconditionally use 'prog->aux->dst_prog->aux->attach_btf'. Instead, use bpf_prog_get_target_btf to pick proper target btf:
* when attached to dst_prog, use dst_prog->aux->btf
* when attached to kernel btf, use prog->aux->attach_btf
--- kernel/bpf/syscall.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
kernel/bpf/syscall.c +3 -4
@@ -3886,6 +3886,7 @@ static int bpf_prog_get_info_by_fd(struct file *file, union bpf_attr __user *uattr) {struct bpf_prog_info __user *uinfo =u64_to_user_ptr (attr->info.info); +struct btf *attach_btf =bpf_prog_get_target_btf (prog);struct bpf_prog_info info;u32 info_len = attr->info.info_len;struct bpf_prog_kstats stats;
@@ -4088,10 +4089,8 @@ static int bpf_prog_get_info_by_fd(struct file *file,if (prog->aux->btf) info.btf_id =btf_obj_id (prog->aux->btf); info.attach_btf_id = prog->aux->attach_btf_id; -if (prog->aux->attach_btf) - info.attach_btf_obj_id =btf_obj_id (prog->aux->attach_btf); -else if (prog->aux->dst_prog) - info.attach_btf_obj_id =btf_obj_id (prog->aux->dst_prog->aux->attach_btf); +if (attach_btf) + info.attach_btf_obj_id =btf_obj_id (attach_btf); ulen = info.nr_func_info; info.nr_func_info = prog->aux->func_info_cnt;
Signature · 1 line
2.37.1.455.g008518b4e5-goog
PATCH 2/2 selftests/bpf: Excercise bpf_obj_get_info_by_fd for bpf2bpf
Apparently, no existing selftest covers it. Add a new one where we load cgroup/bind4 program and attach fentry to it. Calling bpf_obj_get_info_by_fd on the fentry program
should return non-zero btf_id/btf_obj_id instead of crashing the kernel.
--- .../selftests/bpf/prog_tests/attach_to_bpf.c | 109 ++++++++++++++++++ .../selftests/bpf/progs/attach_to_bpf.c | 12 ++ 2 files changed, 121 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c create mode 100644 tools/testing/selftests/bpf/progs/attach_to_bpf.c
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +109 -0
@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include <stdlib.h> +#include <bpf/btf.h> +#include <test_progs.h> +#include <network_helpers.h> +#include "attach_to_bpf.skel.h" + +char bpf_log_buf[BPF_LOG_BUF_SIZE ]; + +static int find_prog_btf_id (const char *name,__u32 attach_prog_fd) +{ +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +struct btf *btf; +int err; + + err =bpf_obj_get_info_by_fd (attach_prog_fd, &info, &info_len); +if (err) +return err; + +if (!info.btf_id) +return -EINVAL ; + + btf =btf__load_from_kernel_by_id (info.btf_id); + err =libbpf_get_error (btf); +if (err) +return err; + + err =btf__find_by_name_kind (btf, name,BTF_KIND_FUNC ); +btf__free (btf); +if (err <=0 ) +return err; + +return err; +} + +int load_fentry (int attach_prog_fd,int attach_btf_id) +{ +LIBBPF_OPTS (bpf_prog_load_opts, opts, + .expected_attach_type = BPF_TRACE_FENTRY, + .attach_prog_fd = attach_prog_fd, + .attach_btf_id = attach_btf_id, + .log_buf = bpf_log_buf, + .log_size = sizeof(bpf_log_buf), + ); +struct bpf_insn insns[] = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + }; +int ret; + + ret =bpf_prog_load (BPF_PROG_TYPE_TRACING , +"bind4_fentry" , +"GPL" , + insns, +ARRAY_SIZE (insns), + &opts); +if (ret) +printf ("verifier log: %s\n" , bpf_log_buf); +return ret; +} + +void test_attach_to_bpf (void ) +{ +struct attach_to_bpf *skel =NULL ; +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +int cgroup_fd =-1 ; +int fentry_fd =-1 ; +int btf_id; + + cgroup_fd =test__join_cgroup ("/attach_to_bpf" ); +if (!ASSERT_GE (cgroup_fd,0 ,"cgroup_fd" )) +return ; + + skel =attach_to_bpf__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel" )) + goto cleanup; + + skel->links.bind4 =bpf_program__attach_cgroup (skel->progs.bind4, cgroup_fd); +if (!ASSERT_OK_PTR (skel,"bpf_program__attach_cgroup" )) + goto cleanup; + + btf_id =find_prog_btf_id ("bind4" ,bpf_program__fd (skel->progs.bind4)); +if (!ASSERT_GE (btf_id,0 ,"find_prog_btf_id" )) + goto cleanup; + + fentry_fd =load_fentry (bpf_program__fd (skel->progs.bind4), btf_id); +if (!ASSERT_GE (fentry_fd,0 ,"load_fentry" )) + goto cleanup; + +/* Make sure bpf_obj_get_info_by_fd works correctly when attaching +* to another BPF program. +*/ + +if (!ASSERT_OK (bpf_obj_get_info_by_fd (fentry_fd, &info, &info_len), +"bpf_obj_get_info_by_fd" )) + goto cleanup; + +ASSERT_EQ (info.btf_id,0 ,"info.btf_id" ); +ASSERT_GT (info.attach_btf_id,0 ,"info.attach_btf_id" ); +ASSERT_GT (info.attach_btf_obj_id,0 ,"info.attach_btf_obj_id" ); + +cleanup: +close (cgroup_fd); +close (fentry_fd); +attach_to_bpf__destroy (skel); +}
tools/testing/selftests/bpf/progs/attach_to_bpf.c new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +SEC("cgroup/bind4") +int bind4 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +char _license[] SEC("license") = "GPL";
Signature · 1 line
2.37.1.455.g008518b4e5-goog
Re: [PATCH bpf-next 2/2] selftests/bpf: Excercise bpf_obj_get_info_by_fd for bpf2bpf
Quoted 8 lines · Stanislav Fomichev
Apparently, no existing selftest covers it. Add a new one where we load cgroup/bind4 program and attach fentry to it. Calling
bpf_obj_get_info_by_fdon the fentry program
should return non-zero btf_id/btf_obj_id instead of crashing the kernel.Signed-off-by Stanislav Fomichev <[email protected]>---
Looks good to me overall, with a few nits.
Quoted 32 lines
.../selftests/bpf/prog_tests/attach_to_bpf.c | 109 ++++++++++++++++++ .../selftests/bpf/progs/attach_to_bpf.c | 12 ++ 2 files changed, 121 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c create mode 100644 tools/testing/selftests/bpf/progs/attach_to_bpf.ctools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +20
-0@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include <stdlib.h> +#include <bpf/btf.h> +#include <test_progs.h> +#include <network_helpers.h> +#include "attach_to_bpf.skel.h" + +char bpf_log_buf[BPF_LOG_BUF_SIZE ]; + +static int find_prog_btf_id (const char *name,__u32 attach_prog_fd) +{ +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +struct btf *btf; +int err; + + err =bpf_obj_get_info_by_fd (attach_prog_fd, &info, &info_len); +if (err) +return err;
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 30
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +10
-0+ +if (!info.btf_id) +return -EINVAL ; + + btf =btf__load_from_kernel_by_id (info.btf_id); + err =libbpf_get_error (btf); +if (err) +return err; + + err =btf__find_by_name_kind (btf, name,BTF_KIND_FUNC );
nit: Prefer use a separate variable like 'btf_id' instead of using 'err'.
Quoted 20 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +20
-0+btf__free (btf); +if (err <=0 ) +return err; + +return err; +} + +int load_fentry (int attach_prog_fd,int attach_btf_id) +{ +LIBBPF_OPTS (bpf_prog_load_opts, opts, + .expected_attach_type = BPF_TRACE_FENTRY, + .attach_prog_fd = attach_prog_fd, + .attach_btf_id = attach_btf_id, + .log_buf = bpf_log_buf, + .log_size = sizeof(bpf_log_buf), + ); +struct bpf_insn insns[] = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + };
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 60
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +10
-0+int ret; + + ret =bpf_prog_load (BPF_PROG_TYPE_TRACING , +"bind4_fentry" , +"GPL" , + insns, +ARRAY_SIZE (insns), + &opts); +if (ret) +printf ("verifier log: %s\n" , bpf_log_buf);
Do we need to print log? If print logging isn't necessary, we could directly return bpf_prog_load(). Seems simpler.
Quoted 30 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +30
-0+return ret; +} + +void test_attach_to_bpf (void ) +{ +struct attach_to_bpf *skel =NULL ; +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +int cgroup_fd =-1 ; +int fentry_fd =-1 ; +int btf_id; + + cgroup_fd =test__join_cgroup ("/attach_to_bpf" ); +if (!ASSERT_GE (cgroup_fd,0 ,"cgroup_fd" )) +return ; + + skel =attach_to_bpf__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel" )) + goto cleanup; + + skel->links.bind4 =bpf_program__attach_cgroup (skel->progs.bind4, cgroup_fd); +if (!ASSERT_OK_PTR (skel,"bpf_program__attach_cgroup" )) + goto cleanup; + + btf_id =find_prog_btf_id ("bind4" ,bpf_program__fd (skel->progs.bind4)); +if (!ASSERT_GE (btf_id,0 ,"find_prog_btf_id" )) + goto cleanup; + + fentry_fd =load_fentry (bpf_program__fd (skel->progs.bind4), btf_id); +if (!ASSERT_GE (fentry_fd,0 ,"load_fentry" ))
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 100
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +10
-0+ goto cleanup; + +/* Make sure bpf_obj_get_info_by_fd works correctly when attaching +* to another BPF program. +*/ + +if (!ASSERT_OK (bpf_obj_get_info_by_fd (fentry_fd, &info, &info_len), +"bpf_obj_get_info_by_fd" )) + goto cleanup; +
Conditional checking may not be necessary. Just ASSERT_OK(bpf_obj_get_info_by_fd(...)). Looks more compact.
Quoted 30 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +9
-0+ASSERT_EQ (info.btf_id,0 ,"info.btf_id" ); +ASSERT_GT (info.attach_btf_id,0 ,"info.attach_btf_id" ); +ASSERT_GT (info.attach_btf_obj_id,0 ,"info.attach_btf_obj_id" ); + +cleanup: +close (cgroup_fd); +close (fentry_fd); +attach_to_bpf__destroy (skel); +}tools/testing/selftests/bpf/progs/attach_to_bpf.c new file +12
-1@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +SEC("cgroup/bind4") +int bind4 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +char _license[] SEC("license") = "GPL"; --2.37.1.455.g008518b4e5-goog
Re: [PATCH bpf-next 2/2] selftests/bpf: Excercise bpf_obj_get_info_by_fd for bpf2bpf
Quoted 8 lines · Hao Luo
Quoted 6 lines · Stanislav Fomichev
Apparently, no existing selftest covers it. Add a new one where we load cgroup/bind4 program and attach fentry to it. Calling
bpf_obj_get_info_by_fdon the fentry program
should return non-zero btf_id/btf_obj_id instead of crashing the kernel.
Quoted 4 lines
Quoted 2 lines
Signed-off-by Stanislav Fomichev <[email protected]>---
Looks good to me overall, with a few nits.
Thank you for the review! Will respin on Mon.
Quoted 36 lines
Quoted 36 lines
.../selftests/bpf/prog_tests/attach_to_bpf.c | 109 ++++++++++++++++++ .../selftests/bpf/progs/attach_to_bpf.c | 12 ++ 2 files changed, 121 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c create mode 100644 tools/testing/selftests/bpf/progs/attach_to_bpf.ctools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +24
-0@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include <stdlib.h> +#include <bpf/btf.h> +#include <test_progs.h> +#include <network_helpers.h> +#include "attach_to_bpf.skel.h" + +char bpf_log_buf[BPF_LOG_BUF_SIZE ]; + +static int find_prog_btf_id (const char *name,__u32 attach_prog_fd) +{ +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +struct btf *btf; +int err; + + err =bpf_obj_get_info_by_fd (attach_prog_fd, &info, &info_len); +if (err) +return err; + +if (!info.btf_id) +return -EINVAL ; +
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 30
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +6
-0+ btf =btf__load_from_kernel_by_id (info.btf_id); + err =libbpf_get_error (btf); +if (err) +return err; + + err =btf__find_by_name_kind (btf, name,BTF_KIND_FUNC );nit: Prefer use a separate variable like '
btf_id' instead of using 'err'.
SG!
Quoted 25 lines
Quoted 25 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +25
-0+btf__free (btf); +if (err <=0 ) +return err; + +return err; +} + +int load_fentry (int attach_prog_fd,int attach_btf_id) +{ +LIBBPF_OPTS (bpf_prog_load_opts, opts, + .expected_attach_type = BPF_TRACE_FENTRY, + .attach_prog_fd = attach_prog_fd, + .attach_btf_id = attach_btf_id, + .log_buf = bpf_log_buf, + .log_size = sizeof(bpf_log_buf), + ); +struct bpf_insn insns[] = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + }; +int ret; + + ret = bpf_prog_load(BPF_PROG_TYPE_TRACING, + "bind4_fentry", + "GPL",
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 60
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +5
-0+ insns, +ARRAY_SIZE (insns), + &opts); +if (ret) +printf ("verifier log: %s\n" , bpf_log_buf);Do we need to print log? If print logging isn't necessary, we could directly return
bpf_prog_load(). Seems simpler.
We don't really need it. I've been using it during development, but I guess it should be fine to drop since the test is passing now :-)
Quoted 35 lines
Quoted 35 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +35
-0+return ret; +} + +void test_attach_to_bpf (void ) +{ +struct attach_to_bpf *skel =NULL ; +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +int cgroup_fd =-1 ; +int fentry_fd =-1 ; +int btf_id; + + cgroup_fd =test__join_cgroup ("/attach_to_bpf" ); +if (!ASSERT_GE (cgroup_fd,0 ,"cgroup_fd" )) +return ; + + skel =attach_to_bpf__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel" )) + goto cleanup; + + skel->links.bind4 =bpf_program__attach_cgroup (skel->progs.bind4, cgroup_fd); +if (!ASSERT_OK_PTR (skel,"bpf_program__attach_cgroup" )) + goto cleanup; + + btf_id =find_prog_btf_id ("bind4" ,bpf_program__fd (skel->progs.bind4)); +if (!ASSERT_GE (btf_id,0 ,"find_prog_btf_id" )) + goto cleanup; + + fentry_fd =load_fentry (bpf_program__fd (skel->progs.bind4), btf_id); +if (!ASSERT_GE (fentry_fd,0 ,"load_fentry" )) + goto cleanup; + +/* Make sure bpf_obj_get_info_by_fd works correctly when attaching +* to another BPF program. +*/
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 100
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +5
-0+ +if (!ASSERT_OK (bpf_obj_get_info_by_fd (fentry_fd, &info, &info_len), +"bpf_obj_get_info_by_fd" )) + goto cleanup; +Conditional checking may not be necessary. Just ASSERT_OK(bpf_obj_get_info_by_fd(...)). Looks more compact.
Ack, makes sense.
Quoted 30 lines
Quoted 30 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +9
-0+ASSERT_EQ (info.btf_id,0 ,"info.btf_id" ); +ASSERT_GT (info.attach_btf_id,0 ,"info.attach_btf_id" ); +ASSERT_GT (info.attach_btf_obj_id,0 ,"info.attach_btf_obj_id" ); + +cleanup: +close (cgroup_fd); +close (fentry_fd); +attach_to_bpf__destroy (skel); +}tools/testing/selftests/bpf/progs/attach_to_bpf.c new file +12
-1@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +SEC("cgroup/bind4") +int bind4 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +char _license[] SEC("license") = "GPL"; --2.37.1.455.g008518b4e5-goog
Re: [PATCH bpf-next 2/2] selftests/bpf: Excercise bpf_obj_get_info_by_fd for bpf2bpf
In reply to Stanislav FomichevQuoted 19 lines · Stanislav Fomichev
Apparently, no existing selftest covers it. Add a new one where we load cgroup/bind4 program and attach fentry to it. Calling
bpf_obj_get_info_by_fdon the fentry program
should return non-zero btf_id/btf_obj_id instead of crashing the kernel.Signed-off-by Stanislav Fomichev <[email protected]>--- .../selftests/bpf/prog_tests/attach_to_bpf.c | 109 ++++++++++++++++++ .../selftests/bpf/progs/attach_to_bpf.c | 12 ++ 2 files changed, 121 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c create mode 100644 tools/testing/selftests/bpf/progs/attach_to_bpf.ctools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +0
-0
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 9
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +9
-0@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include <stdlib.h> +#include <bpf/btf.h> +#include <test_progs.h> +#include <network_helpers.h> +#include "attach_to_bpf.skel.h" + +char bpf_log_buf[BPF_LOG_BUF_SIZE ];
static
Quoted 19 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +19
-0+ +static int find_prog_btf_id (const char *name,__u32 attach_prog_fd) +{ +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +struct btf *btf; +int err; + + err =bpf_obj_get_info_by_fd (attach_prog_fd, &info, &info_len); +if (err) +return err; + +if (!info.btf_id) +return -EINVAL ; + + btf =btf__load_from_kernel_by_id (info.btf_id); + err =libbpf_get_error (btf); +if (err) +return err;
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 38
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +10
-0+ + err =btf__find_by_name_kind (btf, name,BTF_KIND_FUNC ); +btf__free (btf); +if (err <=0 ) +return err; + +return err; +} + +int load_fentry (int attach_prog_fd,int attach_btf_id)
static
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +12
-0+{ +LIBBPF_OPTS (bpf_prog_load_opts, opts, + .expected_attach_type = BPF_TRACE_FENTRY, + .attach_prog_fd = attach_prog_fd, + .attach_btf_id = attach_btf_id, + .log_buf = bpf_log_buf, + .log_size = sizeof(bpf_log_buf), + ); +struct bpf_insn insns[] = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + };
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 60
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +10
-0+int ret; + + ret =bpf_prog_load (BPF_PROG_TYPE_TRACING , +"bind4_fentry" , +"GPL" , + insns, +ARRAY_SIZE (insns), + &opts); +if (ret) +printf ("verifier log: %s\n" , bpf_log_buf);
If this fentry prog is in the attach_to_bpf.c and load by skel, this printf and the bpf_log_buf can go away. I wonder if it can use the '?' like SEC("?cgroup/bind4") and SEC("?fentry"). Then opens attach_to_bpf.skel.h twice and use bpf_program__set_autoload() to load individual program.
Another option could be to reuse the progs/bind4_prog.c and directly put the fentry program in the attach_to_bpf.c.
btw, this test feels like something that could be a few line addition to the test_fexit_bpf2bpf_common() in fexit_bpf2bpf.c. Adding one to test fentry into a cgroup bpf prog is also good. No strong opinion here also.
tools/testing/selftests/bpf/progs/attach_to_bpf.c
Quoted 54 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +49
-0+return ret; +} + +void test_attach_to_bpf (void ) +{ +struct attach_to_bpf *skel =NULL ; +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +int cgroup_fd =-1 ; +int fentry_fd =-1 ; +int btf_id; + + cgroup_fd =test__join_cgroup ("/attach_to_bpf" ); +if (!ASSERT_GE (cgroup_fd,0 ,"cgroup_fd" )) +return ; + + skel =attach_to_bpf__open_and_load (); +if (!ASSERT_OK_PTR (skel,"skel" )) + goto cleanup; + + skel->links.bind4 =bpf_program__attach_cgroup (skel->progs.bind4, cgroup_fd); +if (!ASSERT_OK_PTR (skel,"bpf_program__attach_cgroup" )) + goto cleanup; + + btf_id =find_prog_btf_id ("bind4" ,bpf_program__fd (skel->progs.bind4)); +if (!ASSERT_GE (btf_id,0 ,"find_prog_btf_id" )) + goto cleanup; + + fentry_fd =load_fentry (bpf_program__fd (skel->progs.bind4), btf_id); +if (!ASSERT_GE (fentry_fd,0 ,"load_fentry" )) + goto cleanup; + +/* Make sure bpf_obj_get_info_by_fd works correctly when attaching +* to another BPF program. +*/ + +if (!ASSERT_OK (bpf_obj_get_info_by_fd (fentry_fd, &info, &info_len), +"bpf_obj_get_info_by_fd" )) + goto cleanup; + +ASSERT_EQ (info.btf_id,0 ,"info.btf_id" ); +ASSERT_GT (info.attach_btf_id,0 ,"info.attach_btf_id" ); +ASSERT_GT (info.attach_btf_obj_id,0 ,"info.attach_btf_obj_id" ); + +cleanup: +close (cgroup_fd); +close (fentry_fd); +attach_to_bpf__destroy (skel); +}tools/testing/selftests/bpf/progs/attach_to_bpf.c new file +0
-0
nit. attach_to_bpf.c sounds too broad.
May be fentry_to_cgroup_bpf.c ?
Quoted 16 lines
tools/testing/selftests/bpf/progs/attach_to_bpf.c new file +12
-0@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> + +SEC("cgroup/bind4") +int bind4 (struct bpf_sock_addr *ctx) +{ +return 1 ; +} + +char _license[] SEC("license") = "GPL";Signature · 1 line
2.37.1.455.g008518b4e5-goog
Re: [PATCH bpf-next 2/2] selftests/bpf: Excercise bpf_obj_get_info_by_fd for bpf2bpf
Quoted 15 lines · Martin KaFai Lau
Quoted 13 lines · Stanislav Fomichev
Apparently, no existing selftest covers it. Add a new one where we load cgroup/bind4 program and attach fentry to it. Calling
bpf_obj_get_info_by_fdon the fentry program
should return non-zero btf_id/btf_obj_id instead of crashing the kernel.Signed-off-by Stanislav Fomichev <[email protected]>--- .../selftests/bpf/prog_tests/attach_to_bpf.c | 109 ++++++++++++++++++ .../selftests/bpf/progs/attach_to_bpf.c | 12 ++ 2 files changed, 121 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c create mode 100644 tools/testing/selftests/bpf/progs/attach_to_bpf.c
Quoted 16 lines
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +0
-0tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 9
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +9
-0@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include <stdlib.h> +#include <bpf/btf.h> +#include <test_progs.h> +#include <network_helpers.h> +#include "attach_to_bpf.skel.h" + +char bpf_log_buf[BPF_LOG_BUF_SIZE ];static
Will remove bpf_log_buf. Sent v2 too soon :-(
Quoted 22 lines
Quoted 22 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +22
-0+ +static int find_prog_btf_id (const char *name,__u32 attach_prog_fd) +{ +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +struct btf *btf; +int err; + + err =bpf_obj_get_info_by_fd (attach_prog_fd, &info, &info_len); +if (err) +return err; + +if (!info.btf_id) +return -EINVAL ; + + btf =btf__load_from_kernel_by_id (info.btf_id); + err =libbpf_get_error (btf); +if (err) +return err; + + err =btf__find_by_name_kind (btf, name,BTF_KIND_FUNC ); +btf__free (btf);
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 38
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +7
-0+if (err <=0 ) +return err; + +return err; +} + +int load_fentry (int attach_prog_fd,int attach_btf_id)static
Thx!
Quoted 18 lines
Quoted 18 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +18
-0+{ +LIBBPF_OPTS (bpf_prog_load_opts, opts, + .expected_attach_type = BPF_TRACE_FENTRY, + .attach_prog_fd = attach_prog_fd, + .attach_btf_id = attach_btf_id, + .log_buf = bpf_log_buf, + .log_size = sizeof(bpf_log_buf), + ); +struct bpf_insn insns[] = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + }; +int ret; + + ret = bpf_prog_load(BPF_PROG_TYPE_TRACING, + "bind4_fentry", + "GPL", + insns,
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 60
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +4
-0+ARRAY_SIZE (insns), + &opts); +if (ret) +printf ("verifier log: %s\n" , bpf_log_buf);If this fentry prog is in the
attach_to_bpf.cand load by skel, this printf and thebpf_log_bufcan go away. I wonder if it can use the '?' likeSEC("?cgroup/bind4")andSEC("?fentry"). Then opensattach_to_bpf.skel.htwice and usebpf_program__set_autoload()to load individual program .
Good ideal, let me try to see if doing "?fentry" is easier.. (unless we agree to keep load_fentry, see below)
Quoted 7 lines
Another option could be to reuse the
progs/bind4_prog.cand directly put the fentry program in theattach_to_bpf.c.btw, this test feels like something that could be a few line addition to the
test_fexit_bpf2bpf_common()infexit_bpf2bpf.c. Adding one to test fentry into a cgroup bpf prog is also good. No strong opinion here also.
I was trying to reuse fexit_bpf2bpf initially but I sank too much time into it and decided that it might be easier to write a simpler/separate reproducer instead :-(
How about we reuse progs/bind4_prog.c and keep load_fentry() ? And put this new test in fexit_bpf2bpf.c ?
Re: [PATCH bpf-next 2/2] selftests/bpf: Excercise bpf_obj_get_info_by_fd for bpf2bpf
Quoted 106 lines · Stanislav Fomichev
Quoted 15 lines · Martin KaFai Lau
Quoted 13 lines · Stanislav Fomichev
Apparently, no existing selftest covers it. Add a new one where we load cgroup/bind4 program and attach fentry to it. Calling
bpf_obj_get_info_by_fdon the fentry program
should return non-zero btf_id/btf_obj_id instead of crashing the kernel.Signed-off-by Stanislav Fomichev <[email protected]>--- .../selftests/bpf/prog_tests/attach_to_bpf.c | 109 ++++++++++++++++++ .../selftests/bpf/progs/attach_to_bpf.c | 12 ++ 2 files changed, 121 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c create mode 100644 tools/testing/selftests/bpf/progs/attach_to_bpf.cQuoted 16 lines
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +0
-0tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 9
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +9
-0@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE +#include <stdlib.h> +#include <bpf/btf.h> +#include <test_progs.h> +#include <network_helpers.h> +#include "attach_to_bpf.skel.h" + +char bpf_log_buf[BPF_LOG_BUF_SIZE ];static
Will remove
bpf_log_buf. Sent v2 too soon :-(Quoted 22 lines
Quoted 22 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +22
-0+ +static int find_prog_btf_id (const char *name,__u32 attach_prog_fd) +{ +struct bpf_prog_info info = {}; +__u32 info_len =sizeof (info); +struct btf *btf; +int err; + + err =bpf_obj_get_info_by_fd (attach_prog_fd, &info, &info_len); +if (err) +return err; + +if (!info.btf_id) +return -EINVAL ; + + btf =btf__load_from_kernel_by_id (info.btf_id); + err =libbpf_get_error (btf); +if (err) +return err; + + err =btf__find_by_name_kind (btf, name,BTF_KIND_FUNC ); +btf__free (btf);Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 38
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +7
-0+if (err <=0 ) +return err; + +return err; +} + +int load_fentry (int attach_prog_fd,int attach_btf_id)static
Thx!
Quoted 18 lines
Quoted 18 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +18
-0+{ +LIBBPF_OPTS (bpf_prog_load_opts, opts, + .expected_attach_type = BPF_TRACE_FENTRY, + .attach_prog_fd = attach_prog_fd, + .attach_btf_id = attach_btf_id, + .log_buf = bpf_log_buf, + .log_size = sizeof(bpf_log_buf), + ); +struct bpf_insn insns[] = { +BPF_MOV64_IMM (BPF_REG_0 ,0 ), +BPF_EXIT_INSN (), + }; +int ret; + + ret = bpf_prog_load(BPF_PROG_TYPE_TRACING, + "bind4_fentry", + "GPL", + insns,Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c line 60
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/attach_to_bpf.c new file +4
-0+ARRAY_SIZE (insns), + &opts); +if (ret) +printf ("verifier log: %s\n" , bpf_log_buf);If this fentry prog is in the
attach_to_bpf.cand load by skel, this printf and thebpf_log_bufcan go away. I wonder if it can use the '?' likeSEC("?cgroup/bind4")andSEC("?fentry"). Then opensattach_to_bpf.skel.htwice and usebpf_program__set_autoload()to load individual program .Good ideal, let me try to see if doing "?fentry" is easier.. (unless we agree to keep
load_fentry, see below)Quoted 7 lines
Another option could be to reuse the
progs/bind4_prog.cand directly put the fentry program in theattach_to_bpf.c.btw, this test feels like something that could be a few line addition to the
test_fexit_bpf2bpf_common()infexit_bpf2bpf.c. Adding one to test fentry into a cgroup bpf prog is also good. No strong opinion here also.
Quoted 5 lines
I was trying to reuse
fexit_bpf2bpfinitially but I sank too much time into it and decided that it might be easier to write a simpler/separate reproducer instead :-(
How about we reuseprogs/bind4_prog.cand keepload_fentry()? And put this new test infexit_bpf2bpf.c?
Reusing bind4_prog.c sounds good. Either use bind4_prog.c in the new prog_tests/attach_to_bpf.c (likely need a better name) or the fexit_bpf2bpf.c is fine. Whatever makes more sense.
I was mostly thinking to avoid the special verifier log buf handling and the printf here. If an empty fentry prog may look weird, may be just skip the bpf_log_buf and printf since it will never fail and keep the load_fentry ?
Quoted 11 lines · Stanislav Fomichev
When attaching to program, the program itself might not be attached to anything (and, hence, might not have
attach_btf), so we can't unconditionally use 'prog->aux->dst_prog->aux->attach_btf'. Instead, usebpf_prog_get_target_btfto pick proper target btf:* when attached to
dst_prog, usedst_prog->aux->btf
* when attached to kernel btf, useprog->aux->attach_btfFixes b79c9fc9551b ("bpf: implement BPF_PROG_QUERY for BPF_LSM_CGROUP")Signed-off-by Stanislav Fomichev <[email protected]>
Looks good to me.
Hao
Quoted 27 lines · Stanislav Fomichev
When attaching to program, the program itself might not be attached to anything (and, hence, might not have
attach_btf), so we can't unconditionally use 'prog->aux->dst_prog->aux->attach_btf'. Instead, usebpf_prog_get_target_btfto pick proper target btf:* when attached to
dst_prog, usedst_prog->aux->btf
* when attached to kernel btf, useprog->aux->attach_btfFixes b79c9fc9551b ("bpf: implement BPF_PROG_QUERY for BPF_LSM_CGROUP")Signed-off-by Stanislav Fomichev <[email protected]>--- kernel/bpf/syscall.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)kernel/bpf/syscall.c +1
-0@@ -3886,6 +3886,7 @@ static int bpf_prog_get_info_by_fd(struct file *file, union bpf_attr __user *uattr) {struct bpf_prog_info __user *uinfo =u64_to_user_ptr (attr->info.info); +struct btf *attach_btf =bpf_prog_get_target_btf (prog);struct bpf_prog_info info;u32 info_len = attr->info.info_len;struct bpf_prog_kstats stats;
kernel/bpf/syscall.c static int bpf_prog_get_info_by_fd(struct file *file, · line 4093
Quoted 9 lines
kernel/bpf/syscall.c +2
-4@@ -4088,10 +4089,8 @@ static int bpf_prog_get_info_by_fd(struct file *file,if (prog->aux->btf) info.btf_id =btf_obj_id (prog->aux->btf); info.attach_btf_id = prog->aux->attach_btf_id; -if (prog->aux->attach_btf) - info.attach_btf_obj_id =btf_obj_id (prog->aux->attach_btf); -else if (prog->aux->dst_prog) - info.attach_btf_obj_id =btf_obj_id (prog->aux->dst_prog->aux->attach_btf); +if (attach_btf) + info.attach_btf_obj_id =btf_obj_id (attach_btf);
Nice.