bpf: Fix fill_link_info and add selftest
Subsystems (4)
v4 cover bpf: Fix fill_link_info and add selftest
Patch #1: Fix an error in fill_link_info reported by Dan Patch #2: Add selftest for #1
v3->v4:
- Comments from Yonghong
- re-word the kptr comment
- Avoid unnecessary switch statement
- No need to check the return value of bpf_link__fd()
- offset is always 0
- Return directly when test_fill_link_info__open_and_load() fails
- Cleanup skel when load_kallsyms_refresh() fails
v2->v3:
- Comments from Jiri
- Verify wrong arguments as soon as possible
- Use CONFIG_X86_KERNEL_IBT
- No need to make the test serial
- Add test case for kprobe_multi
v1->v2:
- Fix BPF CI failure due to the enabled ENDBDR
Yafang Shao (2):
bpf: Fix uninitialized symbol in bpf_perf_link_fill_kprobe() selftests/bpf: Add selftest for fill_link_info
kernel/bpf/syscall.c | 4 +- tools/testing/selftests/bpf/DENYLIST.aarch64 | 3 + .../selftests/bpf/prog_tests/fill_link_info.c | 337 +++++++++++++++++++++ .../selftests/bpf/progs/test_fill_link_info.c | 42 +++ 4 files changed, 384 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/fill_link_info.c create mode 100644 tools/testing/selftests/bpf/progs/test_fill_link_info.c
Signature · 1 line
1.8.3.1
PATCH v4 1/2 bpf: Fix uninitialized symbol in bpf_perf_link_fill_kprobe()
The patch 1b715e1b0ec5: "bpf: Support ->fill_link_info for perf_event" from Jul 9, 2023, leads to the following Smatch static checker warning:
kernel/bpf/syscall.c:3416 bpf_perf_link_fill_kprobe()
error: uninitialized symbol 'type'.
That can happens when uname is NULL. So fix it by verifying the uname when we really need to fill it.
--- kernel/bpf/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/bpf/syscall.c +2 -2
@@ -3378,14 +3378,14 @@ static int bpf_perf_link_fill_common(const struct perf_event *event,if (!ulen ^ !uname)return -EINVAL ; -if (!uname) -return 0 ; err =bpf_get_perf_event_info (event, &prog_id, fd_type, &buf, probe_offset, probe_addr);if (err)return err; +if (!uname) +return 0 ;if (buf) { len =strlen (buf); err =bpf_copy_to_user (uname, buf, ulen, len);
Signature · 1 line
1.8.3.1
Re: [PATCH v4 bpf-next 1/2] bpf: Fix uninitialized symbol in bpf_perf_link_fill_kprobe()
Quoted 7 lines · Yafang Shao
The patch
1b715e1b0ec5: "bpf: Support ->fill_link_info forperf_event" from Jul 9, 2023, leads to the following Smatch static checker warning:
kernel/bpf/syscall.c:3416bpf_perf_link_fill_kprobe()
error: uninitialized symbol 'type'.
Quoted 8 lines
That can happens when uname is NULL. So fix it by verifying the uname when we really need to fill it.
Fixes 1b715e1b0ec5 ("bpf: Support ->fill_link_info for perf_event")Reported-by Dan Carpenter <[email protected]>Signed-off-by Yafang Shao <[email protected]>Acked-by Yonghong Song <[email protected]>
jirka
Quoted 28 lines
--- kernel/bpf/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel/bpf/syscall.c +2
-2@@ -3378,14 +3378,14 @@ static int bpf_perf_link_fill_common(const struct perf_event *event,if (!ulen ^ !uname)return -EINVAL ; -if (!uname) -return 0 ; err =bpf_get_perf_event_info (event, &prog_id, fd_type, &buf, probe_offset, probe_addr);if (err)return err; +if (!uname) +return 0 ;if (buf) { len =strlen (buf); err =bpf_copy_to_user (uname, buf, ulen, len);Signature · 1 line
1.8.3.1
PATCH v4 2/2 selftests/bpf: Add selftest for fill_link_info
In reply to Yafang ShaoAdd selftest for the fill_link_info of uprobe, kprobe and tracepoint. The result:
$ tools/testing/selftests/bpf/test_progs --name=fill_link_info #79/1 fill_link_info/kprobe_link_info:OK #79/2 fill_link_info/kretprobe_link_info:OK #79/3 fill_link_info/kprobe_fill_invalid_user_buff:OK #79/4 fill_link_info/tracepoint_link_info:OK #79/5 fill_link_info/uprobe_link_info:OK #79/6 fill_link_info/uretprobe_link_info:OK #79/7 fill_link_info/kprobe_multi_link_info:OK #79/8 fill_link_info/kretprobe_multi_link_info:OK #79/9 fill_link_info/kprobe_multi_ubuff:OK #79 fill_link_info:OK Summary: 1/9 PASSED, 0 SKIPPED, 0 FAILED
The test case for kprobe_multi won't be run on aarch64, as it is not supported.
--- tools/testing/selftests/bpf/DENYLIST.aarch64 | 3 + .../selftests/bpf/prog_tests/fill_link_info.c | 337 +++++++++++++++++++++ .../selftests/bpf/progs/test_fill_link_info.c | 42 +++ 3 files changed, 382 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/fill_link_info.c create mode 100644 tools/testing/selftests/bpf/progs/test_fill_link_info.c
tools/testing/selftests/bpf/DENYLIST.aarch64 +3 -0
@@ -12,3 +12,6 @@ kprobe_multi_test/skel_api # libbpf: failed to load BPF sk module_attach # prog 'kprobe_multi': failed to auto-attach: -95 fentry_test/fentry_many_args # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524 fexit_test/fexit_many_args # fexit_many_args:FAIL:fexit_many_args_attach unexpected error: -524 +fill_link_info/kprobe_multi_link_info # bpf_program__attach_kprobe_multi_opts unexpected error: -95 +fill_link_info/kretprobe_multi_link_info # bpf_program__attach_kprobe_multi_opts unexpected error: -95 +fill_link_info/kprobe_multi_ubuff # bpf_program__attach_kprobe_multi_opts unexpected error: -95
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +337 -0
337 lines not on this page · raw message
tools/testing/selftests/bpf/progs/test_fill_link_info.c new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
1.8.3.1
Re: [PATCH v4 bpf-next 2/2] selftests/bpf: Add selftest for fill_link_info
Quoted 16 lines · Yafang Shao
Add selftest for the
fill_link_infoof uprobe, kprobe and tracepoint. The result:$ tools/testing/selftests/bpf/test_progs --name=fill_link_info #79/1 fill_link_info/kprobe_link_info:OK #79/2 fill_link_info/kretprobe_link_info:OK #79/3 fill_link_info/kprobe_fill_invalid_user_buff:OK #79/4 fill_link_info/tracepoint_link_info:OK #79/5 fill_link_info/uprobe_link_info:OK #79/6 fill_link_info/uretprobe_link_info:OK #79/7 fill_link_info/kprobe_multi_link_info:OK #79/8 fill_link_info/kretprobe_multi_link_info:OK #79/9 fill_link_info/kprobe_multi_ubuff:OK #79 fill_link_info:OK Summary: 1/9 PASSED, 0 SKIPPED, 0 FAILED
Quoted 4 lines
The test case for
kprobe_multiwon't be run on aarch64, as it is not supported.Signed-off-by Yafang Shao <[email protected]>
Ack with a few nits below.
Quoted 107 lines
--- tools/testing/selftests/bpf/DENYLIST.aarch64 | 3 + .../selftests/bpf/prog_tests/fill_link_info.c | 337 +++++++++++++++++++++ .../selftests/bpf/progs/test_fill_link_info.c | 42 +++ 3 files changed, 382 insertions(+)create mode 100644
tools/testing/selftests/bpf/prog_tests/fill_link_info.ccreate mode 100644tools/testing/selftests/bpf/progs/test_fill_link_info.ctools/testing/selftests/bpf/DENYLIST.aarch64 +3
-0@@ -12,3 +12,6 @@ kprobe_multi_test/skel_api # libbpf: failed to load BPF sk module_attach # prog 'kprobe_multi': failed to auto-attach: -95 fentry_test/fentry_many_args # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524 fexit_test/fexit_many_args # fexit_many_args:FAIL:fexit_many_args_attach unexpected error: -524 +fill_link_info/kprobe_multi_link_info # bpf_program__attach_kprobe_multi_opts unexpected error: -95 +fill_link_info/kretprobe_multi_link_info # bpf_program__attach_kprobe_multi_opts unexpected error: -95 +fill_link_info/kprobe_multi_ubuff # bpf_program__attach_kprobe_multi_opts unexpected error: -95tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +82
-0@@ -0,0 +1,337 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2023 Yafang Shao <[email protected]> */ + +#include <string.h> +#include <linux/bpf.h> +#include <linux/limits.h> +#include <test_progs.h> +#include "trace_helpers.h" +#include "test_fill_link_info.skel.h" + +#define TP_CAT "sched" +#define TP_NAME "sched_switch" +#define KPROBE_FUNC "tcp_rcv_established" +#define UPROBE_FILE "/proc/self/exe" +#define KMULTI_CNT (4) + +/* uprobe attach point */ +static noinline void uprobe_func(void) +{ + asmvolatile ("" ); +} + +static int verify_perf_link_info (int fd,enum bpf_perf_event_type type,long addr, +ssize_t offset,ssize_t entry_offset) +{ +struct bpf_link_info info; +__u32 len =sizeof (info); +char buf[PATH_MAX ]; +int err =0 ; + +memset (&info,0 ,sizeof (info)); + buf[0 ] ='\0' ; + +again: + err =bpf_link_get_info_by_fd (fd, &info, &len); +if (!ASSERT_OK (err,"get_link_info" )) +return -1 ; + +if (!ASSERT_EQ (info.type,BPF_LINK_TYPE_PERF_EVENT ,"link_type" )) +return -1 ; +if (!ASSERT_EQ (info.perf_event.type, type,"perf_type_match" )) +return -1 ; + +switch (info.perf_event.type) { +case BPF_PERF_EVENT_KPROBE : +case BPF_PERF_EVENT_KRETPROBE : +ASSERT_EQ (info.perf_event.kprobe.offset, offset,"kprobe_offset" ); + +/* In case kernel.kptr_restrict is not permitted or MAX_SYMS is reached */ +if (addr) +ASSERT_EQ (info.perf_event.kprobe.addr, addr + entry_offset, +"kprobe_addr" ); + +if (!info.perf_event.kprobe.func_name) { +ASSERT_EQ (info.perf_event.kprobe.name_len,0 ,"name_len" ); + info.perf_event.kprobe.func_name =ptr_to_u64 (&buf); + info.perf_event.kprobe.name_len =sizeof (buf); + goto again; + } + + err =strncmp (u64_to_ptr (info.perf_event.kprobe.func_name),KPROBE_FUNC , +strlen (KPROBE_FUNC )); +ASSERT_EQ (err,0 ,"cmp_kprobe_func_name" ); +break ; +case BPF_PERF_EVENT_TRACEPOINT : +if (!info.perf_event.tracepoint.tp_name) { +ASSERT_EQ (info.perf_event.tracepoint.name_len,0 ,"name_len" ); + info.perf_event.tracepoint.tp_name =ptr_to_u64 (&buf); + info.perf_event.tracepoint.name_len =sizeof (buf); + goto again; + } + + err =strncmp (u64_to_ptr (info.perf_event.tracepoint.tp_name),TP_NAME , +strlen (TP_NAME )); +ASSERT_EQ (err,0 ,"cmp_tp_name" ); +break ; +case BPF_PERF_EVENT_UPROBE : +case BPF_PERF_EVENT_URETPROBE : +ASSERT_EQ (info.perf_event.uprobe.offset, offset,"uprobe_offset" ); + +if (!info.perf_event.uprobe.file_name) { +ASSERT_EQ (info.perf_event.uprobe.name_len,0 ,"name_len" );
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 92
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ info.perf_event.uprobe.file_name =ptr_to_u64 (&buf); + info.perf_event.uprobe.name_len =sizeof (buf); + goto again; + } + + err =strncmp (u64_to_ptr (info.perf_event.uprobe.file_name),UPROBE_FILE , +strlen (UPROBE_FILE )); +ASSERT_EQ (err,0 ,"cmp_file_name" ); +break ; +default :
Is the 'default' case possible? Probably not, right? Then let us add
err = -1;
to indicate this path is not possible.
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +5
-0+break ; + } +return err; +} +
[...]
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 131
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ +static void test_kprobe_fill_link_info (struct test_fill_link_info *skel, +enum bpf_perf_event_type type, +bool retprobe,bool invalid) +{ +DECLARE_LIBBPF_OPTS (bpf_kprobe_opts, opts, + .attach_mode = PROBE_ATTACH_MODE_LINK, + .retprobe = retprobe, + ); +ssize_t offset =0 , entry_offset =0 ;
Remove 'offset = 0'.
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +5
-0+int link_fd, err; +long addr; + + skel->links.kprobe_run =bpf_program__attach_kprobe_opts (skel->progs.kprobe_run, +KPROBE_FUNC , &opts);
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 146
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+if (!ASSERT_OK_PTR (skel->links.kprobe_run,"attach_kprobe" )) +return ; + + link_fd =bpf_link__fd (skel->links.kprobe_run); + addr =ksym_get_addr (KPROBE_FUNC ); +if (!invalid) { +/* See also arch_adjust_kprobe_addr(). */ +if (skel->kconfig->CONFIG_X86_KERNEL_IBT) + entry_offset =4 ; + err =verify_perf_link_info (link_fd, type, addr, offset, entry_offset);
Replease 'offset' with '0'.
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +7
-0+ASSERT_OK (err,"verify_perf_link_info" ); + }else { +kprobe_fill_invalid_user_buffer (link_fd); + } +bpf_link__detach (skel->links.kprobe_run); +} +
[...]
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 279
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +13
-0+ +static void test_kprobe_multi_fill_link_info (struct test_fill_link_info *skel, +bool retprobe,bool buffer) +{ +LIBBPF_OPTS (bpf_kprobe_multi_opts, opts); +const char *syms[KMULTI_CNT ] = { +"schedule_timeout_interruptible" , +"schedule_timeout_uninterruptible" , +"schedule_timeout_idle" , +"schedule_timeout_killable" , + }; +__u64 addrs[KMULTI_CNT ]; +int link_fd, i, err =0 ;
'err = 0' => 'err'.
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +9
-0+ +qsort (syms,KMULTI_CNT ,sizeof (syms[0 ]), symbols_cmp_r); + opts.syms = syms; + opts.cnt =KMULTI_CNT ; + opts.retprobe = retprobe; + skel->links.kmulti_run =bpf_program__attach_kprobe_multi_opts (skel->progs.kmulti_run, +NULL , &opts); +if (!ASSERT_OK_PTR (skel->links.kmulti_run,"attach_kprobe_multi" )) +return ;
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 298
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ + link_fd =bpf_link__fd (skel->links.kmulti_run); +for (i =0 ; i <KMULTI_CNT ; i++) + addrs[i] =ksym_get_addr (syms[i]); + +if (!buffer) + err =verify_kmulti_link_info (link_fd, addrs, retprobe); +else +verify_kmulti_user_buffer (link_fd, addrs); +ASSERT_OK (err,"verify_kmulti_link_info" );
if (!buffer) {
err = verify_kmulti_link_info(link_fd, addrs, retprobe);
ASSERT_OK(err, "verify_kmulti_link_info");
} else {
verify_kmulti_user_buffer(link_fd, addrs);
}Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +3
-0+bpf_link__detach (skel->links.kmulti_run); +} +
[...]
Re: [PATCH v4 bpf-next 2/2] selftests/bpf: Add selftest for fill_link_info
Quoted 149 lines · Yonghong Song
Quoted 16 lines · Yafang Shao
Add selftest for the
fill_link_infoof uprobe, kprobe and tracepoint. The result:$ tools/testing/selftests/bpf/test_progs --name=fill_link_info #79/1 fill_link_info/kprobe_link_info:OK #79/2 fill_link_info/kretprobe_link_info:OK #79/3 fill_link_info/kprobe_fill_invalid_user_buff:OK #79/4 fill_link_info/tracepoint_link_info:OK #79/5 fill_link_info/uprobe_link_info:OK #79/6 fill_link_info/uretprobe_link_info:OK #79/7 fill_link_info/kprobe_multi_link_info:OK #79/8 fill_link_info/kretprobe_multi_link_info:OK #79/9 fill_link_info/kprobe_multi_ubuff:OK #79 fill_link_info:OK Summary: 1/9 PASSED, 0 SKIPPED, 0 FAILEDQuoted 4 lines
The test case for
kprobe_multiwon't be run on aarch64, as it is not supported.Signed-off-by Yafang Shao <[email protected]>Ack with a few nits below.
Acked-by Yonghong Song <[email protected]>Quoted 107 lines
--- tools/testing/selftests/bpf/DENYLIST.aarch64 | 3 + .../selftests/bpf/prog_tests/fill_link_info.c | 337 +++++++++++++++++++++ .../selftests/bpf/progs/test_fill_link_info.c | 42 +++ 3 files changed, 382 insertions(+)create mode 100644
tools/testing/selftests/bpf/prog_tests/fill_link_info.ccreate mode 100644tools/testing/selftests/bpf/progs/test_fill_link_info.ctools/testing/selftests/bpf/DENYLIST.aarch64 +3
-0@@ -12,3 +12,6 @@ kprobe_multi_test/skel_api # libbpf: failed to load BPF sk module_attach # prog 'kprobe_multi': failed to auto-attach: -95 fentry_test/fentry_many_args # fentry_many_args:FAIL:fentry_many_args_attach unexpected error: -524 fexit_test/fexit_many_args # fexit_many_args:FAIL:fexit_many_args_attach unexpected error: -524 +fill_link_info/kprobe_multi_link_info # bpf_program__attach_kprobe_multi_opts unexpected error: -95 +fill_link_info/kretprobe_multi_link_info # bpf_program__attach_kprobe_multi_opts unexpected error: -95 +fill_link_info/kprobe_multi_ubuff # bpf_program__attach_kprobe_multi_opts unexpected error: -95tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +82
-0@@ -0,0 +1,337 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2023 Yafang Shao <[email protected]> */ + +#include <string.h> +#include <linux/bpf.h> +#include <linux/limits.h> +#include <test_progs.h> +#include "trace_helpers.h" +#include "test_fill_link_info.skel.h" + +#define TP_CAT "sched" +#define TP_NAME "sched_switch" +#define KPROBE_FUNC "tcp_rcv_established" +#define UPROBE_FILE "/proc/self/exe" +#define KMULTI_CNT (4) + +/* uprobe attach point */ +static noinline void uprobe_func(void) +{ + asmvolatile ("" ); +} + +static int verify_perf_link_info (int fd,enum bpf_perf_event_type type,long addr, +ssize_t offset,ssize_t entry_offset) +{ +struct bpf_link_info info; +__u32 len =sizeof (info); +char buf[PATH_MAX ]; +int err =0 ; + +memset (&info,0 ,sizeof (info)); + buf[0 ] ='\0' ; + +again: + err =bpf_link_get_info_by_fd (fd, &info, &len); +if (!ASSERT_OK (err,"get_link_info" )) +return -1 ; + +if (!ASSERT_EQ (info.type,BPF_LINK_TYPE_PERF_EVENT ,"link_type" )) +return -1 ; +if (!ASSERT_EQ (info.perf_event.type, type,"perf_type_match" )) +return -1 ; + +switch (info.perf_event.type) { +case BPF_PERF_EVENT_KPROBE : +case BPF_PERF_EVENT_KRETPROBE : +ASSERT_EQ (info.perf_event.kprobe.offset, offset,"kprobe_offset" ); + +/* In case kernel.kptr_restrict is not permitted or MAX_SYMS is reached */ +if (addr) +ASSERT_EQ (info.perf_event.kprobe.addr, addr + entry_offset, +"kprobe_addr" ); + +if (!info.perf_event.kprobe.func_name) { +ASSERT_EQ (info.perf_event.kprobe.name_len,0 ,"name_len" ); + info.perf_event.kprobe.func_name =ptr_to_u64 (&buf); + info.perf_event.kprobe.name_len =sizeof (buf); + goto again; + } + + err =strncmp (u64_to_ptr (info.perf_event.kprobe.func_name),KPROBE_FUNC , +strlen (KPROBE_FUNC )); +ASSERT_EQ (err,0 ,"cmp_kprobe_func_name" ); +break ; +case BPF_PERF_EVENT_TRACEPOINT : +if (!info.perf_event.tracepoint.tp_name) { +ASSERT_EQ (info.perf_event.tracepoint.name_len,0 ,"name_len" ); + info.perf_event.tracepoint.tp_name =ptr_to_u64 (&buf); + info.perf_event.tracepoint.name_len =sizeof (buf); + goto again; + } + + err =strncmp (u64_to_ptr (info.perf_event.tracepoint.tp_name),TP_NAME , +strlen (TP_NAME )); +ASSERT_EQ (err,0 ,"cmp_tp_name" ); +break ; +case BPF_PERF_EVENT_UPROBE : +case BPF_PERF_EVENT_URETPROBE : +ASSERT_EQ (info.perf_event.uprobe.offset, offset,"uprobe_offset" ); + +if (!info.perf_event.uprobe.file_name) { +ASSERT_EQ (info.perf_event.uprobe.name_len,0 ,"name_len" );tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 92
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ info.perf_event.uprobe.file_name =ptr_to_u64 (&buf); + info.perf_event.uprobe.name_len =sizeof (buf); + goto again; + } + + err =strncmp (u64_to_ptr (info.perf_event.uprobe.file_name),UPROBE_FILE , +strlen (UPROBE_FILE )); +ASSERT_EQ (err,0 ,"cmp_file_name" ); +break ; +default :Is the 'default' case possible? Probably not, right? Then let us add
Quoted 2 lines
err = -1;to indicate this path is not possible.
will add it.
Quoted 29 lines
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +5
-0+break ; + } +return err; +} +[...]
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 131
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ +static void test_kprobe_fill_link_info (struct test_fill_link_info *skel, +enum bpf_perf_event_type type, +bool retprobe,bool invalid) +{ +DECLARE_LIBBPF_OPTS (bpf_kprobe_opts, opts, + .attach_mode = PROBE_ATTACH_MODE_LINK, + .retprobe = retprobe, + ); +ssize_t offset =0 , entry_offset =0 ;Remove 'offset = 0'.
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +9
-0+int link_fd, err; +long addr; + + skel->links.kprobe_run =bpf_program__attach_kprobe_opts (skel->progs.kprobe_run, +KPROBE_FUNC , &opts); +if (!ASSERT_OK_PTR (skel->links.kprobe_run,"attach_kprobe" )) +return ; + + link_fd =bpf_link__fd (skel->links.kprobe_run);
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 146
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +6
-0+ addr =ksym_get_addr (KPROBE_FUNC ); +if (!invalid) { +/* See also arch_adjust_kprobe_addr(). */ +if (skel->kconfig->CONFIG_X86_KERNEL_IBT) + entry_offset =4 ; + err =verify_perf_link_info (link_fd, type, addr, offset, entry_offset);Replease 'offset' with '0'.
will do it.
Quoted 9 lines
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +7
-0+ASSERT_OK (err,"verify_perf_link_info" ); + }else { +kprobe_fill_invalid_user_buffer (link_fd); + } +bpf_link__detach (skel->links.kprobe_run); +} +[...]
Quoted 15 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 279
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +13
-0+ +static void test_kprobe_multi_fill_link_info (struct test_fill_link_info *skel, +bool retprobe,bool buffer) +{ +LIBBPF_OPTS (bpf_kprobe_multi_opts, opts); +const char *syms[KMULTI_CNT ] = { +"schedule_timeout_interruptible" , +"schedule_timeout_uninterruptible" , +"schedule_timeout_idle" , +"schedule_timeout_killable" , + }; +__u64 addrs[KMULTI_CNT ]; +int link_fd, i, err =0 ;'err = 0' => 'err'.
will change it.
Quoted 19 lines
Quoted 19 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +18
-0+ +qsort (syms,KMULTI_CNT ,sizeof (syms[0 ]), symbols_cmp_r); + opts.syms = syms; + opts.cnt =KMULTI_CNT ; + opts.retprobe = retprobe; + skel->links.kmulti_run =bpf_program__attach_kprobe_multi_opts (skel->progs.kmulti_run, +NULL , &opts); +if (!ASSERT_OK_PTR (skel->links.kmulti_run,"attach_kprobe_multi" )) +return ; + + link_fd =bpf_link__fd (skel->links.kmulti_run); +for (i =0 ; i <KMULTI_CNT ; i++) + addrs[i] =ksym_get_addr (syms[i]); + +if (!buffer) + err =verify_kmulti_link_info (link_fd, addrs, retprobe); +else +verify_kmulti_user_buffer (link_fd, addrs);
Quoted 8 lines
Quoted 1 line
+
ASSERT_OK(err, "verify_kmulti_link_info");if (!buffer) { err = verify_kmulti_link_info(link_fd, addrs, retprobe); ASSERT_OK(err, "verify_kmulti_link_info"); } else { verify_kmulti_user_buffer(link_fd, addrs); }
That is better. Thanks for your review.
Signature · 2 lines
Regards Yafang
Re: [PATCH v4 bpf-next 2/2] selftests/bpf: Add selftest for fill_link_info
In reply to Yafang ShaoOn Fri, Aug 04, 2023 at 10:57:32AM +0000, Yafang Shao wrote:
SNIP
Quoted 23 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +23
-0+ +static void kprobe_fill_invalid_user_buffer (int fd) +{ +struct bpf_link_info info; +__u32 len =sizeof (info); +int err; + +memset (&info,0 ,sizeof (info)); + + info.perf_event.kprobe.func_name =0x1 ;/* invalid address */ + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EINVAL ,"invalid_buff_and_len" ); + + info.perf_event.kprobe.name_len =64 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EFAULT ,"invalid_buff" ); + + info.perf_event.kprobe.func_name =0 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EINVAL ,"invalid_len" ); + +ASSERT_EQ (info.perf_event.kprobe.addr,0 ,"func_addr" ); +ASSERT_EQ (info.perf_event.kprobe.offset,0 ,"func_offset" );
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 129
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ASSERT_EQ (info.perf_event.type,0 ,"type" ); +} + +static void test_kprobe_fill_link_info (struct test_fill_link_info *skel, +enum bpf_perf_event_type type, +bool retprobe,bool invalid) +{ + DECLARE_LIBBPF_OPTS(bpf_kprobe_opts, opts, + .attach_mode = PROBE_ATTACH_MODE_LINK, + .retprobe = retprobe,
you could got rid of the retprobe argument and just do
.retprobe = retprobe == BPF_PERF_EVENT_KRETPROBE,
Quoted 37 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +37
-0+ ); +ssize_t offset =0 , entry_offset =0 ; +int link_fd, err; +long addr; + + skel->links.kprobe_run =bpf_program__attach_kprobe_opts (skel->progs.kprobe_run, +KPROBE_FUNC , &opts); +if (!ASSERT_OK_PTR (skel->links.kprobe_run,"attach_kprobe" )) +return ; + + link_fd =bpf_link__fd (skel->links.kprobe_run); + addr =ksym_get_addr (KPROBE_FUNC ); +if (!invalid) { +/* See also arch_adjust_kprobe_addr(). */ +if (skel->kconfig->CONFIG_X86_KERNEL_IBT) + entry_offset =4 ; + err =verify_perf_link_info (link_fd, type, addr, offset, entry_offset); +ASSERT_OK (err,"verify_perf_link_info" ); + }else { +kprobe_fill_invalid_user_buffer (link_fd); + } +bpf_link__detach (skel->links.kprobe_run); +} + +static void test_tp_fill_link_info (struct test_fill_link_info *skel) +{ +int link_fd, err; + + skel->links.tp_run =bpf_program__attach_tracepoint (skel->progs.tp_run,TP_CAT ,TP_NAME ); +if (!ASSERT_OK_PTR (skel->links.tp_run,"attach_tp" )) +return ; + + link_fd =bpf_link__fd (skel->links.tp_run); + err =verify_perf_link_info (link_fd,BPF_PERF_EVENT_TRACEPOINT ,0 ,0 ,0 ); +ASSERT_OK (err,"verify_perf_link_info" ); +bpf_link__detach (skel->links.tp_run); +}
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 176
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ +static void test_uprobe_fill_link_info (struct test_fill_link_info *skel, +enum bpf_perf_event_type type,ssize_t offset, +bool retprobe) +{ +int link_fd, err; + + skel->links.uprobe_run =bpf_program__attach_uprobe (skel->progs.uprobe_run, retprobe, +0 ,/* self pid */ +UPROBE_FILE , offset);
same here with 'type == BPF_PERF_EVENT_URETPROBE'
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +9
-0+if (!ASSERT_OK_PTR (skel->links.uprobe_run,"attach_uprobe" )) +return ; + + link_fd =bpf_link__fd (skel->links.uprobe_run); + err =verify_perf_link_info (link_fd, type,0 , offset,0 ); +ASSERT_OK (err,"verify_perf_link_info" ); +bpf_link__detach (skel->links.uprobe_run); +} +
SNIP
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 276
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ +static void test_kprobe_multi_fill_link_info (struct test_fill_link_info *skel, +bool retprobe,bool buffer) +{ +LIBBPF_OPTS (bpf_kprobe_multi_opts, opts); +const char *syms[KMULTI_CNT ] = { +"schedule_timeout_interruptible" , +"schedule_timeout_uninterruptible" , +"schedule_timeout_idle" , +"schedule_timeout_killable" ,
nit, might be better to use some of the bpf_fentry_test[1-9] functions, also for KPROBE_FUNC
Quoted 11 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +11
-0+ }; +__u64 addrs[KMULTI_CNT ]; +int link_fd, i, err =0 ; + +qsort (syms,KMULTI_CNT ,sizeof (syms[0 ]), symbols_cmp_r); + opts.syms = syms; + opts.cnt =KMULTI_CNT ; + opts.retprobe = retprobe; + skel->links.kmulti_run =bpf_program__attach_kprobe_multi_opts (skel->progs.kmulti_run, +NULL , &opts); +if (!ASSERT_OK_PTR (skel->links.kmulti_run,"attach_kprobe_multi" ))
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 297
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+return ; + + link_fd =bpf_link__fd (skel->links.kmulti_run); +for (i =0 ; i <KMULTI_CNT ; i++) + addrs[i] =ksym_get_addr (syms[i]); + +if (!buffer) + err =verify_kmulti_link_info (link_fd, addrs, retprobe); +else +verify_kmulti_user_buffer (link_fd, addrs);
verify_kmulti_user_buffer is actually what you call 'invalid' in other tests right? seems better to keep it in here unless I miss something
thanks,
jirka
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +4
-0+ASSERT_OK (err,"verify_kmulti_link_info" ); +bpf_link__detach (skel->links.kmulti_run); +} +
SNIP
Re: [PATCH v4 bpf-next 2/2] selftests/bpf: Add selftest for fill_link_info
Quoted 41 lines · Jiri Olsa
On Fri, Aug 04, 2023 at 10:57:32AM +0000, Yafang Shao wrote:
SNIP
Quoted 23 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +23
-0+ +static void kprobe_fill_invalid_user_buffer (int fd) +{ +struct bpf_link_info info; +__u32 len =sizeof (info); +int err; + +memset (&info,0 ,sizeof (info)); + + info.perf_event.kprobe.func_name =0x1 ;/* invalid address */ + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EINVAL ,"invalid_buff_and_len" ); + + info.perf_event.kprobe.name_len =64 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EFAULT ,"invalid_buff" ); + + info.perf_event.kprobe.func_name =0 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EINVAL ,"invalid_len" ); + +ASSERT_EQ (info.perf_event.kprobe.addr,0 ,"func_addr" ); +ASSERT_EQ (info.perf_event.kprobe.offset,0 ,"func_offset" );tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 129
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ASSERT_EQ (info.perf_event.type,0 ,"type" ); +} + +static void test_kprobe_fill_link_info (struct test_fill_link_info *skel, +enum bpf_perf_event_type type, +bool retprobe,bool invalid) +{ + DECLARE_LIBBPF_OPTS(bpf_kprobe_opts, opts, + .attach_mode = PROBE_ATTACH_MODE_LINK, + .retprobe = retprobe,you could got rid of the retprobe argument and just do
Quoted 1 line
.retprobe = retprobe == BPF_PERF_EVENT_KRETPROBE,
good point. will change it and the others.
Quoted 65 lines
Quoted 39 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +37
-0+ ); +ssize_t offset =0 , entry_offset =0 ; +int link_fd, err; +long addr; + + skel->links.kprobe_run =bpf_program__attach_kprobe_opts (skel->progs.kprobe_run, +KPROBE_FUNC , &opts); +if (!ASSERT_OK_PTR (skel->links.kprobe_run,"attach_kprobe" )) +return ; + + link_fd =bpf_link__fd (skel->links.kprobe_run); + addr =ksym_get_addr (KPROBE_FUNC ); +if (!invalid) { +/* See also arch_adjust_kprobe_addr(). */ +if (skel->kconfig->CONFIG_X86_KERNEL_IBT) + entry_offset =4 ; + err =verify_perf_link_info (link_fd, type, addr, offset, entry_offset); +ASSERT_OK (err,"verify_perf_link_info" ); + }else { +kprobe_fill_invalid_user_buffer (link_fd); + } +bpf_link__detach (skel->links.kprobe_run); +} + +static void test_tp_fill_link_info (struct test_fill_link_info *skel) +{ +int link_fd, err; + + skel->links.tp_run =bpf_program__attach_tracepoint (skel->progs.tp_run,TP_CAT ,TP_NAME ); +if (!ASSERT_OK_PTR (skel->links.tp_run,"attach_tp" )) +return ; + + link_fd =bpf_link__fd (skel->links.tp_run); + err =verify_perf_link_info (link_fd,BPF_PERF_EVENT_TRACEPOINT ,0 ,0 ,0 ); +ASSERT_OK (err,"verify_perf_link_info" ); +bpf_link__detach (skel->links.tp_run); +}tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 176
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ +static void test_uprobe_fill_link_info (struct test_fill_link_info *skel, +enum bpf_perf_event_type type,ssize_t offset, +bool retprobe) +{ +int link_fd, err; + + skel->links.uprobe_run =bpf_program__attach_uprobe (skel->progs.uprobe_run, retprobe, +0 ,/* self pid */ +UPROBE_FILE , offset);same here with 'type ==
BPF_PERF_EVENT_URETPROBE'Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +9
-0+if (!ASSERT_OK_PTR (skel->links.uprobe_run,"attach_uprobe" )) +return ; + + link_fd =bpf_link__fd (skel->links.uprobe_run); + err =verify_perf_link_info (link_fd, type,0 , offset,0 ); +ASSERT_OK (err,"verify_perf_link_info" ); +bpf_link__detach (skel->links.uprobe_run); +} +SNIP
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 276
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +10
-0+ +static void test_kprobe_multi_fill_link_info (struct test_fill_link_info *skel, +bool retprobe,bool buffer) +{ +LIBBPF_OPTS (bpf_kprobe_multi_opts, opts); +const char *syms[KMULTI_CNT ] = { +"schedule_timeout_interruptible" , +"schedule_timeout_uninterruptible" , +"schedule_timeout_idle" , +"schedule_timeout_killable" ,nit, might be better to use some of the bpf_fentry_test[1-9] functions, also for
KPROBE_FUNC
will use them instead.
Quoted 17 lines
Quoted 17 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +16
-0+ }; +__u64 addrs[KMULTI_CNT ]; +int link_fd, i, err =0 ; + +qsort (syms,KMULTI_CNT ,sizeof (syms[0 ]), symbols_cmp_r); + opts.syms = syms; + opts.cnt =KMULTI_CNT ; + opts.retprobe = retprobe; + skel->links.kmulti_run =bpf_program__attach_kprobe_multi_opts (skel->progs.kmulti_run, +NULL , &opts); +if (!ASSERT_OK_PTR (skel->links.kmulti_run,"attach_kprobe_multi" )) +return ; + + link_fd =bpf_link__fd (skel->links.kmulti_run); +for (i =0 ; i <KMULTI_CNT ; i++) + addrs[i] =ksym_get_addr (syms[i]);
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c line 297
Quoted 5 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c new file +5
-0+ +if (!buffer) + err =verify_kmulti_link_info (link_fd, addrs, retprobe); +else +verify_kmulti_user_buffer (link_fd, addrs);
verify_kmulti_user_bufferis actually what you call 'invalid' in other tests right? seems better to keep it in here unless I miss something
will rename it.
Signature · 2 lines
Regards Yafang