bpf: tracing_multi link info support
Subsystems (7)
Jiri Olsa
reviewercover bpf: tracing_multi link info support
hi,
adding link info support for tracing_multi link.
Adding the kernel support with related selftests and bpftool support to display the tracing_multi link info, the output looks like:
# bpftool link
...
27: tracing_multi prog 93
attach_type trace_fentry_multi obj_id 1 count 3
btf_id addr cookie func [module]
91984 ffffffff824f4a24 a bpf_fentry_test1
91986 ffffffff824f6a84 1e bpf_fentry_test2
91987 ffffffff824f6a94 14 bpf_fentry_test3
pids test_progs(1462)thanks,
jirka
---
Jiri Olsa (3):
bpf: Add tracing_multi link info support selftests/bpf: Add tracing_multi link info tests
bpftool: Add tracing_multi link info output
include/uapi/linux/bpf.h | 9 +++ kernel/trace/bpf_trace.c | 55 +++++++++++++++++ tools/bpf/bpftool/link.c | 135 ++++++++++++++++++++++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 9 +++ tools/testing/selftests/bpf/prog_tests/fill_link_info.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/progs/test_fill_link_info.c | 6 ++ 6 files changed, 456 insertions(+)
Jiri Olsa
reviewerPATCH 1/3 bpf: Add tracing_multi link info support
Adding BPF_OBJ_GET_INFO_BY_FD support for tracing_multi links.
We expose following tracing_multi link data:
- attach_type of the program
- number of ids
- array of BTF ids
- array of its related kernel addresses
- array of cookies
The change follows the kprobe_multi and uprobe_multi link-info convention of optional output arrays with an in/out count,
On top of standard tracing link data we also expose addresses, because they are useful info for user (especially when the attachment was done via pattern). This data is hidden when kallsyms does not allow exposing kernel pointer values.
--- include/uapi/linux/bpf.h | 9 ++++++ kernel/trace/bpf_trace.c | 55 ++++++++++++++++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 9 ++++++ 3 files changed, 73 insertions(+)
include/uapi/linux/bpf.h +9 -0
@@ -6839,6 +6839,15 @@ struct bpf_link_info {__u32 flags;__u32 pid; } uprobe_multi; +struct { +__u32 attach_type; +__u32 count;/* in/out: tracing_multi target count */ +__u32 obj_id; + __u32 :32; +__aligned_u64 ids; +__aligned_u64 addrs; +__aligned_u64 cookies; + } tracing_multi;struct {__u32 type;/* enum bpf_perf_event_type */ __u32 :32;
kernel/trace/bpf_trace.c +55 -0
67 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +9 -0
@@ -6839,6 +6839,15 @@ struct bpf_link_info {__u32 flags;__u32 pid; } uprobe_multi; +struct { +__u32 attach_type; +__u32 count;/* in/out: tracing_multi target count */ +__u32 obj_id; + __u32 :32; +__aligned_u64 ids; +__aligned_u64 addrs; +__aligned_u64 cookies; + } tracing_multi;struct {__u32 type;/* enum bpf_perf_event_type */ __u32 :32;
Signature · 1 line
2.54.0
Jiri Olsa
reviewerPATCH 2/3 selftests/bpf: Add tracing_multi link info tests
In reply to Jiri OlsaAdding tracing_multi link info tests that follow the kprobe_multi and uprobe_multi tests logic.
--- .../selftests/bpf/prog_tests/fill_link_info.c | 242 ++++++++++++++++++ .../selftests/bpf/progs/test_fill_link_info.c | 6 + 2 files changed, 248 insertions(+)
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +242 -0
@@ -4,6 +4,7 @@#include <string.h> #include <linux/bpf.h> #include <linux/limits.h> +#include <bpf/btf.h> #include <test_progs.h> #include "trace_helpers.h" #include "test_fill_link_info.skel.h"
@@ -24,6 +25,22 @@ static __u64 kmulti_cookies[] = { 3, 1, 2 };#define KPROBE_FUNC "bpf_fentry_test1"static __u64 kprobe_addr; +static const char *const tmulti_syms[] = { +"bpf_fentry_test2" , +"bpf_fentry_test1" , +"bpf_fentry_test3" , +}; + +static __u64 tmulti_cookies[] = {30 ,10 ,20 }; +#define TRACING_MULTI_CNT ARRAY_SIZE(tmulti_syms) + +struct tmulti_target { +const char *name; +__u64 addr; +__u64 cookie; +__u32 id; +}; +#define UPROBE_FILE "/proc/self/exe"static ssize_t uprobe_offset;/* uprobe attach point */
@@ -396,6 +413,224 @@ static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel,bpf_link__destroy (link); } +static int tmulti_target_cmp (const void *a,const void *b) +{ +const struct tmulti_target *ta = a; +const struct tmulti_target *tb = b; + +return (ta->id > tb->id) - (ta->id < tb->id); +} + +static int setup_tmulti_targets (const struct bpf_program *prog, +struct tmulti_target *targets, +__u32 *obj_id) +{ +struct bpf_prog_info prog_info; +__u32 len =sizeof (prog_info); +struct btf *btf; +int err, i; +__s32 id; + + btf =btf__load_vmlinux_btf (); +if (!ASSERT_OK_PTR (btf,"btf__load_vmlinux_btf" )) +return -1 ; + +for (i =0 ; i <TRACING_MULTI_CNT ; i++) { + id =btf__find_by_name_kind (btf, tmulti_syms[i],BTF_KIND_FUNC ); +if (!ASSERT_GT (id,0 ,"btf__find_by_name_kind" )) + goto error; + + targets[i].name = tmulti_syms[i]; + targets[i].addr =ksym_get_addr (tmulti_syms[i]); + targets[i].cookie = tmulti_cookies[i]; + targets[i].id = id; + } + +memset (&prog_info,0 , len); + err =bpf_prog_get_info_by_fd (bpf_program__fd (prog), &prog_info, &len); +if (!ASSERT_OK (err,"bpf_prog_get_info_by_fd" )) + goto error; +if (!ASSERT_GT (prog_info.attach_btf_obj_id,0 ,"attach_btf_obj_id" )) + goto error; + *obj_id = prog_info.attach_btf_obj_id; + +/* +* The kernel tracing multi attach sorts ids. We sort as well, +* so we can easily compare ids and cookies later. +*/ +qsort (targets,TRACING_MULTI_CNT ,sizeof (targets[0 ]), tmulti_target_cmp); +btf__free (btf); +return 0 ; + +error: +btf__free (btf); +return -1 ; +} + +static int verify_tracing_multi_link_info (int fd,const struct bpf_program *prog, +const struct tmulti_target *targets, +__u32 obj_id,bool has_cookies) +{ +enum bpf_attach_type attach_type =bpf_program__expected_attach_type (prog); +__u64 addrs[TRACING_MULTI_CNT ], cookies[TRACING_MULTI_CNT ]; +__u32 ids[TRACING_MULTI_CNT ]; +struct bpf_link_info info; +__u32 len =sizeof (info); +int err, i; + +memset (&info,0 ,sizeof (info)); + err =bpf_link_get_info_by_fd (fd, &info, &len); +if (!ASSERT_OK (err,"bpf_link_get_info_by_fd" )) +return -1 ; + +if (!ASSERT_EQ (info.type,BPF_LINK_TYPE_TRACING_MULTI ,"info.type" )) +return -1 ; + +ASSERT_EQ (info.tracing_multi.attach_type, attach_type,"info.tracing_multi.attach_type" ); +ASSERT_EQ (info.tracing_multi.count,TRACING_MULTI_CNT ,"info.tracing_multi.count" ); + +memset (ids,0 ,sizeof (ids)); +memset (cookies,0 ,sizeof (cookies)); +memset (addrs,0 ,sizeof (addrs)); + + info.tracing_multi.ids =ptr_to_u64 (ids); + info.tracing_multi.addrs =ptr_to_u64 (addrs); + info.tracing_multi.cookies = has_cookies ?ptr_to_u64 (cookies) :0 ; + info.tracing_multi.count =TRACING_MULTI_CNT ; + + err =bpf_link_get_info_by_fd (fd, &info, &len); +if (!ASSERT_OK (err,"bpf_link_get_info_by_fd" )) +return -1 ; + +if (!ASSERT_EQ (info.type,BPF_LINK_TYPE_TRACING_MULTI ,"info.type" )) +return -1 ; + +ASSERT_EQ (info.tracing_multi.attach_type, attach_type,"info.tracing_multi.attach_type" ); +ASSERT_EQ (info.tracing_multi.count,TRACING_MULTI_CNT ,"info.tracing_multi.count" ); +ASSERT_EQ (info.tracing_multi.obj_id, obj_id,"tracing_multi.target_obj_ids" ); + +for (i =0 ; i <TRACING_MULTI_CNT ; i++) { +ASSERT_EQ (ids[i], targets[i].id,"tracing_multi.target_btf_ids" ); +ASSERT_EQ (cookies[i], has_cookies ? targets[i].cookie :0 ,"tracing_multi.cookies" ); + +if (targets[i].addr) { +struct ksym *ksym; + +if (!ASSERT_NEQ (addrs[i],0 ,"tracing_multi.addrs" )) +return -1 ; + ksym =ksym_search (addrs[i]); +if (!ASSERT_OK_PTR (ksym,"ksym_search" )) +return -1 ; +ASSERT_STREQ (ksym->name, targets[i].name,"tracing_multi.addr_name" ); + }else { +ASSERT_EQ (addrs[i],0 ,"tracing_multi.addrs" ); + } + } + +return 0 ; +} + +static void verify_tracing_multi_invalid_user_buffer (int fd,const struct tmulti_target *targets) +{ +__u32 ids[TRACING_MULTI_CNT ] = {}; +struct bpf_link_info info; +__u32 len =sizeof (info); +int err, i; + +/* Wrong info setup (ids != NULL and cnt == 0) -> EINVAL */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EINVAL ,"tracing_multi.invalid_count" ); + +/* Smaller than actuall count provided -> ENOSPC */ +memset (ids,0 ,sizeof (ids)); +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + info.tracing_multi.count =TRACING_MULTI_CNT -1 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -ENOSPC ,"tracing_multi.small_count" ); +for (i =0 ; i <TRACING_MULTI_CNT -1 ; i++) +ASSERT_EQ (ids[i], targets[i].id,"tracing_multi.partial_ids" ); +/* check that the last entry is not populated */ +ASSERT_EQ (ids[i],0 ,"tracing_multi.partial_ids" ); + +/* Bigger than actuall count provided -> OK */ +memset (ids,0 ,sizeof (ids)); +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + info.tracing_multi.count =TRACING_MULTI_CNT +1 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_OK (err,"tracing_multi.big_count" ); +for (i =0 ; i <TRACING_MULTI_CNT ; i++) +ASSERT_EQ (ids[i], targets[i].id,"tracing_multi.ids" ); + +/* Invalid ids pointer -> EFAULT */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =0x1 ; + info.tracing_multi.count =TRACING_MULTI_CNT ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EFAULT ,"tracing_multi.bad_btf_ids" ); + +/* Invalid cookies pointer -> EFAULT */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.cookies =0x1 ; + info.tracing_multi.count =TRACING_MULTI_CNT ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EFAULT ,"tracing_multi.bad_cookies" ); + +/* Invalid addrs pointer -> EFAULT */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.addrs =0x1 ; + info.tracing_multi.count =TRACING_MULTI_CNT ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EFAULT ,"tracing_multi.bad_cookies" ); +} + +static void test_tracing_multi_fill_link_info (struct test_fill_link_info *skel, +bool has_cookies,bool invalid) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tmulti_target targets[TRACING_MULTI_CNT ]; +__u32 ids[TRACING_MULTI_CNT ], obj_id; +__u64 cookies[TRACING_MULTI_CNT ]; +struct bpf_link *link; +int link_fd, err, i; + +#ifndef __x86_64__ +test__skip (); +return ; +#endif + +if (setup_tmulti_targets (skel->progs.tmulti_run, targets, &obj_id)) +return ; + +for (i =0 ; i <TRACING_MULTI_CNT ; i++) { + ids[i] = targets[i].id; + cookies[i] = targets[i].cookie; + } + + opts.ids = ids; + opts.cnt =TRACING_MULTI_CNT ; +if (has_cookies) + opts.cookies = cookies; + + link =bpf_program__attach_tracing_multi (skel->progs.tmulti_run,NULL , &opts); +if (!ASSERT_OK_PTR (link,"bpf_program__attach_tracing_multi" )) +return ; + + link_fd =bpf_link__fd (link); +if (invalid) { +verify_tracing_multi_invalid_user_buffer (link_fd, targets); + }else { + err =verify_tracing_multi_link_info (link_fd, skel->progs.tmulti_run, + targets, obj_id, has_cookies); +ASSERT_OK (err,"verify_tracing_multi_link_info" ); + } + +bpf_link__destroy (link); +} +#define SEC (name) __attribute__((section(name), used)) static short uprobe_link_info_sema_1 SEC(".probes");
@@ -640,6 +875,13 @@ void test_fill_link_info(void)if (test__start_subtest ("kprobe_multi_invalid_ubuff" ))test_kprobe_multi_fill_link_info (skel, true, true, true); +if (test__start_subtest ("tracing_multi_link_info" )) { +test_tracing_multi_fill_link_info (skel, false, false); +test_tracing_multi_fill_link_info (skel, true, false); + } +if (test__start_subtest ("tracing_multi_invalid_ubuff" )) +test_tracing_multi_fill_link_info (skel, true, true); +if (test__start_subtest ("uprobe_multi_link_info" ))test_uprobe_multi_fill_link_info (skel, false, false);if (test__start_subtest ("uretprobe_multi_link_info" ))
tools/testing/selftests/bpf/progs/test_fill_link_info.c +6 -0
@@ -58,4 +58,10 @@ int BPF_PROG(umulti_run)return 0 ; } +SEC("fentry.multi") +int BPF_PROG (tmulti_run ) +{ +return 0 ; +} + char _license[] SEC("license") = "GPL";
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH bpf-next 2/3] selftests/bpf: Add tracing_multi link info tests
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Incorrect assertion failure message tag for invalid `addrs` pointer test. --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Incorrect assertion failure message tag for invalid addrs pointer test. --
commit edec3b6e703fee4df106f0b3f019e87b22c606fc
Author: Jiri Olsa <[email protected]>
selftests/bpf: Add tracing_multi link info tests
This commit adds new tests for tracing_multi link info. The tests follow the existing logic used for kprobe_multi and uprobe_multi tests.
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +0
-0
[ ... ]
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +6
-0+static void verify_tracing_multi_invalid_user_buffer (int fd,const struct tmulti_target *targets) +{ +__u32 ids[TRACING_MULTI_CNT ] = {}; +struct bpf_link_info info; +__u32 len =sizeof (info); +int err, i;
[ ... ]
tools/testing/selftests/bpf/prog_tests/fill_link_info.c static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel, · line 587
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +13
-0+/* Invalid cookies pointer -> EFAULT */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.cookies =0x1 ; + info.tracing_multi.count =TRACING_MULTI_CNT ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EFAULT ,"tracing_multi.bad_cookies" ); + +/* Invalid addrs pointer -> EFAULT */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.addrs =0x1 ; + info.tracing_multi.count =TRACING_MULTI_CNT ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EFAULT ,"tracing_multi.bad_cookies" );
[Severity: Low]
This isn't a bug, but is this tag a copy-paste error? The comment mentions testing an invalid addrs pointer, but the assertion in verify_tracing_multi_invalid_user_buffer() uses the "tracing_multi.bad_cookies" tag rather than something like "tracing_multi.bad_addrs".
Quoted 1 line
+}
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
Re: [PATCH bpf-next 2/3] selftests/bpf: Add tracing_multi link info tests
Quoted 40 lines · On Sun, Jun 21, 2026 at 08:53:50PM +0000, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Incorrect assertion failure message tag for invalidaddrspointer test. --commit
edec3b6e703fee4df106f0b3f019e87b22c606fc
Author: Jiri Olsa <[email protected]>selftests/bpf: Add
tracing_multilink info testsThis commit adds new tests for
tracing_multilink info. The tests follow the existing logic used forkprobe_multianduprobe_multitests.Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +0
-0[ ... ]
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +6
-0+static void verify_tracing_multi_invalid_user_buffer (int fd,const struct tmulti_target *targets) +{ +__u32 ids[TRACING_MULTI_CNT ] = {}; +struct bpf_link_info info; +__u32 len =sizeof (info); +int err, i;[ ... ]
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +12
-0+/* Invalid cookies pointer -> EFAULT */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.cookies =0x1 ; + info.tracing_multi.count =TRACING_MULTI_CNT ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EFAULT ,"tracing_multi.bad_cookies" ); + +/* Invalid addrs pointer -> EFAULT */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.addrs =0x1 ; + info.tracing_multi.count =TRACING_MULTI_CNT ; + err =bpf_link_get_info_by_fd (fd, &info, &len);
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c
Quoted 1 line
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +1
-0+ASSERT_EQ (err, -EFAULT ,"tracing_multi.bad_cookies" );[Severity: Low]
This isn't a bug, but is this tag a copy-paste error? The comment mentions testing an invalid addrs pointer, but the assertion inverify_tracing_multi_invalid_user_buffer()uses the "tracing_multi.bad_cookies" tag rather than something like "tracing_multi.bad_addrs".
yep, will fix
jirka
[email protected]
AI reviewRe: [PATCH bpf-next 2/3] selftests/bpf: Add tracing_multi link info tests
In reply to Jiri OlsaThis isn't a bug, but "actuall" is misspelled here (should be "actual").
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +0
-0
[ ... ]
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +4
-0@@ -396,6 +413,224 @@ static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel,bpf_link__destroy (link); } +static void verify_tracing_multi_invalid_user_buffer (int fd,const struct tmulti_target *targets) +{ +__u32 ids[TRACING_MULTI_CNT ] = {}; +struct bpf_link_info info;
tools/testing/selftests/bpf/prog_tests/fill_link_info.c static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel, · line 429
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +10
-0+__u32 len =sizeof (info); +int err, i; + +/* Wrong info setup (ids != NULL and cnt == 0) -> EINVAL */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EINVAL ,"tracing_multi.invalid_count" ); + +/* Smaller than actuall count provided -> ENOSPC */
This isn't a bug, but "actuall" is misspelled here (should be "actual").
tools/testing/selftests/bpf/prog_tests/fill_link_info.c static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel, · line 558
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +12
-0+memset (ids,0 ,sizeof (ids)); +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + info.tracing_multi.count =TRACING_MULTI_CNT -1 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -ENOSPC ,"tracing_multi.small_count" ); +for (i =0 ; i <TRACING_MULTI_CNT -1 ; i++) +ASSERT_EQ (ids[i], targets[i].id,"tracing_multi.partial_ids" ); +/* check that the last entry is not populated */ +ASSERT_EQ (ids[i],0 ,"tracing_multi.partial_ids" ); + +/* Bigger than actuall count provided -> OK */
The same typo appears here.
tools/testing/selftests/bpf/prog_tests/fill_link_info.c static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel, · line 566
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +8
-0+memset (ids,0 ,sizeof (ids)); +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + info.tracing_multi.count =TRACING_MULTI_CNT +1 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_OK (err,"tracing_multi.big_count" ); +for (i =0 ; i <TRACING_MULTI_CNT ; i++) +ASSERT_EQ (ids[i], targets[i].id,"tracing_multi.ids" );
[ ... ]
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
CI run summary: https://github.com/kernel-patches/bpf/actions/runs/27917285330
Re: [PATCH bpf-next 2/3] selftests/bpf: Add tracing_multi link info tests
Quoted 28 lines · On Sun, Jun 21, 2026 at 09:31:45PM +0000, [email protected] wrote:
Quoted 4 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +0
-0[ ... ]
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +4
-0@@ -396,6 +413,224 @@ static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel,bpf_link__destroy (link); } +static void verify_tracing_multi_invalid_user_buffer (int fd,const struct tmulti_target *targets) +{ +__u32 ids[TRACING_MULTI_CNT ] = {}; +struct bpf_link_info info;tools/testing/selftests/bpf/prog_tests/fill_link_info.c static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel, · line 429
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +10
-0+__u32 len =sizeof (info); +int err, i; + +/* Wrong info setup (ids != NULL and cnt == 0) -> EINVAL */ +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -EINVAL ,"tracing_multi.invalid_count" ); + +/* Smaller than actuall count provided -> ENOSPC */ This isn't a bug, but "actuall" is misspelled here (should be "actual").
Quoted 14 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel, · line 558
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +12
-0+memset (ids,0 ,sizeof (ids)); +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + info.tracing_multi.count =TRACING_MULTI_CNT -1 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_EQ (err, -ENOSPC ,"tracing_multi.small_count" ); +for (i =0 ; i <TRACING_MULTI_CNT -1 ; i++) +ASSERT_EQ (ids[i], targets[i].id,"tracing_multi.partial_ids" ); +/* check that the last entry is not populated */ +ASSERT_EQ (ids[i],0 ,"tracing_multi.partial_ids" ); + +/* Bigger than actuall count provided -> OK */ The same typo appears here.
yep, will fix both
jirka
Quoted 18 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c static void test_kprobe_multi_fill_link_info(struct test_fill_link_info *skel, · line 566
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/fill_link_info.c +8
-0+memset (ids,0 ,sizeof (ids)); +memset (&info,0 ,sizeof (info)); + info.tracing_multi.ids =ptr_to_u64 (ids); + info.tracing_multi.count =TRACING_MULTI_CNT +1 ; + err =bpf_link_get_info_by_fd (fd, &info, &len); +ASSERT_OK (err,"tracing_multi.big_count" ); +for (i =0 ; i <TRACING_MULTI_CNT ; i++) +ASSERT_EQ (ids[i], targets[i].id,"tracing_multi.ids" );[ ... ]
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.mdCI run summary: https://github.com/kernel-patches/bpf/actions/runs/27917285330
Jiri Olsa
reviewerPATCH 3/3 bpftool: Add tracing_multi link info output
In reply to Jiri OlsaAdding bpftool support to show tracing_multi link details, the new output looks like:
# bpftool link
...
27: tracing_multi prog 93
attach_type trace_fentry_multi obj_id 1 count 3
btf_id addr cookie func [module]
91984 ffffffff824f4a24 a bpf_fentry_test1
91986 ffffffff824f6a84 1e bpf_fentry_test2
91987 ffffffff824f6a94 14 bpf_fentry_test3
pids test_progs(1462)--- tools/bpf/bpftool/link.c | 135 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+)
tools/bpf/bpftool/link.c +135 -0
@@ -377,6 +377,31 @@ static __u64 *u64_to_arr(__u64 val)return (__u64 *)u64_to_ptr (val); } +static __u32 *u64_to_u32_arr (__u64 val) +{ +return (__u32 *)u64_to_ptr (val); +} + +static struct kernel_sym *find_kernel_sym_by_addr (__u64 addr,bool is_ibt_enabled) +{ +struct kernel_sym *sym; + +if (!addr) +return NULL ; + +/* Load it once for all. */ +if (!dd.sym_count) +kernel_syms_load (&dd); +if (!dd.sym_count) +return NULL ; + + sym =kernel_syms_search (&dd, addr); +if (!sym && is_ibt_enabled && addr >=4 ) + sym =kernel_syms_search (&dd, addr -4 ); + +return sym; +} +static void show_uprobe_multi_json (struct bpf_link_info *info,json_writer_t *wtr) {
@@ -403,6 +428,43 @@ show_uprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr)jsonw_end_array (json_wtr); } +static void +show_tracing_multi_json (struct bpf_link_info *info,json_writer_t *wtr) +{ +bool is_ibt_enabled =is_x86_ibt_enabled (); +__u32 i; + +show_link_attach_type_json (info->tracing_multi.attach_type, wtr); +jsonw_uint_field (wtr,"func_cnt" , info->tracing_multi.count); +jsonw_uint_field (wtr,"obj_id" , info->tracing_multi.obj_id); +jsonw_name (wtr,"funcs" ); + +jsonw_start_array (wtr); + +for (i =0 ; i < info->tracing_multi.count; i++) { +__u64 addr =u64_to_arr (info->tracing_multi.addrs)[i]; +struct kernel_sym *sym; + + sym =find_kernel_sym_by_addr (addr, is_ibt_enabled); + +jsonw_start_object (wtr); +jsonw_uint_field (wtr,"id" ,u64_to_u32_arr (info->tracing_multi.ids)[i]); +jsonw_uint_field (wtr,"addr" , addr); +if (sym) { +jsonw_string_field (wtr,"func" , sym->name); +if (sym->module[0 ] =='\0' ) { +jsonw_name (wtr,"module" ); +jsonw_null (wtr); + }else { +jsonw_string_field (wtr,"module" , sym->module); + } + } +jsonw_uint_field (wtr,"cookie" ,u64_to_arr (info->tracing_multi.cookies)[i]); +jsonw_end_object (wtr); + } +jsonw_end_array (wtr); +} +static void show_perf_event_kprobe_json (struct bpf_link_info *info,json_writer_t *wtr) {
@@ -589,6 +651,9 @@ static int show_link_close_json(int fd, struct bpf_link_info *info)case BPF_LINK_TYPE_UPROBE_MULTI :show_uprobe_multi_json (info, json_wtr);break ; +case BPF_LINK_TYPE_TRACING_MULTI : +show_tracing_multi_json (info, json_wtr); +break ;case BPF_LINK_TYPE_PERF_EVENT :switch (info->perf_event.type) {case BPF_PERF_EVENT_EVENT :
@@ -833,6 +898,38 @@ static void show_uprobe_multi_plain(struct bpf_link_info *info) } } +static void show_tracing_multi_plain (struct bpf_link_info *info) +{ +bool is_ibt_enabled =is_x86_ibt_enabled (); +__u32 i; + +if (!info->tracing_multi.count) +return ; + +printf ("\n\t" ); +show_link_attach_type_plain (info->tracing_multi.attach_type); +printf ("obj_id %u " , info->tracing_multi.obj_id); +printf ("count %u " , info->tracing_multi.count); + +printf ("\n\t%-16s %-16s %-16s %s" , +"btf_id" ,"addr" ,"cookie" ,"func [module]" ); +for (i =0 ; i < info->tracing_multi.count; i++) { +__u64 addr =u64_to_arr (info->tracing_multi.addrs)[i]; +struct kernel_sym *sym; + + sym =find_kernel_sym_by_addr (addr, is_ibt_enabled); + +printf ("\n\t%-16u %016llx %-16llx" , +u64_to_u32_arr (info->tracing_multi.ids)[i], + addr,u64_to_arr (info->tracing_multi.cookies)[i]); +if (sym) { +printf (" %s" , sym->name); +if (sym->module[0 ] !='\0' ) +printf (" [%s]" , sym->module); + } + } +} +static void show_perf_event_kprobe_plain (struct bpf_link_info *info) {const char *buf;
@@ -989,6 +1086,9 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info)case BPF_LINK_TYPE_UPROBE_MULTI :show_uprobe_multi_plain (info);break ; +case BPF_LINK_TYPE_TRACING_MULTI : +show_tracing_multi_plain (info); +break ;case BPF_LINK_TYPE_PERF_EVENT :switch (info->perf_event.type) {case BPF_PERF_EVENT_EVENT :
@@ -1029,6 +1129,7 @@ static int show_link_close_plain(int fd, struct bpf_link_info *info)static int do_show_link (int fd) {__u64 *ref_ctr_offsets =NULL , *offsets =NULL , *cookies =NULL ; +__u32 *ids =NULL ;struct bpf_link_info info;__u32 len =sizeof (info);char path_buf[PATH_MAX ];
@@ -1114,6 +1215,39 @@ static int do_show_link(int fd) goto again; } } +if (info.type ==BPF_LINK_TYPE_TRACING_MULTI && + !info.tracing_multi.ids) { + count = info.tracing_multi.count; +if (count) { + ids =calloc (count,sizeof (__u32)); +if (!ids) { +p_err ("mem alloc failed" ); +close (fd); +return -ENOMEM ; + } + info.tracing_multi.ids =ptr_to_u64 (ids); + + addrs =calloc (count,sizeof (__u64)); +if (!addrs) { +p_err ("mem alloc failed" ); +free (ids); +close (fd); +return -ENOMEM ; + } + info.tracing_multi.addrs =ptr_to_u64 (addrs); + + cookies =calloc (count,sizeof (__u64)); +if (!cookies) { +p_err ("mem alloc failed" ); +free (addrs); +free (ids); +close (fd); +return -ENOMEM ; + } + info.tracing_multi.cookies =ptr_to_u64 (cookies); + goto again; + } + }if (info.type ==BPF_LINK_TYPE_PERF_EVENT ) {switch (info.perf_event.type) {case BPF_PERF_EVENT_TRACEPOINT :
@@ -1153,6 +1287,7 @@ static int do_show_link(int fd)free (cookies);free (offsets);free (addrs); +free (ids);close (fd);return 0 ; }
Signature · 1 line
2.54.0
[email protected]
AI reviewRe: [PATCH bpf-next 3/3] bpftool: Add tracing_multi link info output
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Medium] Repeated parsing of `/proc/kallsyms` in an O(N) loop when symbol loading fails. --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] Repeated parsing of /proc/kallsyms in an O(N) loop when symbol loading fails. --
commit 0f11f8e705a95b6aa483a05374ffb9b22bcb78c0
Author: Jiri Olsa <[email protected]>
bpftool: Add tracing_multi link info output
This commit adds bpftool support to show tracing_multi link details for both plain and JSON outputs.
Quoted 32 lines
tools/bpf/bpftool/link.c +24
-0@@ -377,6 +377,31 @@ static __u64 *u64_to_arr(__u64 val)return (__u64 *)u64_to_ptr (val); } +static __u32 *u64_to_u32_arr (__u64 val) +{ +return (__u32 *)u64_to_ptr (val); +} + +static struct kernel_sym *find_kernel_sym_by_addr (__u64 addr,bool is_ibt_enabled) +{ +struct kernel_sym *sym; + +if (!addr) +return NULL ; + +/* Load it once for all. */ +if (!dd.sym_count) +kernel_syms_load (&dd); +if (!dd.sym_count) +return NULL ; + + sym =kernel_syms_search (&dd, addr); +if (!sym && is_ibt_enabled && addr >=4 ) + sym =kernel_syms_search (&dd, addr -4 ); + +return sym; +}
[ ... ]
Quoted 12 lines
tools/bpf/bpftool/link.c +8
-0@@ -403,6 +428,43 @@ show_uprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr)jsonw_end_array (json_wtr); } +static void +show_tracing_multi_json (struct bpf_link_info *info,json_writer_t *wtr) +{ +bool is_ibt_enabled =is_x86_ibt_enabled (); +__u32 i; + +show_link_attach_type_json (info->tracing_multi.attach_type, wtr); +jsonw_uint_field (wtr,"func_cnt" , info->tracing_multi.count);
tools/bpf/bpftool/link.c show_uprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr) · line 448
Quoted 10 lines
tools/bpf/bpftool/link.c +10
-0+jsonw_uint_field (wtr,"obj_id" , info->tracing_multi.obj_id); +jsonw_name (wtr,"funcs" ); + +jsonw_start_array (wtr); + +for (i =0 ; i < info->tracing_multi.count; i++) { +__u64 addr =u64_to_arr (info->tracing_multi.addrs)[i]; +struct kernel_sym *sym; + + sym =find_kernel_sym_by_addr (addr, is_ibt_enabled);
[Severity: Medium]
If kernel_syms_load() fails (for example, due to kernel.kptr_restrict or a lack of read permissions for /proc/kallsyms), dd.sym_count remains 0.
Since find_kernel_sym_by_addr() checks !dd.sym_count to decide whether to load symbols, won't this cause /proc/kallsyms to be repeatedly opened and parsed on every iteration of this loop if the initial load fails?
This loop occurs here in show_tracing_multi_json() as well as in show_tracing_multi_plain(). For tracing_multi links with potentially thousands of targets, could this result in a significant performance hang for bpftool?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
Re: [PATCH bpf-next 3/3] bpftool: Add tracing_multi link info output
Quoted 74 lines · On Sun, Jun 21, 2026 at 08:56:27PM +0000, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] Repeated parsing of/proc/kallsymsin an O(N) loop when symbol loading fails. --commit
0f11f8e705a95b6aa483a05374ffb9b22bcb78c0
Author: Jiri Olsa <[email protected]>bpftool: Add
tracing_multilink info outputThis commit adds bpftool support to show
tracing_multilink details for both plain and JSON outputs.Quoted 32 lines
tools/bpf/bpftool/link.c +24
-0@@ -377,6 +377,31 @@ static __u64 *u64_to_arr(__u64 val)return (__u64 *)u64_to_ptr (val); } +static __u32 *u64_to_u32_arr (__u64 val) +{ +return (__u32 *)u64_to_ptr (val); +} + +static struct kernel_sym *find_kernel_sym_by_addr (__u64 addr,bool is_ibt_enabled) +{ +struct kernel_sym *sym; + +if (!addr) +return NULL ; + +/* Load it once for all. */ +if (!dd.sym_count) +kernel_syms_load (&dd); +if (!dd.sym_count) +return NULL ; + + sym =kernel_syms_search (&dd, addr); +if (!sym && is_ibt_enabled && addr >=4 ) + sym =kernel_syms_search (&dd, addr -4 ); + +return sym; +}[ ... ]
Quoted 12 lines
tools/bpf/bpftool/link.c +8
-0@@ -403,6 +428,43 @@ show_uprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr)jsonw_end_array (json_wtr); } +static void +show_tracing_multi_json (struct bpf_link_info *info,json_writer_t *wtr) +{ +bool is_ibt_enabled =is_x86_ibt_enabled (); +__u32 i; + +show_link_attach_type_json (info->tracing_multi.attach_type, wtr); +jsonw_uint_field (wtr,"func_cnt" , info->tracing_multi.count);tools/bpf/bpftool/link.c show_uprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr) · line 448
Quoted 10 lines
tools/bpf/bpftool/link.c +10
-0+jsonw_uint_field (wtr,"obj_id" , info->tracing_multi.obj_id); +jsonw_name (wtr,"funcs" ); + +jsonw_start_array (wtr); + +for (i =0 ; i < info->tracing_multi.count; i++) { +__u64 addr =u64_to_arr (info->tracing_multi.addrs)[i]; +struct kernel_sym *sym; + + sym =find_kernel_sym_by_addr (addr, is_ibt_enabled);[Severity: Medium]
Ifkernel_syms_load()fails (for example, due to kernel.kptr_restrict or a lack of read permissions for/proc/kallsyms), dd.sym_count remains 0.
Quoted 7 lines
Since
find_kernel_sym_by_addr()checks !dd.sym_count to decide whether to load symbols, won't this cause/proc/kallsymsto be repeatedly opened and parsed on every iteration of this loop if the initial load fails?This loop occurs here in
show_tracing_multi_json()as well as inshow_tracing_multi_plain(). Fortracing_multilinks with potentially thousands of targets, could this result in a significant performance hang for bpftool?
ok, I think we can make sure the parsing happens just once with the change below, will do that in next version
jirka
---
tools/bpf/bpftool/link.c +12 -10
@@ -389,12 +389,6 @@ static struct kernel_sym *find_kernel_sym_by_addr(__u64 addr, bool is_ibt_enableif (!addr)return NULL ; -/* Load it once for all. */ -if (!dd.sym_count) -kernel_syms_load (&dd); -if (!dd.sym_count) -return NULL ; - sym =kernel_syms_search (&dd, addr);if (!sym && is_ibt_enabled && addr >=4 ) sym =kernel_syms_search (&dd, addr -4 );
@@ -431,9 +425,13 @@ show_uprobe_multi_json(struct bpf_link_info *info, json_writer_t *wtr)static void show_tracing_multi_json (struct bpf_link_info *info,json_writer_t *wtr) { -bool is_ibt_enabled =is_x86_ibt_enabled (); +bool is_ibt_enabled =is_x86_ibt_enabled (), show_symbol;__u32 i; +if (!dd.sym_count) +kernel_syms_load (&dd); + show_symbol = !!dd.sym_count; +show_link_attach_type_json (info->tracing_multi.attach_type, wtr);jsonw_uint_field (wtr,"func_cnt" , info->tracing_multi.count);jsonw_uint_field (wtr,"obj_id" , info->tracing_multi.obj_id);
@@ -445,7 +443,7 @@ show_tracing_multi_json(struct bpf_link_info *info, json_writer_t *wtr)__u64 addr =u64_to_arr (info->tracing_multi.addrs)[i];struct kernel_sym *sym; - sym =find_kernel_sym_by_addr (addr, is_ibt_enabled); + sym = show_symbol ?find_kernel_sym_by_addr (addr, is_ibt_enabled) :NULL ;jsonw_start_object (wtr);jsonw_uint_field (wtr,"id" ,u64_to_u32_arr (info->tracing_multi.ids)[i]);
@@ -900,12 +898,16 @@ static void show_uprobe_multi_plain(struct bpf_link_info *info)static void show_tracing_multi_plain (struct bpf_link_info *info) { -bool is_ibt_enabled =is_x86_ibt_enabled (); +bool is_ibt_enabled =is_x86_ibt_enabled (), show_symbol;__u32 i;if (!info->tracing_multi.count)return ; +if (!dd.sym_count) +kernel_syms_load (&dd); + show_symbol = !!dd.sym_count; +printf ("\n\t" );show_link_attach_type_plain (info->tracing_multi.attach_type);printf ("obj_id %u " , info->tracing_multi.obj_id);
@@ -917,7 +919,7 @@ static void show_tracing_multi_plain(struct bpf_link_info *info)__u64 addr =u64_to_arr (info->tracing_multi.addrs)[i];struct kernel_sym *sym; - sym =find_kernel_sym_by_addr (addr, is_ibt_enabled); + sym = show_symbol ?find_kernel_sym_by_addr (addr, is_ibt_enabled) :NULL ; printf("\n\t%-16u %016llx %-16llx", u64_to_u32_arr(info->tracing_multi.ids)[i],