From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Andrii Nakryiko <andrii@kernel.org>
Cc: bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
Martin KaFai Lau <kafai@fb.com>,
Eduard Zingerman <eddyz87@gmail.com>,
Song Liu <songliubraving@fb.com>, Yonghong Song <yhs@fb.com>,
Menglong Dong <menglong8.dong@gmail.com>,
Steven Rostedt <rostedt@kernel.org>
Subject: [PATCHv2 bpf-next 12/23] bpf: Add support for tracing_multi link fdinfo
Date: Wed, 4 Mar 2026 23:21:30 +0100 [thread overview]
Message-ID: <20260304222141.497203-13-jolsa@kernel.org> (raw)
In-Reply-To: <20260304222141.497203-1-jolsa@kernel.org>
Adding tracing_multi link fdinfo support with following output:
pos: 0
flags: 02000000
mnt_id: 19
ino: 3091
link_type: tracing_multi
link_id: 382
prog_tag: 62073a1123f07ef7
prog_id: 715
cnt: 10
cookie BTF-id func
0 91187 bpf_fentry_test1+0x4/0x10
0 91188 bpf_fentry_test10+0x4/0x10
0 91189 bpf_fentry_test2+0x4/0x10
0 91190 bpf_fentry_test3+0x4/0x20
0 91191 bpf_fentry_test4+0x4/0x20
0 91192 bpf_fentry_test5+0x4/0x20
0 91193 bpf_fentry_test6+0x4/0x20
0 91194 bpf_fentry_test7+0x4/0x10
0 91195 bpf_fentry_test8+0x4/0x10
0 91196 bpf_fentry_test9+0x4/0x10
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
kernel/trace/bpf_trace.c | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 3070b9de174d..e9951c4237e1 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -3618,9 +3618,35 @@ static void bpf_tracing_multi_link_dealloc(struct bpf_link *link)
kvfree(tr_link);
}
+#ifdef CONFIG_PROC_FS
+static void bpf_tracing_multi_show_fdinfo(const struct bpf_link *link,
+ struct seq_file *seq)
+{
+ struct bpf_tracing_multi_link *tr_link =
+ container_of(link, struct bpf_tracing_multi_link, link);
+ bool has_cookies = !!tr_link->cookies;
+
+ seq_printf(seq, "cnt:\t%u\n", tr_link->nodes_cnt);
+
+ seq_printf(seq, "%18s %10s %s\n", "cookie", "BTF-id", "func");
+ for (int i = 0; i < tr_link->nodes_cnt; i++) {
+ struct bpf_tracing_multi_node *mnode = &tr_link->nodes[i];
+ u32 btf_id;
+
+ bpf_trampoline_unpack_key(mnode->trampoline->key, NULL, &btf_id);
+ seq_printf(seq, "%18llx %10u %pS\n",
+ has_cookies ? tr_link->cookies[i] : 0,
+ btf_id, (void *) mnode->trampoline->ip);
+ }
+}
+#endif
+
static const struct bpf_link_ops bpf_tracing_multi_link_lops = {
.release = bpf_tracing_multi_link_release,
.dealloc_deferred = bpf_tracing_multi_link_dealloc,
+#ifdef CONFIG_PROC_FS
+ .show_fdinfo = bpf_tracing_multi_show_fdinfo,
+#endif
};
int bpf_tracing_multi_attach(struct bpf_prog *prog, const union bpf_attr *attr)
--
2.53.0
next prev parent reply other threads:[~2026-03-04 22:23 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-04 22:21 [PATCHv2 bpf-next 00/23] bpf: tracing_multi link Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 01/23] ftrace: Add ftrace_hash_count function Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 02/23] bpf: Use mutex lock pool for bpf trampolines Jiri Olsa
2026-03-04 23:02 ` bot+bpf-ci
2026-03-05 14:01 ` Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 03/23] bpf: Add struct bpf_trampoline_ops object Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 04/23] bpf: Add struct bpf_tramp_node object Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 05/23] bpf: Factor fsession link to use struct bpf_tramp_node Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 06/23] bpf: Add multi tracing attach types Jiri Olsa
2026-03-04 23:02 ` bot+bpf-ci
2026-03-05 14:02 ` Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 07/23] bpf: Move sleepable verification code to btf_id_allow_sleepable Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 08/23] bpf: Add bpf_trampoline_multi_attach/detach functions Jiri Olsa
2026-03-04 23:02 ` bot+bpf-ci
2026-03-05 14:02 ` Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 09/23] bpf: Add support for tracing multi link Jiri Olsa
2026-03-04 23:02 ` bot+bpf-ci
2026-03-05 14:02 ` Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 10/23] bpf: Add support for tracing_multi link cookies Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 11/23] bpf: Add support for tracing_multi link session Jiri Olsa
2026-03-04 22:21 ` Jiri Olsa [this message]
2026-03-04 23:02 ` [PATCHv2 bpf-next 12/23] bpf: Add support for tracing_multi link fdinfo bot+bpf-ci
2026-03-05 14:01 ` Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 13/23] libbpf: Add bpf_object_cleanup_btf function Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 14/23] libbpf: Add bpf_link_create support for tracing_multi link Jiri Olsa
2026-03-04 23:02 ` bot+bpf-ci
2026-03-05 14:01 ` Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 15/23] libbpf: Add support to create tracing multi link Jiri Olsa
2026-03-04 23:02 ` bot+bpf-ci
2026-03-05 14:02 ` Jiri Olsa
2026-03-05 6:59 ` Leon Hwang
2026-03-05 14:02 ` Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 16/23] selftests/bpf: Add tracing multi skel/pattern/ids attach tests Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 17/23] selftests/bpf: Add tracing multi skel/pattern/ids module " Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 18/23] selftests/bpf: Add tracing multi intersect tests Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 19/23] selftests/bpf: Add tracing multi cookies test Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 20/23] selftests/bpf: Add tracing multi session test Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 21/23] selftests/bpf: Add tracing multi attach fails test Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 22/23] selftests/bpf: Add tracing multi attach benchmark test Jiri Olsa
2026-03-05 7:30 ` Leon Hwang
2026-03-05 14:01 ` Jiri Olsa
2026-03-04 22:21 ` [PATCHv2 bpf-next 23/23] selftests/bpf: Add tracing multi rollback tests Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260304222141.497203-13-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=kafai@fb.com \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=menglong8.dong@gmail.com \
--cc=rostedt@kernel.org \
--cc=songliubraving@fb.com \
--cc=yhs@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox