bpf: tracing_multi link
Subsystems (22)
Jiri Olsa
reviewerv3 cover bpf: tracing_multi link
hi,
adding tracing_multi link support that allows fast attachment of tracing program to many functions.
RFC: https://lore.kernel.org/bpf/[email protected]/
v1: https://lore.kernel.org/bpf/[email protected]/
v2: https://lore.kernel.org/bpf/[email protected]/
v3 changes:
- fix module parsing [Leon Hwang]
- use function traceable check from libbpf [Leon Hwang]
- use ptr_to_u64 and fix/updated few comments [ci]
- display cookies as decimal numbers [ci]
- added link_create.flags check [ci]
- fix error path in bpf_trampoline_multi_detach [ci]
- make fentry/fexit.multi not extendable [ci]
- add missing OPTS_VALID to bpf_program__attach_tracing_multi [ci]
v2 changes:
- allocate data.unreg in bpf_trampoline_multi_attach for rollback path [ci] and fixed link count setup in rollback path [ci]
- several small assorted fixes [ci]
- added loongarch and powerpc changes for struct bpf_tramp_node change
- added support to attach functions from modules
- added tests for sleepable programs
- added rollback tests
v1 changes:
- added ftrace_hash_count as wrapper for hash_count [Steven]
- added trampoline mutex pool [Andrii]
- reworked 'struct bpf_tramp_node' separatoin [Andrii]
- the 'struct bpf_tramp_node' now holds pointer to bpf_link, which is similar to what we do for uprobe_multi;
I understand it's not a fundamental change compared to previous version which used bpf_prog pointer instead, but I don't see better way of doing this.. I'm happy to discuss this further if there's better idea
- reworked 'struct bpf_fsession_link' based on bpf_tramp_node
- made btf__find_by_glob_kind function internal helper [Andrii]
- many small assorted fixes [Andrii,CI]
- added session support [Leon Hwang]
- added cookies support
- added more tests
Note I plan to send linkinfo support separately, the patchset is big enough.
thanks,
jirka
---
Jiri Olsa (24):
ftrace: Add ftrace_hash_count function
bpf: Use mutex lock pool for bpf trampolines
bpf: Add struct bpf_trampoline_ops object
bpf: Add struct bpf_tramp_node object
bpf: Factor fsession link to use struct bpf_tramp_node
bpf: Add multi tracing attach types
bpf: Move sleepable verification code to btf_id_allow_sleepable
bpf: Add bpf_trampoline_multi_attach/detach functions
bpf: Add support for tracing multi link
bpf: Add support for tracing_multi link cookies
bpf: Add support for tracing_multi link session
bpf: Add support for tracing_multi link fdinfo
libbpf: Add bpf_object_cleanup_btf function
libbpf: Add bpf_link_create support for tracing_multi link
libbpf: Add btf_type_is_traceable_func function
libbpf: Add support to create tracing multi link selftests/bpf: Add tracing multi skel/pattern/ids attach tests selftests/bpf: Add tracing multi skel/pattern/ids module attach tests selftests/bpf: Add tracing multi intersect tests selftests/bpf: Add tracing multi cookies test selftests/bpf: Add tracing multi session test selftests/bpf: Add tracing multi attach fails test selftests/bpf: Add tracing multi attach benchmark test selftests/bpf: Add tracing multi attach rollback tests
arch/arm64/net/bpf_jit_comp.c | 58 +++--- arch/loongarch/net/bpf_jit.c | 44 ++--- arch/powerpc/net/bpf_jit_comp.c | 46 ++--- arch/riscv/net/bpf_jit_comp64.c | 52 +++--- arch/s390/net/bpf_jit_comp.c | 44 ++--- arch/x86/net/bpf_jit_comp.c | 54 +++--- include/linux/bpf.h | 91 ++++++--- include/linux/bpf_types.h | 1 + include/linux/bpf_verifier.h | 3 + include/linux/btf_ids.h | 1 + include/linux/ftrace.h | 1 + include/linux/trace_events.h | 6 + include/uapi/linux/bpf.h | 9 + kernel/bpf/bpf_struct_ops.c | 27 +-- kernel/bpf/btf.c | 4 + kernel/bpf/syscall.c | 88 +++++---- kernel/bpf/trampoline.c | 512 ++++++++++++++++++++++++++++++++++++++++---------- kernel/bpf/verifier.c | 124 +++++++++--- kernel/trace/bpf_trace.c | 149 ++++++++++++++- kernel/trace/ftrace.c | 7 +- net/bpf/bpf_dummy_struct_ops.c | 14 +- net/bpf/test_run.c | 3 + tools/include/uapi/linux/bpf.h | 10 + tools/lib/bpf/bpf.c | 9 + tools/lib/bpf/bpf.h | 5 + tools/lib/bpf/libbpf.c | 337 ++++++++++++++++++++++++++++++++- tools/lib/bpf/libbpf.h | 15 ++ tools/lib/bpf/libbpf.map | 1 + tools/lib/bpf/libbpf_internal.h | 1 + tools/testing/selftests/bpf/Makefile | 9 +- tools/testing/selftests/bpf/prog_tests/tracing_multi.c | 860 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/progs/tracing_multi_attach.c | 40 ++++ tools/testing/selftests/bpf/progs/tracing_multi_attach_module.c | 26 +++ tools/testing/selftests/bpf/progs/tracing_multi_bench.c | 13 ++ tools/testing/selftests/bpf/progs/tracing_multi_check.c | 213 +++++++++++++++++++++ tools/testing/selftests/bpf/progs/tracing_multi_fail.c | 19 ++ tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c | 42 +++++ tools/testing/selftests/bpf/progs/tracing_multi_rollback.c | 38 ++++ tools/testing/selftests/bpf/progs/tracing_multi_session_attach.c | 43 +++++ tools/testing/selftests/bpf/trace_helpers.c | 6 +- tools/testing/selftests/bpf/trace_helpers.h | 1 + 41 files changed, 2661 insertions(+), 365 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_multi.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_attach.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_attach_module.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_bench.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_check.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_fail.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_rollback.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_session_attach.c
Jiri Olsa
reviewerPATCH v3 1/24 ftrace: Add ftrace_hash_count function
Adding external ftrace_hash_count function so we could get hash count outside of ftrace object.
--- include/linux/ftrace.h | 1 + kernel/trace/ftrace.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
include/linux/ftrace.h +1 -0
@@ -415,6 +415,7 @@ struct ftrace_hash *alloc_ftrace_hash(int size_bits);void free_ftrace_hash (struct ftrace_hash *hash);struct ftrace_func_entry *add_ftrace_hash_entry_direct (struct ftrace_hash *hash,unsigned long ip,unsigned long direct); +unsigned long ftrace_hash_count (struct ftrace_hash *hash);/* The hash used to know what functions callbacks trace */ struct ftrace_ops_hash {
kernel/trace/ftrace.c +6 -1
@@ -6288,11 +6288,16 @@ int modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr) }EXPORT_SYMBOL_GPL (modify_ftrace_direct); -static unsigned long hash_count (struct ftrace_hash *hash) +static inline unsigned long hash_count (struct ftrace_hash *hash) {return hash ? hash->count :0 ; } +unsigned long ftrace_hash_count (struct ftrace_hash *hash) +{ +return hash_count (hash); +} +/** * hash_add - adds two struct ftrace_hash and returns the result * @a: struct ftrace_hash object
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 2/24 bpf: Use mutex lock pool for bpf trampolines
In reply to Jiri OlsaAdding mutex lock pool that replaces bpf trampolines mutex.
For tracing_multi link coming in following changes we need to lock all the involved trampolines during the attachment. This could mean thousands of mutex locks, which is not convenient.
As suggested by Andrii we can replace bpf trampolines mutex with mutex pool, where each trampoline is hash-ed to one of the locks from the pool.
It's better to lock all the pool mutexes (32 at the moment) than thousands of them.
There is 48 (MAX_LOCK_DEPTH) lock limit allowed to be simultaneously held by task, so we need to keep 32 mutexes (5 bits) in the pool, so when we lock them all in following changes the lockdep won't scream.
Removing the mutex_is_locked in bpf_trampoline_put, because we removed the mutex from bpf_trampoline.
--- include/linux/bpf.h | 2 -- kernel/bpf/trampoline.c | 76 ++++++++++++++++++++++++++++------------- 2 files changed, 52 insertions(+), 26 deletions(-)
include/linux/bpf.h +0 -2
@@ -1335,8 +1335,6 @@ struct bpf_trampoline {/* hlist for trampoline_ip_table */ struct hlist_node hlist_ip;struct ftrace_ops *fops; -/* serializes access to fields of this trampoline */ -struct mutex mutex;refcount_t refcnt;u32 flags;u64 key;
kernel/bpf/trampoline.c +52 -24
182 lines not on this page · raw message
Signature · 1 line
2.53.0
[email protected]
AI reviewRe: [PATCHv3 bpf-next 02/24] bpf: Use mutex lock pool for bpf trampolines
During v1 review, Alexei asked to add a comment explaining both the pool size of 32 and why per-lock class keys are needed:
Quoted 4 lines
kernel/bpf/trampoline.c +0
-0
[ ... ]
kernel/bpf/trampoline.c static struct hlist_head trampoline_ip_table[TRAMPOLINE_TABLE_SIZE]; · line 44
Quoted 12 lines
kernel/bpf/trampoline.c +12
-0+/* +* We keep 32 trampoline locks (5 bits) in the pool, because there +* is 48 (MAX_LOCK_DEPTH) locks limit allowed to be simultaneously +* held by task. +*/ +#define TRAMPOLINE_LOCKS_BITS 5 +#define TRAMPOLINE_LOCKS_TABLE_SIZE (1 << TRAMPOLINE_LOCKS_BITS) + +static struct { +struct mutex mutex; +struct lock_class_key key; +} trampoline_locks[TRAMPOLINE_LOCKS_TABLE_SIZE ];
During v1 review, Alexei asked to add a comment explaining both the pool size of 32 and why per-lock class keys are needed:
https://lore.kernel.org/bpf/CAADnVQL_Jpe_7a55HTn5CyYoxWcHahiK3+CDeOeURqZAuf+teA@mail.gmail.com/
The comment explains the 32 count (MAX_LOCK_DEPTH limit), but does it also need to mention why each lock has its own lock_class_key? Without that, it is not obvious that distinct keys are required to avoid lockdep "recursive locking" warnings when trampoline_lock_all() acquires all 32 pool mutexes simultaneously.
---
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/23133791558
Re: [PATCHv3 bpf-next 02/24] bpf: Use mutex lock pool for bpf trampolines
Quoted 23 lines · On Mon, Mar 16, 2026 at 08:35:14AM +0000, [email protected] wrote:
Quoted 4 lines
kernel/bpf/trampoline.c +0
-0[ ... ]
kernel/bpf/trampoline.c static struct hlist_head trampoline_ip_table[TRAMPOLINE_TABLE_SIZE]; · line 44
Quoted 12 lines
kernel/bpf/trampoline.c +12
-0+/* +* We keep 32 trampoline locks (5 bits) in the pool, because there +* is 48 (MAX_LOCK_DEPTH) locks limit allowed to be simultaneously +* held by task. +*/ +#define TRAMPOLINE_LOCKS_BITS 5 +#define TRAMPOLINE_LOCKS_TABLE_SIZE (1 << TRAMPOLINE_LOCKS_BITS) + +static struct { +struct mutex mutex; +struct lock_class_key key; +} trampoline_locks[TRAMPOLINE_LOCKS_TABLE_SIZE ];During v1 review, Alexei asked to add a comment explaining both the pool size of 32 and why per-lock class keys are needed:
Quoted 7 lines
https://lore.kernel.org/bpf/CAADnVQL_Jpe_7a55HTn5CyYoxWcHahiK3+CDeOeURqZAuf+teA@mail.gmail.com/
The comment explains the 32 count (
MAX_LOCK_DEPTHlimit), but does it also need to mention why each lock has its ownlock_class_key? Without that, it is not obvious that distinct keys are required to avoid lockdep "recursive locking" warnings whentrampoline_lock_all()acquires all 32 pool mutexes simultaneously.
yep, will add
jirka
Quoted 7 lines
---
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/23133791558
Jiri Olsa
reviewerPATCH v3 3/24 bpf: Add struct bpf_trampoline_ops object
In reply to Jiri OlsaIn following changes we will need to override ftrace direct attachment behaviour. In order to do that we are adding struct bpf_trampoline_ops object that defines callbacks for ftrace direct attachment:
register_fentry
unregister_fentry
modify_fentry
The new struct bpf_trampoline_ops object is passed as an argument to __bpf_trampoline_link/unlink_prog functions.
At the moment the default trampoline_ops is set to the current ftrace direct attachment functions, so there's no functional change for the current code.
--- kernel/bpf/trampoline.c | 59 ++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 18 deletions(-)
kernel/bpf/trampoline.c +41 -18
@@ -58,8 +58,18 @@ static void trampoline_unlock(struct bpf_trampoline *tr)mutex_unlock (select_trampoline_lock (tr)); } +struct bpf_trampoline_ops { +int (*register_fentry)(struct bpf_trampoline *tr,void *new_addr,void *data); +int (*unregister_fentry)(struct bpf_trampoline *tr,u32 orig_flags,void *old_addr, +void *data); +int (*modify_fentry)(struct bpf_trampoline *tr,u32 orig_flags,void *old_addr, +void *new_addr,bool lock_direct_mutex,void *data); +}; +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS -static int bpf_trampoline_update (struct bpf_trampoline *tr,bool lock_direct_mutex); +static int bpf_trampoline_update (struct bpf_trampoline *tr,bool lock_direct_mutex, +struct bpf_trampoline_ops *ops,void *data); +static struct bpf_trampoline_ops trampoline_ops;#ifdef CONFIG_HAVE_SINGLE_FTRACE_DIRECT_OPS static struct bpf_trampoline *direct_ops_ip_lookup (struct ftrace_ops *ops,unsigned long ip)
@@ -144,13 +154,15 @@ static int bpf_tramp_ftrace_ops_func(struct ftrace_ops *ops, unsigned long ip,if ((tr->flags &BPF_TRAMP_F_CALL_ORIG ) && !(tr->flags &BPF_TRAMP_F_ORIG_STACK )) - ret =bpf_trampoline_update (tr, false/* lock_direct_mutex */ ); + ret =bpf_trampoline_update (tr, false/* lock_direct_mutex */ , + &trampoline_ops,NULL );break ;case FTRACE_OPS_CMD_DISABLE_SHARE_IPMODIFY_PEER : tr->flags &= ~BPF_TRAMP_F_SHARE_IPMODIFY ;if (tr->flags &BPF_TRAMP_F_ORIG_STACK ) - ret =bpf_trampoline_update (tr, false/* lock_direct_mutex */ ); + ret =bpf_trampoline_update (tr, false/* lock_direct_mutex */ , + &trampoline_ops,NULL );break ;default : ret = -EINVAL ;
@@ -414,7 +426,7 @@ static int bpf_trampoline_update_fentry(struct bpf_trampoline *tr, u32 orig_flag }static int unregister_fentry (struct bpf_trampoline *tr,u32 orig_flags, -void *old_addr) +void *old_addr,void *data) {int ret;
@@ -428,7 +440,7 @@ static int unregister_fentry(struct bpf_trampoline *tr, u32 orig_flags,static int modify_fentry (struct bpf_trampoline *tr,u32 orig_flags,void *old_addr,void *new_addr, -bool lock_direct_mutex) +bool lock_direct_mutex,void *data__maybe_unused ) {int ret;
@@ -442,7 +454,7 @@ static int modify_fentry(struct bpf_trampoline *tr, u32 orig_flags, }/* first time registering */ -static int register_fentry (struct bpf_trampoline *tr,void *new_addr) +static int register_fentry (struct bpf_trampoline *tr,void *new_addr,void *data__maybe_unused ) {void *ip = tr->func.addr;unsigned long faddr;
@@ -464,6 +476,12 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr)return ret; } +static struct bpf_trampoline_ops trampoline_ops = { + .register_fentry = register_fentry, + .unregister_fentry = unregister_fentry, + .modify_fentry = modify_fentry, +}; +static struct bpf_tramp_links *bpf_trampoline_get_progs (const struct bpf_trampoline *tr,int *total,bool *ip_arg) {
@@ -631,7 +649,8 @@ static struct bpf_tramp_image *bpf_tramp_image_alloc(u64 key, int size)return ERR_PTR (err); } -static int bpf_trampoline_update (struct bpf_trampoline *tr,bool lock_direct_mutex) +static int bpf_trampoline_update (struct bpf_trampoline *tr,bool lock_direct_mutex, +struct bpf_trampoline_ops *ops,void *data) {struct bpf_tramp_image *im;struct bpf_tramp_links *tlinks;
@@ -644,7 +663,7 @@ static int bpf_trampoline_update(struct bpf_trampoline *tr, bool lock_direct_mutreturn PTR_ERR (tlinks);if (total ==0 ) { - err =unregister_fentry (tr, orig_flags, tr->cur_image->image); + err = ops->unregister_fentry (tr, orig_flags, tr->cur_image->image, data);bpf_tramp_image_put (tr->cur_image); tr->cur_image =NULL ; goto out;
@@ -715,11 +734,11 @@ static int bpf_trampoline_update(struct bpf_trampoline *tr, bool lock_direct_mutWARN_ON (tr->cur_image && total ==0 );if (tr->cur_image)/* progs already running at this address */ - err =modify_fentry (tr, orig_flags, tr->cur_image->image, - im->image, lock_direct_mutex); + err = ops->modify_fentry (tr, orig_flags, tr->cur_image->image, + im->image, lock_direct_mutex, data);else /* first time registering */ - err =register_fentry (tr, im->image); + err = ops->register_fentry (tr, im->image, data);#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS if (err == -EAGAIN ) {
@@ -793,7 +812,9 @@ static int bpf_freplace_check_tgt_prog(struct bpf_prog *tgt_prog)static int __bpf_trampoline_link_prog (struct bpf_tramp_link *link,struct bpf_trampoline *tr, -struct bpf_prog *tgt_prog) +struct bpf_prog *tgt_prog, +struct bpf_trampoline_ops *ops, +void *data) {struct bpf_fsession_link *fslink =NULL ;enum bpf_tramp_prog_type kind;
@@ -851,7 +872,7 @@ static int __bpf_trampoline_link_prog(struct bpf_tramp_link *link, }else { tr->progs_cnt[kind]++; } - err =bpf_trampoline_update (tr, true/* lock_direct_mutex */ ); + err =bpf_trampoline_update (tr, true/* lock_direct_mutex */ , ops, data);if (err) {hlist_del_init (&link->tramp_hlist);if (kind ==BPF_TRAMP_FSESSION ) {
@@ -872,14 +893,16 @@ int bpf_trampoline_link_prog(struct bpf_tramp_link *link,int err;trampoline_lock (tr); - err =__bpf_trampoline_link_prog (link, tr, tgt_prog); + err =__bpf_trampoline_link_prog (link, tr, tgt_prog, &trampoline_ops,NULL );trampoline_unlock (tr);return err; }static int __bpf_trampoline_unlink_prog (struct bpf_tramp_link *link,struct bpf_trampoline *tr, -struct bpf_prog *tgt_prog) +struct bpf_prog *tgt_prog, +struct bpf_trampoline_ops *ops, +void *data) {enum bpf_tramp_prog_type kind;int err;
@@ -904,7 +927,7 @@ static int __bpf_trampoline_unlink_prog(struct bpf_tramp_link *link, }hlist_del_init (&link->tramp_hlist); tr->progs_cnt[kind]--; -return bpf_trampoline_update (tr, true/* lock_direct_mutex */ ); +return bpf_trampoline_update (tr, true/* lock_direct_mutex */ , ops, data); }/* bpf_trampoline_unlink_prog() should never fail. */
@@ -915,7 +938,7 @@ int bpf_trampoline_unlink_prog(struct bpf_tramp_link *link,int err;trampoline_lock (tr); - err =__bpf_trampoline_unlink_prog (link, tr, tgt_prog); + err =__bpf_trampoline_unlink_prog (link, tr, tgt_prog, &trampoline_ops,NULL );trampoline_unlock (tr);return err; }
@@ -1044,7 +1067,7 @@ int bpf_trampoline_link_cgroup_shim(struct bpf_prog *prog, goto err; } - err =__bpf_trampoline_link_prog (&shim_link->link, tr,NULL ); + err =__bpf_trampoline_link_prog (&shim_link->link, tr,NULL , &trampoline_ops,NULL );if (err) goto err;
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 4/24 bpf: Add struct bpf_tramp_node object
In reply to Jiri OlsaAdding struct bpf_tramp_node to decouple the link out of the trampoline attachment info.
At the moment the object for attaching bpf program to the trampoline is 'struct bpf_tramp_link':
struct bpf_tramp_link {
struct bpf_link link;
struct hlist_node tramp_hlist;
u64 cookie;
}The link holds the bpf_prog pointer and forces one link - one program binding logic. In following changes we want to attach program to multiple trampolines but we want to keep just one bpf_link object.
Splitting struct bpf_tramp_link into:
struct bpf_tramp_link {
struct bpf_link link;
struct bpf_tramp_node node;
};
struct bpf_tramp_node {
struct bpf_link *link;
struct hlist_node tramp_hlist;
u64 cookie;
};The 'struct bpf_tramp_link' defines standard single trampoline link and 'struct bpf_tramp_node' is the attachment trampoline object with pointer to the bpf_link object.
This will allow us to define link for multiple trampolines, like:
struct bpf_tracing_multi_link {
struct bpf_link link;
...
int nodes_cnt;
struct bpf_tracing_multi_node nodes[] __counted_by(nodes_cnt);
};--- arch/arm64/net/bpf_jit_comp.c | 58 +++++++++--------- arch/loongarch/net/bpf_jit.c | 44 ++++++------- arch/powerpc/net/bpf_jit_comp.c | 46 +++++++------- arch/riscv/net/bpf_jit_comp64.c | 52 ++++++++-------- arch/s390/net/bpf_jit_comp.c | 44 ++++++------- arch/x86/net/bpf_jit_comp.c | 54 ++++++++-------- include/linux/bpf.h | 60 +++++++++++------- kernel/bpf/bpf_struct_ops.c | 27 ++++---- kernel/bpf/syscall.c | 39 ++++++------ kernel/bpf/trampoline.c | 105 ++++++++++++++++---------------- net/bpf/bpf_dummy_struct_ops.c | 14 ++--- 11 files changed, 281 insertions(+), 262 deletions(-)
arch/arm64/net/bpf_jit_comp.c +29 -29
@@ -2288,24 +2288,24 @@ bool bpf_jit_supports_subprog_tailcalls(void)return true; } -static void invoke_bpf_prog (struct jit_ctx *ctx,struct bpf_tramp_link *l, +static void invoke_bpf_prog (struct jit_ctx *ctx,struct bpf_tramp_node *node,int bargs_off,int retval_off,int run_ctx_off,bool save_ret) {__le32 *branch;u64 enter_prog;u64 exit_prog; -struct bpf_prog *p = l->link.prog; +struct bpf_prog *p = node->link->prog;int cookie_off = offsetof(struct bpf_tramp_run_ctx , bpf_cookie); enter_prog = (u64 )bpf_trampoline_enter (p); exit_prog = (u64 )bpf_trampoline_exit (p); -if (l->cookie ==0 ) { +if (node->cookie ==0 ) {/* if cookie is zero, one instruction is enough to store it */ emit (A64_STR64I (A64_ZR ,A64_SP , run_ctx_off + cookie_off), ctx); }else { -emit_a64_mov_i64 (A64_R (10 ), l->cookie, ctx); +emit_a64_mov_i64 (A64_R (10 ), node->cookie, ctx);emit (A64_STR64I (A64_R (10 ),A64_SP , run_ctx_off + cookie_off), ctx); }
@@ -2355,7 +2355,7 @@ static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_link *l,emit_call (exit_prog, ctx); } -static void invoke_bpf_mod_ret (struct jit_ctx *ctx,struct bpf_tramp_links *tl, +static void invoke_bpf_mod_ret (struct jit_ctx *ctx,struct bpf_tramp_nodes *tn,int bargs_off,int retval_off,int run_ctx_off,__le32 **branches) {
@@ -2365,8 +2365,8 @@ static void invoke_bpf_mod_ret(struct jit_ctx *ctx, struct bpf_tramp_links *tl,* Set this to 0 to avoid confusing the program. */ emit (A64_STR64I (A64_ZR ,A64_SP , retval_off), ctx); -for (i =0 ; i < tl->nr_links; i++) { -invoke_bpf_prog (ctx, tl->links[i], bargs_off, retval_off, +for (i =0 ; i < tn->nr_nodes; i++) { +invoke_bpf_prog (ctx, tn->nodes[i], bargs_off, retval_off, run_ctx_off, true);/* if (*(u64 *)(sp + retval_off) != 0) * goto do_fexit;
@@ -2497,10 +2497,10 @@ static void restore_args(struct jit_ctx *ctx, int bargs_off, int nregs) } } -static bool is_struct_ops_tramp (const struct bpf_tramp_links *fentry_links) +static bool is_struct_ops_tramp (const struct bpf_tramp_nodes *fentry_nodes) { -return fentry_links->nr_links ==1 && - fentry_links->links[0 ]->link.type ==BPF_LINK_TYPE_STRUCT_OPS ; +return fentry_nodes->nr_nodes ==1 && + fentry_nodes->nodes[0 ]->link->type ==BPF_LINK_TYPE_STRUCT_OPS ; }static void store_func_meta (struct jit_ctx *ctx,u64 func_meta,int func_meta_off)
@@ -2521,7 +2521,7 @@ static void store_func_meta(struct jit_ctx *ctx, u64 func_meta, int func_meta_of* */ static int prepare_trampoline (struct jit_ctx *ctx,struct bpf_tramp_image *im, -struct bpf_tramp_links *tlinks,void *func_addr, +struct bpf_tramp_nodes *tnodes,void *func_addr,const struct btf_func_model *m,const struct arg_aux *a,u32 flags)
@@ -2537,14 +2537,14 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,int run_ctx_off;int oargs_off;int nfuncargs; -struct bpf_tramp_links *fentry = &tlinks[BPF_TRAMP_FENTRY ]; -struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT ]; -struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN ]; +struct bpf_tramp_nodes *fentry = &tnodes[BPF_TRAMP_FENTRY ]; +struct bpf_tramp_nodes *fexit = &tnodes[BPF_TRAMP_FEXIT ]; +struct bpf_tramp_nodes *fmod_ret = &tnodes[BPF_TRAMP_MODIFY_RETURN ];bool save_ret;__le32 **branches =NULL ;bool is_struct_ops =is_struct_ops_tramp (fentry);int cookie_off, cookie_cnt, cookie_bargs_off; -int fsession_cnt =bpf_fsession_cnt (tlinks); +int fsession_cnt =bpf_fsession_cnt (tnodes);u64 func_meta;/* trampoline stack layout:
@@ -2590,7 +2590,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, cookie_off = stack_size;/* room for session cookies */ - cookie_cnt =bpf_fsession_cookie_cnt (tlinks); + cookie_cnt =bpf_fsession_cookie_cnt (tnodes); stack_size += cookie_cnt *8 ; ip_off = stack_size;
@@ -2687,20 +2687,20 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, } cookie_bargs_off = (bargs_off - cookie_off) /8 ; -for (i =0 ; i < fentry->nr_links; i++) { -if (bpf_prog_calls_session_cookie (fentry->links[i])) { +for (i =0 ; i < fentry->nr_nodes; i++) { +if (bpf_prog_calls_session_cookie (fentry->nodes[i])) {u64 meta = func_meta | (cookie_bargs_off <<BPF_TRAMP_COOKIE_INDEX_SHIFT );store_func_meta (ctx, meta, func_meta_off); cookie_bargs_off--; } -invoke_bpf_prog (ctx, fentry->links[i], bargs_off, +invoke_bpf_prog (ctx, fentry->nodes[i], bargs_off, retval_off, run_ctx_off, flags &BPF_TRAMP_F_RET_FENTRY_RET ); } -if (fmod_ret->nr_links) { - branches =kcalloc (fmod_ret->nr_links,sizeof (__le32 *), +if (fmod_ret->nr_nodes) { + branches =kcalloc (fmod_ret->nr_nodes,sizeof (__le32 *),GFP_KERNEL );if (!branches)return -ENOMEM ;
@@ -2724,7 +2724,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im, }/* update the branches saved in invoke_bpf_mod_ret with cbnz */ -for (i =0 ; i < fmod_ret->nr_links && ctx->image !=NULL ; i++) { +for (i =0 ; i < fmod_ret->nr_nodes && ctx->image !=NULL ; i++) {int offset = &ctx->image[ctx->idx] - branches[i]; *branches[i] =cpu_to_le32 (A64_CBNZ (1 ,A64_R (10 ), offset)); }
@@ -2735,14 +2735,14 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,store_func_meta (ctx, func_meta, func_meta_off); cookie_bargs_off = (bargs_off - cookie_off) /8 ; -for (i =0 ; i < fexit->nr_links; i++) { -if (bpf_prog_calls_session_cookie (fexit->links[i])) { +for (i =0 ; i < fexit->nr_nodes; i++) { +if (bpf_prog_calls_session_cookie (fexit->nodes[i])) {u64 meta = func_meta | (cookie_bargs_off <<BPF_TRAMP_COOKIE_INDEX_SHIFT );store_func_meta (ctx, meta, func_meta_off); cookie_bargs_off--; } -invoke_bpf_prog (ctx, fexit->links[i], bargs_off, retval_off, +invoke_bpf_prog (ctx, fexit->nodes[i], bargs_off, retval_off, run_ctx_off, false); }
@@ -2800,7 +2800,7 @@ bool bpf_jit_supports_fsession(void) }int arch_bpf_trampoline_size (const struct btf_func_model *m,u32 flags, -struct bpf_tramp_links *tlinks,void *func_addr) +struct bpf_tramp_nodes *tnodes,void *func_addr) {struct jit_ctx ctx = { .image =NULL ,
@@ -2814,7 +2814,7 @@ int arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags,if (ret <0 )return ret; - ret =prepare_trampoline (&ctx, &im, tlinks, func_addr, m, &aaux, flags); + ret =prepare_trampoline (&ctx, &im, tnodes, func_addr, m, &aaux, flags);if (ret <0 )return ret;
@@ -2838,7 +2838,7 @@ int arch_protect_bpf_trampoline(void *image, unsigned int size)int arch_prepare_bpf_trampoline (struct bpf_tramp_image *im,void *ro_image,void *ro_image_end,const struct btf_func_model *m, -u32 flags,struct bpf_tramp_links *tlinks, +u32 flags,struct bpf_tramp_nodes *tnodes,void *func_addr) {u32 size = ro_image_end - ro_image;
@@ -2865,7 +2865,7 @@ int arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, void *ro_image, ret =calc_arg_aux (m, &aaux);if (ret) goto out; - ret =prepare_trampoline (&ctx, im, tlinks, func_addr, m, &aaux, flags); + ret =prepare_trampoline (&ctx, im, tnodes, func_addr, m, &aaux, flags);if (ret >0 &&validate_code (&ctx) <0 ) { ret = -EINVAL ;
arch/loongarch/net/bpf_jit.c +22 -22
123 lines not on this page · raw message
arch/powerpc/net/bpf_jit_comp.c +23 -23
127 lines not on this page · raw message
arch/riscv/net/bpf_jit_comp64.c +26 -26
160 lines not on this page · raw message
arch/s390/net/bpf_jit_comp.c +22 -22
131 lines not on this page · raw message
arch/x86/net/bpf_jit_comp.c +27 -27
172 lines not on this page · raw message
include/linux/bpf.h +37 -23
145 lines not on this page · raw message
kernel/bpf/bpf_struct_ops.c +14 -13
@@ -594,8 +594,8 @@ const struct bpf_link_ops bpf_struct_ops_link_lops = { .dealloc = bpf_struct_ops_link_dealloc, }; -int bpf_struct_ops_prepare_trampoline(struct bpf_tramp_links *tlinks, - struct bpf_tramp_link *link, +int bpf_struct_ops_prepare_trampoline(struct bpf_tramp_nodes *tnodes, + struct bpf_tramp_node *node, const struct btf_func_model *model, void *stub_func, void **_image, u32 *_image_off,
@@ -605,13 +605,13 @@ int bpf_struct_ops_prepare_trampoline(struct bpf_tramp_links *tlinks,void *image = *_image;int size; - tlinks[BPF_TRAMP_FENTRY ].links[0 ] = link; - tlinks[BPF_TRAMP_FENTRY ].nr_links =1 ; + tnodes[BPF_TRAMP_FENTRY ].nodes[0 ] = node; + tnodes[BPF_TRAMP_FENTRY ].nr_nodes =1 ;if (model->ret_size >0 ) flags |=BPF_TRAMP_F_RET_FENTRY_RET ; - size =arch_bpf_trampoline_size (model, flags, tlinks, stub_func); + size =arch_bpf_trampoline_size (model, flags, tnodes, stub_func);if (size <=0 )return size ? : -EFAULT ;
@@ -628,7 +628,7 @@ int bpf_struct_ops_prepare_trampoline(struct bpf_tramp_links *tlinks, size =arch_prepare_bpf_trampoline (NULL , image + image_off, image + image_off + size, - model, flags, tlinks, stub_func); + model, flags, tnodes, stub_func);if (size <=0 ) {if (image != *_image)bpf_struct_ops_image_free (image);
@@ -693,7 +693,7 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,const struct btf_type *module_type;const struct btf_member *member;const struct btf_type *t = st_ops_desc->type; -struct bpf_tramp_links *tlinks; +struct bpf_tramp_nodes *tnodes;void *udata, *kdata;int prog_fd, err;u32 i, trampoline_start, image_off =0 ;
@@ -720,8 +720,8 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,if (uvalue->common.state ||refcount_read (&uvalue->common.refcnt))return -EINVAL ; - tlinks =kzalloc_objs (*tlinks,BPF_TRAMP_MAX ); -if (!tlinks) + tnodes =kzalloc_objs (*tnodes,BPF_TRAMP_MAX ); +if (!tnodes)return -ENOMEM ; uvalue = (struct bpf_struct_ops_value *)st_map->uvalue;
@@ -820,8 +820,9 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key, err = -ENOMEM ; goto reset_unlock; } -bpf_link_init (&link->link,BPF_LINK_TYPE_STRUCT_OPS , - &bpf_struct_ops_link_lops, prog, prog->expected_attach_type); +bpf_tramp_link_init (link,BPF_LINK_TYPE_STRUCT_OPS , + &bpf_struct_ops_link_lops, prog, prog->expected_attach_type,0 ); + *plink++ = &link->link; ksym =kzalloc_obj (*ksym,GFP_USER );
@@ -832,7 +833,7 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key, *pksym++ = ksym; trampoline_start = image_off; - err = bpf_struct_ops_prepare_trampoline(tlinks, link, + err = bpf_struct_ops_prepare_trampoline(tnodes, &link->node, &st_ops->func_models[i], *(void **)(st_ops->cfi_stubs + moff), &image, &image_off,
@@ -910,7 +911,7 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,memset (uvalue,0 , map->value_size);memset (kvalue,0 , map->value_size); unlock: -kfree (tlinks); +kfree (tnodes);mutex_unlock (&st_map->lock);if (!err)bpf_struct_ops_map_add_ksyms (st_map);
kernel/bpf/syscall.c +22 -17
@@ -3209,6 +3209,15 @@ void bpf_link_init(struct bpf_link *link, enum bpf_link_type type,bpf_link_init_sleepable (link, type, ops, prog, attach_type, false); } +void bpf_tramp_link_init (struct bpf_tramp_link *link,enum bpf_link_type type, +const struct bpf_link_ops *ops,struct bpf_prog *prog, +enum bpf_attach_type attach_type,u64 cookie) +{ +bpf_link_init (&link->link, type, ops, prog, attach_type); + link->node.link = &link->link; + link->node.cookie = cookie; +} +static void bpf_link_free_id (int id) {if (!id)
@@ -3502,7 +3511,7 @@ static void bpf_tracing_link_release(struct bpf_link *link)struct bpf_tracing_link *tr_link = container_of(link, struct bpf_tracing_link, link.link); -WARN_ON_ONCE (bpf_trampoline_unlink_prog (&tr_link->link, +WARN_ON_ONCE (bpf_trampoline_unlink_prog (&tr_link->link.node, tr_link->trampoline, tr_link->tgt_prog));
@@ -3515,8 +3524,7 @@ static void bpf_tracing_link_release(struct bpf_link *link)static void bpf_tracing_link_dealloc (struct bpf_link *link) { -struct bpf_tracing_link *tr_link = - container_of(link, struct bpf_tracing_link, link.link); + struct bpf_tracing_link *tr_link = container_of(link, struct bpf_tracing_link, link.link);kfree (tr_link); }
@@ -3524,8 +3532,8 @@ static void bpf_tracing_link_dealloc(struct bpf_link *link)static void bpf_tracing_link_show_fdinfo (const struct bpf_link *link,struct seq_file *seq) { -struct bpf_tracing_link *tr_link = - container_of(link, struct bpf_tracing_link, link.link); + struct bpf_tracing_link *tr_link = container_of(link, struct bpf_tracing_link, link.link); +u32 target_btf_id, target_obj_id; bpf_trampoline_unpack_key(tr_link->trampoline->key,
@@ -3538,17 +3546,16 @@ static void bpf_tracing_link_show_fdinfo(const struct bpf_link *link, link->attach_type, target_obj_id, target_btf_id, - tr_link->link.cookie); + tr_link->link.node.cookie); }static int bpf_tracing_link_fill_link_info (const struct bpf_link *link,struct bpf_link_info *info) { -struct bpf_tracing_link *tr_link = - container_of(link, struct bpf_tracing_link, link.link); + struct bpf_tracing_link *tr_link = container_of(link, struct bpf_tracing_link, link.link); info->tracing.attach_type = link->attach_type; - info->tracing.cookie = tr_link->link.cookie; + info->tracing.cookie = tr_link->link.node.cookie;bpf_trampoline_unpack_key (tr_link->trampoline->key, &info->tracing.target_obj_id, &info->tracing.target_btf_id);
@@ -3635,9 +3642,9 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog, fslink =kzalloc_obj (*fslink,GFP_USER );if (fslink) { -bpf_link_init (&fslink->fexit.link,BPF_LINK_TYPE_TRACING , - &bpf_tracing_link_lops, prog, attach_type); - fslink->fexit.cookie = bpf_cookie; +bpf_tramp_link_init (&fslink->fexit,BPF_LINK_TYPE_TRACING , + &bpf_tracing_link_lops, prog, attach_type, + bpf_cookie); link = &fslink->link; }else { link =NULL ;
@@ -3649,10 +3656,8 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog, err = -ENOMEM ; goto out_put_prog; } -bpf_link_init (&link->link.link,BPF_LINK_TYPE_TRACING , - &bpf_tracing_link_lops, prog, attach_type); - - link->link.cookie = bpf_cookie; +bpf_tramp_link_init (&link->link,BPF_LINK_TYPE_TRACING , + &bpf_tracing_link_lops, prog, attach_type, bpf_cookie);mutex_lock (&prog->aux->dst_mutex);
@@ -3738,7 +3743,7 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog,if (err) goto out_unlock; - err =bpf_trampoline_link_prog (&link->link, tr, tgt_prog); + err =bpf_trampoline_link_prog (&link->link.node, tr, tgt_prog);if (err) {bpf_link_cleanup (&link_primer); link =NULL ;
kernel/bpf/trampoline.c +52 -53
288 lines not on this page · raw message
net/bpf/bpf_dummy_struct_ops.c +7 -7
@@ -132,7 +132,7 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,const struct bpf_struct_ops *st_ops = &bpf_bpf_dummy_ops;const struct btf_type *func_proto;struct bpf_dummy_ops_test_args *args; -struct bpf_tramp_links *tlinks =NULL ; +struct bpf_tramp_nodes *tnodes =NULL ;struct bpf_tramp_link *link =NULL ;void *image =NULL ;unsigned int op_idx;
@@ -158,8 +158,8 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,if (err) goto out; - tlinks =kzalloc_objs (*tlinks,BPF_TRAMP_MAX ); -if (!tlinks) { + tnodes =kzalloc_objs (*tnodes,BPF_TRAMP_MAX ); +if (!tnodes) { err = -ENOMEM ; goto out; }
@@ -171,11 +171,11 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr, }/* prog doesn't take the ownership of the reference from caller */ bpf_prog_inc (prog); -bpf_link_init (&link->link,BPF_LINK_TYPE_STRUCT_OPS , &bpf_struct_ops_link_lops, prog, - prog->expected_attach_type); +bpf_tramp_link_init (link,BPF_LINK_TYPE_STRUCT_OPS , &bpf_struct_ops_link_lops, + prog, prog->expected_attach_type,0 ); op_idx = prog->expected_attach_type; - err = bpf_struct_ops_prepare_trampoline(tlinks, link, + err = bpf_struct_ops_prepare_trampoline(tnodes, &link->node, &st_ops->func_models[op_idx], &dummy_ops_test_ret_function, &image, &image_off,
@@ -198,7 +198,7 @@ int bpf_struct_ops_test_run(struct bpf_prog *prog, const union bpf_attr *kattr,bpf_struct_ops_image_free (image);if (link)bpf_link_put (&link->link); -kfree (tlinks); +kfree (tnodes);return err; }
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 5/24 bpf: Factor fsession link to use struct bpf_tramp_node
In reply to Jiri OlsaNow that we split trampoline attachment object (bpf_tramp_node) from the link object (bpf_tramp_link) we can use bpf_tramp_node as fsession's fexit attachment object and get rid of the bpf_fsession_link object.
--- include/linux/bpf.h | 6 +----- kernel/bpf/syscall.c | 21 ++++++--------------- kernel/bpf/trampoline.c | 14 +++++++------- 3 files changed, 14 insertions(+), 27 deletions(-)
include/linux/bpf.h +1 -5
@@ -1883,15 +1883,11 @@ struct bpf_shim_tramp_link {struct bpf_tracing_link {struct bpf_tramp_link link; +struct bpf_tramp_node fexit;struct bpf_trampoline *trampoline;struct bpf_prog *tgt_prog; }; -struct bpf_fsession_link { -struct bpf_tracing_link link; -struct bpf_tramp_link fexit; -}; -struct bpf_raw_tp_link {struct bpf_link link;struct bpf_raw_event_map *btp;
kernel/bpf/syscall.c +6 -15
@@ -3637,21 +3637,7 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog, key =bpf_trampoline_compute_key (tgt_prog,NULL , btf_id); } -if (prog->expected_attach_type ==BPF_TRACE_FSESSION ) { -struct bpf_fsession_link *fslink; - - fslink =kzalloc_obj (*fslink,GFP_USER ); -if (fslink) { -bpf_tramp_link_init (&fslink->fexit,BPF_LINK_TYPE_TRACING , - &bpf_tracing_link_lops, prog, attach_type, - bpf_cookie); - link = &fslink->link; - }else { - link =NULL ; - } - }else { - link =kzalloc_obj (*link,GFP_USER ); - } + link =kzalloc_obj (*link,GFP_USER );if (!link) { err = -ENOMEM ; goto out_put_prog;
@@ -3659,6 +3645,11 @@ static int bpf_tracing_prog_attach(struct bpf_prog *prog,bpf_tramp_link_init (&link->link,BPF_LINK_TYPE_TRACING , &bpf_tracing_link_lops, prog, attach_type, bpf_cookie); +if (prog->expected_attach_type ==BPF_TRACE_FSESSION ) { + link->fexit.link = &link->link.link; + link->fexit.cookie = bpf_cookie; + } +mutex_lock (&prog->aux->dst_mutex);/* There are a few possible cases here:
kernel/bpf/trampoline.c +7 -7
@@ -815,7 +815,7 @@ static int __bpf_trampoline_link_prog(struct bpf_tramp_node *node,struct bpf_trampoline_ops *ops, void *data) { - struct bpf_fsession_link *fslink = NULL; + struct bpf_tracing_link *tr_link = NULL;enum bpf_tramp_prog_type kind;struct bpf_tramp_node *node_existing;struct hlist_head *prog_list;
@@ -865,8 +865,8 @@ static int __bpf_trampoline_link_prog(struct bpf_tramp_node *node,hlist_add_head (&node->tramp_hlist, prog_list);if (kind ==BPF_TRAMP_FSESSION ) { tr->progs_cnt[BPF_TRAMP_FENTRY ]++; - fslink = container_of(node, struct bpf_fsession_link, link.link.node); -hlist_add_head (&fslink->fexit.node.tramp_hlist, &tr->progs_hlist[BPF_TRAMP_FEXIT ]); + tr_link = container_of(node, struct bpf_tracing_link, link.node); +hlist_add_head (&tr_link->fexit.tramp_hlist, &tr->progs_hlist[BPF_TRAMP_FEXIT ]); tr->progs_cnt[BPF_TRAMP_FEXIT ]++; }else { tr->progs_cnt[kind]++;
@@ -876,7 +876,7 @@ static int __bpf_trampoline_link_prog(struct bpf_tramp_node *node,hlist_del_init (&node->tramp_hlist);if (kind ==BPF_TRAMP_FSESSION ) { tr->progs_cnt[BPF_TRAMP_FENTRY ]--; -hlist_del_init (&fslink->fexit.node.tramp_hlist); +hlist_del_init (&tr_link->fexit.tramp_hlist); tr->progs_cnt[BPF_TRAMP_FEXIT ]--; }else { tr->progs_cnt[kind]--;
@@ -917,10 +917,10 @@ static int __bpf_trampoline_unlink_prog(struct bpf_tramp_node *node, tgt_prog->aux->is_extended = false;return err; }else if (kind ==BPF_TRAMP_FSESSION ) { -struct bpf_fsession_link *fslink = - container_of(node, struct bpf_fsession_link, link.link.node); +struct bpf_tracing_link *tr_link = + container_of(node, struct bpf_tracing_link, link.node); -hlist_del_init (&fslink->fexit.node.tramp_hlist); +hlist_del_init (&tr_link->fexit.tramp_hlist); tr->progs_cnt[BPF_TRAMP_FEXIT ]--; kind =BPF_TRAMP_FENTRY ; }
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 6/24 bpf: Add multi tracing attach types
In reply to Jiri OlsaAdding new program attach types multi tracing attachment:
BPF_TRACE_FENTRY_MULTI
BPF_TRACE_FEXIT_MULTI
and their base support in verifier code.
Programs with such attach type will use specific link attachment interface coming in following changes.
This was suggested by Andrii some (long) time ago and turned out to be easier than having special program flag for that.
Bpf programs with such types have 'bpf_multi_func' function set as their attach_btf_id and keep module reference when it's specified by attach_prog_fd.
They are also accepted as sleepable programs during verification, and the real validation for specific BTF_IDs/functions will happen during the multi link attachment in following changes.
--- include/linux/bpf.h | 5 +++++ include/linux/btf_ids.h | 1 + include/uapi/linux/bpf.h | 2 ++ kernel/bpf/btf.c | 2 ++ kernel/bpf/syscall.c | 33 ++++++++++++++++++++++++---- kernel/bpf/trampoline.c | 5 ++++- kernel/bpf/verifier.c | 40 +++++++++++++++++++++++++++++++++- net/bpf/test_run.c | 2 ++ tools/include/uapi/linux/bpf.h | 2 ++ tools/lib/bpf/libbpf.c | 2 ++ 10 files changed, 88 insertions(+), 6 deletions(-)
include/linux/bpf.h +5 -0
@@ -2116,6 +2116,11 @@ void bpf_prog_disassoc_struct_ops(struct bpf_prog *prog);void *bpf_prog_get_assoc_struct_ops (const struct bpf_prog_aux *aux);u32 bpf_struct_ops_id (const void *kdata); +static inline bool is_tracing_multi (enum bpf_attach_type type) +{ +return type ==BPF_TRACE_FENTRY_MULTI || type ==BPF_TRACE_FEXIT_MULTI ; +} +#ifdef CONFIG_NET /* Define it here to avoid the use of forward declaration */ struct bpf_dummy_ops_state {
include/linux/btf_ids.h +1 -0
@@ -284,5 +284,6 @@ extern u32 bpf_cgroup_btf_id[];extern u32 bpf_local_storage_map_btf_id[];extern u32 btf_bpf_map_id[];extern u32 bpf_kmem_cache_btf_id[]; +extern u32 bpf_multi_func_btf_id[];#endif
include/uapi/linux/bpf.h +2 -0
@@ -1154,6 +1154,8 @@ enum bpf_attach_type {BPF_TRACE_KPROBE_SESSION ,BPF_TRACE_UPROBE_SESSION ,BPF_TRACE_FSESSION , +BPF_TRACE_FENTRY_MULTI , +BPF_TRACE_FEXIT_MULTI , __MAX_BPF_ATTACH_TYPE };
kernel/bpf/btf.c +2 -0
@@ -6221,6 +6221,8 @@ static int btf_validate_prog_ctx_type(struct bpf_verifier_log *log, const structcase BPF_TRACE_FEXIT :case BPF_MODIFY_RETURN :case BPF_TRACE_FSESSION : +case BPF_TRACE_FENTRY_MULTI : +case BPF_TRACE_FEXIT_MULTI :/* allow u64* as ctx */ if (btf_is_int (t) && t->size ==8 )return 0 ;
kernel/bpf/syscall.c +29 -4
@@ -41,6 +41,7 @@#include <linux/overflow.h> #include <linux/cookie.h> #include <linux/verification.h> +#include <linux/btf_ids.h> #include <net/netfilter/nf_bpf_link.h> #include <net/netkit.h>
@@ -2653,7 +2654,8 @@ static int bpf_prog_load_check_attach(enum bpf_prog_type prog_type, enum bpf_attach_type expected_attach_type, struct btf *attach_btf, u32 btf_id, - struct bpf_prog *dst_prog) + struct bpf_prog *dst_prog, + bool multi_func) { if (btf_id) { if (btf_id > BTF_MAX_TYPE)
@@ -2673,6 +2675,14 @@ bpf_prog_load_check_attach(enum bpf_prog_type prog_type, } } +if (multi_func) { +if (prog_type !=BPF_PROG_TYPE_TRACING ) +return -EINVAL ; +if (!attach_btf || btf_id) +return -EINVAL ; +return 0 ; + } +if (attach_btf && (!btf_id || dst_prog))return -EINVAL ;
@@ -2865,6 +2875,16 @@ static int bpf_prog_mark_insn_arrays_ready(struct bpf_prog *prog)return 0 ; } +#define DEFINE_BPF_MULTI_FUNC(args...) \ + extern int bpf_multi_func(args); \ + int __init bpf_multi_func(args) { return 0; } + +DEFINE_BPF_MULTI_FUNC(unsigned long a1, unsigned long a2, + unsigned long a3, unsigned long a4, + unsigned long a5, unsigned long a6) + +BTF_ID_LIST_GLOBAL_SINGLE(bpf_multi_func_btf_id, func, bpf_multi_func) + /* last field in 'union bpf_attr' used by this command */ #define BPF_PROG_LOAD_LAST_FIELD keyring_id
@@ -2877,6 +2897,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size)bool bpf_cap;int err;char license[128 ]; +bool multi_func;if (CHECK_ATTR (BPF_PROG_LOAD ))return -EINVAL ;
@@ -2943,6 +2964,8 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size)if (is_perfmon_prog_type (type) && !bpf_token_capable (token,CAP_PERFMON )) goto put_token; + multi_func =is_tracing_multi (attr->expected_attach_type); +/* attach_prog_fd/attach_btf_obj_fd can specify fd of either bpf_prog * or btf, we need to check which one it is */
@@ -2964,7 +2987,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size) goto put_token; } } - }else if (attr->attach_btf_id) { + }else if (attr->attach_btf_id || multi_func) {/* fall back to vmlinux BTF, if BTF type ID is specified */ attach_btf =bpf_get_btf_vmlinux ();if (IS_ERR (attach_btf)) {
@@ -2980,7 +3003,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size)if (bpf_prog_load_check_attach (type, attr->expected_attach_type, attach_btf, attr->attach_btf_id, - dst_prog)) { + dst_prog, multi_func)) {if (dst_prog)bpf_prog_put (dst_prog);if (attach_btf)
@@ -3003,7 +3026,7 @@ static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size) prog->expected_attach_type = attr->expected_attach_type; prog->sleepable = !!(attr->prog_flags &BPF_F_SLEEPABLE ); prog->aux->attach_btf = attach_btf; - prog->aux->attach_btf_id = attr->attach_btf_id; + prog->aux->attach_btf_id = multi_func ? bpf_multi_func_btf_id[0 ] : attr->attach_btf_id; prog->aux->dst_prog = dst_prog; prog->aux->dev_bound = !!attr->prog_ifindex; prog->aux->xdp_has_frags = attr->prog_flags &BPF_F_XDP_HAS_FRAGS ;
@@ -4365,6 +4388,8 @@ attach_type_to_prog_type(enum bpf_attach_type attach_type)case BPF_TRACE_FENTRY :case BPF_TRACE_FEXIT :case BPF_TRACE_FSESSION : +case BPF_TRACE_FENTRY_MULTI : +case BPF_TRACE_FEXIT_MULTI :case BPF_MODIFY_RETURN :return BPF_PROG_TYPE_TRACING ;case BPF_LSM_MAC :
kernel/bpf/trampoline.c +4 -1
@@ -182,7 +182,8 @@ bool bpf_prog_has_trampoline(const struct bpf_prog *prog)switch (ptype) {case BPF_PROG_TYPE_TRACING :if (eatype ==BPF_TRACE_FENTRY || eatype ==BPF_TRACE_FEXIT || - eatype ==BPF_MODIFY_RETURN || eatype ==BPF_TRACE_FSESSION ) + eatype ==BPF_MODIFY_RETURN || eatype ==BPF_TRACE_FSESSION || + eatype ==BPF_TRACE_FENTRY_MULTI || eatype ==BPF_TRACE_FEXIT_MULTI )return true;return false;case BPF_PROG_TYPE_LSM :
@@ -771,10 +772,12 @@ static enum bpf_tramp_prog_type bpf_attach_type_to_tramp(struct bpf_prog *prog) {switch (prog->expected_attach_type) {case BPF_TRACE_FENTRY : +case BPF_TRACE_FENTRY_MULTI :return BPF_TRAMP_FENTRY ;case BPF_MODIFY_RETURN :return BPF_TRAMP_MODIFY_RETURN ;case BPF_TRACE_FEXIT : +case BPF_TRACE_FEXIT_MULTI :return BPF_TRAMP_FEXIT ;case BPF_TRACE_FSESSION :return BPF_TRAMP_FSESSION ;
kernel/bpf/verifier.c +39 -1
@@ -17957,6 +17957,8 @@ static bool return_retval_range(struct bpf_verifier_env *env, struct bpf_retval_case BPF_TRACE_FENTRY :case BPF_TRACE_FEXIT :case BPF_TRACE_FSESSION : +case BPF_TRACE_FENTRY_MULTI : +case BPF_TRACE_FEXIT_MULTI : *range =retval_range (0 ,0 );break ;case BPF_TRACE_RAW_TP :
@@ -24146,6 +24148,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env) insn->imm == BPF_FUNC_get_func_ret) {if (eatype ==BPF_TRACE_FEXIT || eatype ==BPF_TRACE_FSESSION || + eatype ==BPF_TRACE_FEXIT_MULTI || eatype ==BPF_MODIFY_RETURN ) {/* Load nr_args from ctx - 8 */ insn_buf[0 ] =BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_1 ,-8 );
@@ -25051,6 +25054,11 @@ static int check_attach_modify_return(unsigned long addr, const char *func_name)#endif /* CONFIG_FUNCTION_ERROR_INJECTION */ +static bool is_tracing_multi_id (const struct bpf_prog *prog,u32 btf_id) +{ +return is_tracing_multi (prog->expected_attach_type) && bpf_multi_func_btf_id[0 ] == btf_id; +} + int bpf_check_attach_target(struct bpf_verifier_log *log, const struct bpf_prog *prog, const struct bpf_prog *tgt_prog,
@@ -25173,6 +25181,8 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, prog_extension && (tgt_prog->expected_attach_type ==BPF_TRACE_FENTRY || tgt_prog->expected_attach_type ==BPF_TRACE_FEXIT || + tgt_prog->expected_attach_type ==BPF_TRACE_FENTRY_MULTI || + tgt_prog->expected_attach_type ==BPF_TRACE_FEXIT_MULTI || tgt_prog->expected_attach_type == BPF_TRACE_FSESSION)) {/* Program extensions can extend all program types * except fentry/fexit. The reason is the following.
@@ -25273,6 +25283,8 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,case BPF_TRACE_FENTRY :case BPF_TRACE_FEXIT :case BPF_TRACE_FSESSION : +case BPF_TRACE_FENTRY_MULTI : +case BPF_TRACE_FEXIT_MULTI :if (prog->expected_attach_type ==BPF_TRACE_FSESSION && !bpf_jit_supports_fsession ()) {bpf_log (log,"JIT does not support fsession\n" );
@@ -25302,7 +25314,17 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,if (ret <0 )return ret; -if (tgt_prog) { +/* *.multi programs don't need an address during program +* verification, we just take the module ref if needed. +*/ +if (is_tracing_multi_id (prog, btf_id)) { +if (btf_is_module (btf)) { + mod =btf_try_get_module (btf); +if (!mod) +return -ENOENT ; + } + addr =0 ; + }else if (tgt_prog) {if (subprog ==0 ) addr = (long ) tgt_prog->bpf_func;else
@@ -25330,6 +25352,12 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, ret = -EINVAL ;switch (prog->type) {case BPF_PROG_TYPE_TRACING : +/* *.multi sleepable programs will pass initial sleepable check, +* the actual attached btf ids are checked later during the link +* attachment. +*/ +if (is_tracing_multi_id (prog, btf_id)) + ret =0 ;if (!check_attach_sleepable (btf_id, addr, tname)) ret =0 ;/* fentry/fexit/fmod_ret progs can also be sleepable if they are
@@ -25439,6 +25467,8 @@ static bool can_be_sleepable(struct bpf_prog *prog)case BPF_MODIFY_RETURN :case BPF_TRACE_ITER :case BPF_TRACE_FSESSION : +case BPF_TRACE_FENTRY_MULTI : +case BPF_TRACE_FEXIT_MULTI :return true;default :return false;
@@ -25528,6 +25558,14 @@ static int check_attach_btf_id(struct bpf_verifier_env *env)return -EINVAL ; } +/* +* We don't get trampoline for tracing_multi programs at this point, +* it's done when tracing_multi link is created. +*/ +if (prog->type ==BPF_PROG_TYPE_TRACING && +is_tracing_multi (prog->expected_attach_type)) +return 0 ; + key =bpf_trampoline_compute_key (tgt_prog, prog->aux->attach_btf, btf_id); tr =bpf_trampoline_get (key, &tgt_info);if (!tr)
net/bpf/test_run.c +2 -0
@@ -686,6 +686,8 @@ int bpf_prog_test_run_tracing(struct bpf_prog *prog,case BPF_TRACE_FENTRY :case BPF_TRACE_FEXIT :case BPF_TRACE_FSESSION : +case BPF_TRACE_FENTRY_MULTI : +case BPF_TRACE_FEXIT_MULTI : if (bpf_fentry_test1(1) != 2 || bpf_fentry_test2(2, 3) != 5 || bpf_fentry_test3(4, 5, 6) != 15 ||
tools/include/uapi/linux/bpf.h +2 -0
@@ -1154,6 +1154,8 @@ enum bpf_attach_type {BPF_TRACE_KPROBE_SESSION ,BPF_TRACE_UPROBE_SESSION ,BPF_TRACE_FSESSION , +BPF_TRACE_FENTRY_MULTI , +BPF_TRACE_FEXIT_MULTI , __MAX_BPF_ATTACH_TYPE };
tools/lib/bpf/libbpf.c +2 -0
@@ -136,6 +136,8 @@ static const char * const attach_type_name[] = { [BPF_NETKIT_PEER] = "netkit_peer", [BPF_TRACE_KPROBE_SESSION] = "trace_kprobe_session", [BPF_TRACE_UPROBE_SESSION] = "trace_uprobe_session", + [BPF_TRACE_FENTRY_MULTI] = "trace_fentry_multi", + [BPF_TRACE_FEXIT_MULTI] = "trace_fexit_multi", };static const char *const link_type_name[] = {
Signature · 1 line
2.53.0
kernel test robot
build botRe: [PATCHv3 bpf-next 06/24] bpf: Add multi tracing attach types
kernel test robot noticed the following build errors:
Hi Jiri,
kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Jiri-Olsa/ftrace-Add-ftrace_hash_count-function/20260316-160117 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20260316075138.465430-7-jolsa%40kernel.org patch subject: [PATCHv3 bpf-next 06/24] bpf: Add multi tracing attach types config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20260320/[email protected]/config) compiler: sh4-linux-gcc (GCC) 15.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260320/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
kernel/bpf/syscall.c: In function 'bpf_prog_load':
>> kernel/bpf/syscall.c:2967:22: error: implicit declaration of function 'is_tracing_multi' [-Wimplicit-function-declaration]
2967 | multi_func = is_tracing_multi(attr->expected_attach_type);
| ^~~~~~~~~~~~~~~~
--
kernel/bpf/verifier.c: In function 'is_tracing_multi_id':
>> kernel/bpf/verifier.c:25059:16: error: implicit declaration of function 'is_tracing_multi'; did you mean 'is_tracing_multi_id'? [-Wimplicit-function-declaration]
25059 | return is_tracing_multi(prog->expected_attach_type) && bpf_multi_func_btf_id[0] == btf_id;
| ^~~~~~~~~~~~~~~~
| is_tracing_multi_idvim +/is_tracing_multi +2967 kernel/bpf/syscall.c
2890
2891 static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size)
2892 {
2893 enum bpf_prog_type type = attr->prog_type;
2894 struct bpf_prog *prog, *dst_prog = NULL;
2895 struct btf *attach_btf = NULL;
2896 struct bpf_token *token = NULL;
2897 bool bpf_cap;
2898 int err;
2899 char license[128];
2900 bool multi_func;
2901
2902 if (CHECK_ATTR(BPF_PROG_LOAD))
2903 return -EINVAL;
2904
2905 if (attr->prog_flags & ~(BPF_F_STRICT_ALIGNMENT |
2906 BPF_F_ANY_ALIGNMENT |
2907 BPF_F_TEST_STATE_FREQ |
2908 BPF_F_SLEEPABLE |
2909 BPF_F_TEST_RND_HI32 |
2910 BPF_F_XDP_HAS_FRAGS |
2911 BPF_F_XDP_DEV_BOUND_ONLY |
2912 BPF_F_TEST_REG_INVARIANTS |
2913 BPF_F_TOKEN_FD))
2914 return -EINVAL;
2915
2916 bpf_prog_load_fixup_attach_type(attr);
2917
2918 if (attr->prog_flags & BPF_F_TOKEN_FD) {
2919 token = bpf_token_get_from_fd(attr->prog_token_fd);
2920 if (IS_ERR(token))
2921 return PTR_ERR(token);
2922 /* if current token doesn't grant prog loading permissions,
2923 * then we can't use this token, so ignore it and rely on
2924 * system-wide capabilities checks
2925 */
2926 if (!bpf_token_allow_cmd(token, BPF_PROG_LOAD) ||
2927 !bpf_token_allow_prog_type(token, attr->prog_type,
2928 attr->expected_attach_type)) {
2929 bpf_token_put(token);
2930 token = NULL;
2931 }
2932 }
2933
2934 bpf_cap = bpf_token_capable(token, CAP_BPF);
2935 err = -EPERM;
2936
2937 if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) &&
2938 (attr->prog_flags & BPF_F_ANY_ALIGNMENT) &&
2939 !bpf_cap)
2940 goto put_token;
2941
2942 /* Intent here is for unprivileged_bpf_disabled to block BPF program
2943 * creation for unprivileged users; other actions depend
2944 * on fd availability and access to bpffs, so are dependent on
2945 * object creation success. Even with unprivileged BPF disabled,
2946 * capability checks are still carried out for these
2947 * and other operations.
2948 */
2949 if (sysctl_unprivileged_bpf_disabled && !bpf_cap)
2950 goto put_token;
2951
2952 if (attr->insn_cnt == 0 ||
2953 attr->insn_cnt > (bpf_cap ? BPF_COMPLEXITY_LIMIT_INSNS : BPF_MAXINSNS)) {
2954 err = -E2BIG;
2955 goto put_token;
2956 }
2957 if (type != BPF_PROG_TYPE_SOCKET_FILTER &&
2958 type != BPF_PROG_TYPE_CGROUP_SKB &&
2959 !bpf_cap)
2960 goto put_token;
2961
2962 if (is_net_admin_prog_type(type) && !bpf_token_capable(token, CAP_NET_ADMIN))
2963 goto put_token;
2964 if (is_perfmon_prog_type(type) && !bpf_token_capable(token, CAP_PERFMON))
2965 goto put_token;
2966
> 2967 multi_func = is_tracing_multi(attr->expected_attach_type);
2968
2969 /* attach_prog_fd/attach_btf_obj_fd can specify fd of either bpf_prog
2970 * or btf, we need to check which one it is
2971 */
2972 if (attr->attach_prog_fd) {
2973 dst_prog = bpf_prog_get(attr->attach_prog_fd);
2974 if (IS_ERR(dst_prog)) {
2975 dst_prog = NULL;
2976 attach_btf = btf_get_by_fd(attr->attach_btf_obj_fd);
2977 if (IS_ERR(attach_btf)) {
2978 err = -EINVAL;
2979 goto put_token;
2980 }
2981 if (!btf_is_kernel(attach_btf)) {
2982 /* attaching through specifying bpf_prog's BTF
2983 * objects directly might be supported eventually
2984 */
2985 btf_put(attach_btf);
2986 err = -ENOTSUPP;
2987 goto put_token;
2988 }
2989 }
2990 } else if (attr->attach_btf_id || multi_func) {
2991 /* fall back to vmlinux BTF, if BTF type ID is specified */
2992 attach_btf = bpf_get_btf_vmlinux();
2993 if (IS_ERR(attach_btf)) {
2994 err = PTR_ERR(attach_btf);
2995 goto put_token;
2996 }
2997 if (!attach_btf) {
2998 err = -EINVAL;
2999 goto put_token;
3000 }
3001 btf_get(attach_btf);
3002 }
3003
3004 if (bpf_prog_load_check_attach(type, attr->expected_attach_type,
3005 attach_btf, attr->attach_btf_id,
3006 dst_prog, multi_func)) {
3007 if (dst_prog)
3008 bpf_prog_put(dst_prog);
3009 if (attach_btf)
3010 btf_put(attach_btf);
3011 err = -EINVAL;
3012 goto put_token;
3013 }
3014
3015 /* plain bpf_prog allocation */
3016 prog = bpf_prog_alloc(bpf_prog_size(attr->insn_cnt), GFP_USER);
3017 if (!prog) {
3018 if (dst_prog)
3019 bpf_prog_put(dst_prog);
3020 if (attach_btf)
3021 btf_put(attach_btf);
3022 err = -EINVAL;
3023 goto put_token;
3024 }
3025
3026 prog->expected_attach_type = attr->expected_attach_type;
3027 prog->sleepable = !!(attr->prog_flags & BPF_F_SLEEPABLE);
3028 prog->aux->attach_btf = attach_btf;
3029 prog->aux->attach_btf_id = multi_func ? bpf_multi_func_btf_id[0] : attr->attach_btf_id;
3030 prog->aux->dst_prog = dst_prog;
3031 prog->aux->dev_bound = !!attr->prog_ifindex;
3032 prog->aux->xdp_has_frags = attr->prog_flags & BPF_F_XDP_HAS_FRAGS;
3033
3034 /* move token into prog->aux, reuse taken refcnt */
3035 prog->aux->token = token;
3036 token = NULL;
3037
3038 prog->aux->user = get_current_user();
3039 prog->len = attr->insn_cnt;
3040
3041 err = -EFAULT;
3042 if (copy_from_bpfptr(prog->insns,
3043 make_bpfptr(attr->insns, uattr.is_kernel),
3044 bpf_prog_insn_size(prog)) != 0)
3045 goto free_prog;
3046 /* copy eBPF program license from user space */
3047 if (strncpy_from_bpfptr(license,
3048 make_bpfptr(attr->license, uattr.is_kernel),
3049 sizeof(license) - 1) < 0)
3050 goto free_prog;
3051 license[sizeof(license) - 1] = 0;
3052
3053 /* eBPF programs must be GPL compatible to use GPL-ed functions */
3054 prog->gpl_compatible = license_is_gpl_compatible(license) ? 1 : 0;
3055
3056 if (attr->signature) {
3057 err = bpf_prog_verify_signature(prog, attr, uattr.is_kernel);
3058 if (err)
3059 goto free_prog;
3060 }
3061
3062 prog->orig_prog = NULL;
3063 prog->jited = 0;
3064
3065 atomic64_set(&prog->aux->refcnt, 1);
3066
3067 if (bpf_prog_is_dev_bound(prog->aux)) {
3068 err = bpf_prog_dev_bound_init(prog, attr);
3069 if (err)
3070 goto free_prog;
3071 }
3072
3073 if (type == BPF_PROG_TYPE_EXT && dst_prog &&
3074 bpf_prog_is_dev_bound(dst_prog->aux)) {
3075 err = bpf_prog_dev_bound_inherit(prog, dst_prog);
3076 if (err)
3077 goto free_prog;
3078 }
3079
3080 /*
3081 * Bookkeeping for managing the program attachment chain.
3082 *
3083 * It might be tempting to set attach_tracing_prog flag at the attachment
3084 * time, but this will not prevent from loading bunch of tracing prog
3085 * first, then attach them one to another.
3086 *
3087 * The flag attach_tracing_prog is set for the whole program lifecycle, and
3088 * doesn't have to be cleared in bpf_tracing_link_release, since tracing
3089 * programs cannot change attachment target.
3090 */
3091 if (type == BPF_PROG_TYPE_TRACING && dst_prog &&
3092 dst_prog->type == BPF_PROG_TYPE_TRACING) {
3093 prog->aux->attach_tracing_prog = true;
3094 }
3095
3096 /* find program type: socket_filter vs tracing_filter */
3097 err = find_prog_type(type, prog);
3098 if (err < 0)
3099 goto free_prog;
3100
3101 prog->aux->load_time = ktime_get_boottime_ns();
3102 err = bpf_obj_name_cpy(prog->aux->name, attr->prog_name,
3103 sizeof(attr->prog_name));
3104 if (err < 0)
3105 goto free_prog;
3106
3107 err = security_bpf_prog_load(prog, attr, token, uattr.is_kernel);
3108 if (err)
3109 goto free_prog_sec;
3110
3111 /* run eBPF verifier */
3112 err = bpf_check(&prog, attr, uattr, uattr_size);
3113 if (err < 0)
3114 goto free_used_maps;
3115
3116 prog = bpf_prog_select_runtime(prog, &err);
3117 if (err < 0)
3118 goto free_used_maps;
3119
3120 err = bpf_prog_mark_insn_arrays_ready(prog);
3121 if (err < 0)
3122 goto free_used_maps;
3123
3124 err = bpf_prog_alloc_id(prog);
3125 if (err)
3126 goto free_used_maps;
3127
3128 /* Upon success of bpf_prog_alloc_id(), the BPF prog is
3129 * effectively publicly exposed. However, retrieving via
3130 * bpf_prog_get_fd_by_id() will take another reference,
3131 * therefore it cannot be gone underneath us.
3132 *
3133 * Only for the time /after/ successful bpf_prog_new_fd()
3134 * and before returning to userspace, we might just hold
3135 * one reference and any parallel close on that fd could
3136 * rip everything out. Hence, below notifications must
3137 * happen before bpf_prog_new_fd().
3138 *
3139 * Also, any failure handling from this point onwards must
3140 * be using bpf_prog_put() given the program is exposed.
3141 */
3142 bpf_prog_kallsyms_add(prog);
3143 perf_event_bpf_event(prog, PERF_BPF_EVENT_PROG_LOAD, 0);
3144 bpf_audit_prog(prog, BPF_AUDIT_LOAD);
3145
3146 err = bpf_prog_new_fd(prog);
3147 if (err < 0)
3148 bpf_prog_put(prog);
3149 return err;
3150
3151 free_used_maps:
3152 /* In case we have subprogs, we need to wait for a grace
3153 * period before we can tear down JIT memory since symbols
3154 * are already exposed under kallsyms.
3155 */
3156 __bpf_prog_put_noref(prog, prog->aux->real_func_cnt);
3157 return err;
3158
3159 free_prog_sec:
3160 security_bpf_prog_free(prog);
3161 free_prog:
3162 free_uid(prog->aux->user);
3163 if (prog->aux->attach_btf)
3164 btf_put(prog->aux->attach_btf);
3165 bpf_prog_free(prog);
3166 put_token:
3167 bpf_token_put(token);
3168 return err;
3169 }
3170
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCHv3 bpf-next 06/24] bpf: Add multi tracing attach types
In reply to Jiri Olsakernel test robot noticed the following build errors:
Hi Jiri,
kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Jiri-Olsa/ftrace-Add-ftrace_hash_count-function/20260316-160117 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20260316075138.465430-7-jolsa%40kernel.org patch subject: [PATCHv3 bpf-next 06/24] bpf: Add multi tracing attach types config: hexagon-allmodconfig (https://download.01.org/0day-ci/archive/20260320/[email protected]/config) compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260320/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> kernel/bpf/syscall.c:2967:15: error: call to undeclared function 'is_tracing_multi'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
2967 | multi_func = is_tracing_multi(attr->expected_attach_type);
| ^
1 error generated.
--
>> kernel/bpf/verifier.c:25059:9: error: call to undeclared function 'is_tracing_multi'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
25059 | return is_tracing_multi(prog->expected_attach_type) && bpf_multi_func_btf_id[0] == btf_id;
| ^
kernel/bpf/verifier.c:25059:9: note: did you mean 'is_tracing_multi_id'?
kernel/bpf/verifier.c:25057:13: note: 'is_tracing_multi_id' declared here
25057 | static bool is_tracing_multi_id(const struct bpf_prog *prog, u32 btf_id)
| ^
25058 | {
25059 | return is_tracing_multi(prog->expected_attach_type) && bpf_multi_func_btf_id[0] == btf_id;
| ~~~~~~~~~~~~~~~~
| is_tracing_multi_id
kernel/bpf/verifier.c:25566:6: error: call to undeclared function 'is_tracing_multi'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
25566 | is_tracing_multi(prog->expected_attach_type))
| ^2 errors generated.
vim +/is_tracing_multi +2967 kernel/bpf/syscall.c
2890
2891 static int bpf_prog_load(union bpf_attr *attr, bpfptr_t uattr, u32 uattr_size)
2892 {
2893 enum bpf_prog_type type = attr->prog_type;
2894 struct bpf_prog *prog, *dst_prog = NULL;
2895 struct btf *attach_btf = NULL;
2896 struct bpf_token *token = NULL;
2897 bool bpf_cap;
2898 int err;
2899 char license[128];
2900 bool multi_func;
2901
2902 if (CHECK_ATTR(BPF_PROG_LOAD))
2903 return -EINVAL;
2904
2905 if (attr->prog_flags & ~(BPF_F_STRICT_ALIGNMENT |
2906 BPF_F_ANY_ALIGNMENT |
2907 BPF_F_TEST_STATE_FREQ |
2908 BPF_F_SLEEPABLE |
2909 BPF_F_TEST_RND_HI32 |
2910 BPF_F_XDP_HAS_FRAGS |
2911 BPF_F_XDP_DEV_BOUND_ONLY |
2912 BPF_F_TEST_REG_INVARIANTS |
2913 BPF_F_TOKEN_FD))
2914 return -EINVAL;
2915
2916 bpf_prog_load_fixup_attach_type(attr);
2917
2918 if (attr->prog_flags & BPF_F_TOKEN_FD) {
2919 token = bpf_token_get_from_fd(attr->prog_token_fd);
2920 if (IS_ERR(token))
2921 return PTR_ERR(token);
2922 /* if current token doesn't grant prog loading permissions,
2923 * then we can't use this token, so ignore it and rely on
2924 * system-wide capabilities checks
2925 */
2926 if (!bpf_token_allow_cmd(token, BPF_PROG_LOAD) ||
2927 !bpf_token_allow_prog_type(token, attr->prog_type,
2928 attr->expected_attach_type)) {
2929 bpf_token_put(token);
2930 token = NULL;
2931 }
2932 }
2933
2934 bpf_cap = bpf_token_capable(token, CAP_BPF);
2935 err = -EPERM;
2936
2937 if (!IS_ENABLED(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) &&
2938 (attr->prog_flags & BPF_F_ANY_ALIGNMENT) &&
2939 !bpf_cap)
2940 goto put_token;
2941
2942 /* Intent here is for unprivileged_bpf_disabled to block BPF program
2943 * creation for unprivileged users; other actions depend
2944 * on fd availability and access to bpffs, so are dependent on
2945 * object creation success. Even with unprivileged BPF disabled,
2946 * capability checks are still carried out for these
2947 * and other operations.
2948 */
2949 if (sysctl_unprivileged_bpf_disabled && !bpf_cap)
2950 goto put_token;
2951
2952 if (attr->insn_cnt == 0 ||
2953 attr->insn_cnt > (bpf_cap ? BPF_COMPLEXITY_LIMIT_INSNS : BPF_MAXINSNS)) {
2954 err = -E2BIG;
2955 goto put_token;
2956 }
2957 if (type != BPF_PROG_TYPE_SOCKET_FILTER &&
2958 type != BPF_PROG_TYPE_CGROUP_SKB &&
2959 !bpf_cap)
2960 goto put_token;
2961
2962 if (is_net_admin_prog_type(type) && !bpf_token_capable(token, CAP_NET_ADMIN))
2963 goto put_token;
2964 if (is_perfmon_prog_type(type) && !bpf_token_capable(token, CAP_PERFMON))
2965 goto put_token;
2966
> 2967 multi_func = is_tracing_multi(attr->expected_attach_type);
2968
2969 /* attach_prog_fd/attach_btf_obj_fd can specify fd of either bpf_prog
2970 * or btf, we need to check which one it is
2971 */
2972 if (attr->attach_prog_fd) {
2973 dst_prog = bpf_prog_get(attr->attach_prog_fd);
2974 if (IS_ERR(dst_prog)) {
2975 dst_prog = NULL;
2976 attach_btf = btf_get_by_fd(attr->attach_btf_obj_fd);
2977 if (IS_ERR(attach_btf)) {
2978 err = -EINVAL;
2979 goto put_token;
2980 }
2981 if (!btf_is_kernel(attach_btf)) {
2982 /* attaching through specifying bpf_prog's BTF
2983 * objects directly might be supported eventually
2984 */
2985 btf_put(attach_btf);
2986 err = -ENOTSUPP;
2987 goto put_token;
2988 }
2989 }
2990 } else if (attr->attach_btf_id || multi_func) {
2991 /* fall back to vmlinux BTF, if BTF type ID is specified */
2992 attach_btf = bpf_get_btf_vmlinux();
2993 if (IS_ERR(attach_btf)) {
2994 err = PTR_ERR(attach_btf);
2995 goto put_token;
2996 }
2997 if (!attach_btf) {
2998 err = -EINVAL;
2999 goto put_token;
3000 }
3001 btf_get(attach_btf);
3002 }
3003
3004 if (bpf_prog_load_check_attach(type, attr->expected_attach_type,
3005 attach_btf, attr->attach_btf_id,
3006 dst_prog, multi_func)) {
3007 if (dst_prog)
3008 bpf_prog_put(dst_prog);
3009 if (attach_btf)
3010 btf_put(attach_btf);
3011 err = -EINVAL;
3012 goto put_token;
3013 }
3014
3015 /* plain bpf_prog allocation */
3016 prog = bpf_prog_alloc(bpf_prog_size(attr->insn_cnt), GFP_USER);
3017 if (!prog) {
3018 if (dst_prog)
3019 bpf_prog_put(dst_prog);
3020 if (attach_btf)
3021 btf_put(attach_btf);
3022 err = -EINVAL;
3023 goto put_token;
3024 }
3025
3026 prog->expected_attach_type = attr->expected_attach_type;
3027 prog->sleepable = !!(attr->prog_flags & BPF_F_SLEEPABLE);
3028 prog->aux->attach_btf = attach_btf;
3029 prog->aux->attach_btf_id = multi_func ? bpf_multi_func_btf_id[0] : attr->attach_btf_id;
3030 prog->aux->dst_prog = dst_prog;
3031 prog->aux->dev_bound = !!attr->prog_ifindex;
3032 prog->aux->xdp_has_frags = attr->prog_flags & BPF_F_XDP_HAS_FRAGS;
3033
3034 /* move token into prog->aux, reuse taken refcnt */
3035 prog->aux->token = token;
3036 token = NULL;
3037
3038 prog->aux->user = get_current_user();
3039 prog->len = attr->insn_cnt;
3040
3041 err = -EFAULT;
3042 if (copy_from_bpfptr(prog->insns,
3043 make_bpfptr(attr->insns, uattr.is_kernel),
3044 bpf_prog_insn_size(prog)) != 0)
3045 goto free_prog;
3046 /* copy eBPF program license from user space */
3047 if (strncpy_from_bpfptr(license,
3048 make_bpfptr(attr->license, uattr.is_kernel),
3049 sizeof(license) - 1) < 0)
3050 goto free_prog;
3051 license[sizeof(license) - 1] = 0;
3052
3053 /* eBPF programs must be GPL compatible to use GPL-ed functions */
3054 prog->gpl_compatible = license_is_gpl_compatible(license) ? 1 : 0;
3055
3056 if (attr->signature) {
3057 err = bpf_prog_verify_signature(prog, attr, uattr.is_kernel);
3058 if (err)
3059 goto free_prog;
3060 }
3061
3062 prog->orig_prog = NULL;
3063 prog->jited = 0;
3064
3065 atomic64_set(&prog->aux->refcnt, 1);
3066
3067 if (bpf_prog_is_dev_bound(prog->aux)) {
3068 err = bpf_prog_dev_bound_init(prog, attr);
3069 if (err)
3070 goto free_prog;
3071 }
3072
3073 if (type == BPF_PROG_TYPE_EXT && dst_prog &&
3074 bpf_prog_is_dev_bound(dst_prog->aux)) {
3075 err = bpf_prog_dev_bound_inherit(prog, dst_prog);
3076 if (err)
3077 goto free_prog;
3078 }
3079
3080 /*
3081 * Bookkeeping for managing the program attachment chain.
3082 *
3083 * It might be tempting to set attach_tracing_prog flag at the attachment
3084 * time, but this will not prevent from loading bunch of tracing prog
3085 * first, then attach them one to another.
3086 *
3087 * The flag attach_tracing_prog is set for the whole program lifecycle, and
3088 * doesn't have to be cleared in bpf_tracing_link_release, since tracing
3089 * programs cannot change attachment target.
3090 */
3091 if (type == BPF_PROG_TYPE_TRACING && dst_prog &&
3092 dst_prog->type == BPF_PROG_TYPE_TRACING) {
3093 prog->aux->attach_tracing_prog = true;
3094 }
3095
3096 /* find program type: socket_filter vs tracing_filter */
3097 err = find_prog_type(type, prog);
3098 if (err < 0)
3099 goto free_prog;
3100
3101 prog->aux->load_time = ktime_get_boottime_ns();
3102 err = bpf_obj_name_cpy(prog->aux->name, attr->prog_name,
3103 sizeof(attr->prog_name));
3104 if (err < 0)
3105 goto free_prog;
3106
3107 err = security_bpf_prog_load(prog, attr, token, uattr.is_kernel);
3108 if (err)
3109 goto free_prog_sec;
3110
3111 /* run eBPF verifier */
3112 err = bpf_check(&prog, attr, uattr, uattr_size);
3113 if (err < 0)
3114 goto free_used_maps;
3115
3116 prog = bpf_prog_select_runtime(prog, &err);
3117 if (err < 0)
3118 goto free_used_maps;
3119
3120 err = bpf_prog_mark_insn_arrays_ready(prog);
3121 if (err < 0)
3122 goto free_used_maps;
3123
3124 err = bpf_prog_alloc_id(prog);
3125 if (err)
3126 goto free_used_maps;
3127
3128 /* Upon success of bpf_prog_alloc_id(), the BPF prog is
3129 * effectively publicly exposed. However, retrieving via
3130 * bpf_prog_get_fd_by_id() will take another reference,
3131 * therefore it cannot be gone underneath us.
3132 *
3133 * Only for the time /after/ successful bpf_prog_new_fd()
3134 * and before returning to userspace, we might just hold
3135 * one reference and any parallel close on that fd could
3136 * rip everything out. Hence, below notifications must
3137 * happen before bpf_prog_new_fd().
3138 *
3139 * Also, any failure handling from this point onwards must
3140 * be using bpf_prog_put() given the program is exposed.
3141 */
3142 bpf_prog_kallsyms_add(prog);
3143 perf_event_bpf_event(prog, PERF_BPF_EVENT_PROG_LOAD, 0);
3144 bpf_audit_prog(prog, BPF_AUDIT_LOAD);
3145
3146 err = bpf_prog_new_fd(prog);
3147 if (err < 0)
3148 bpf_prog_put(prog);
3149 return err;
3150
3151 free_used_maps:
3152 /* In case we have subprogs, we need to wait for a grace
3153 * period before we can tear down JIT memory since symbols
3154 * are already exposed under kallsyms.
3155 */
3156 __bpf_prog_put_noref(prog, prog->aux->real_func_cnt);
3157 return err;
3158
3159 free_prog_sec:
3160 security_bpf_prog_free(prog);
3161 free_prog:
3162 free_uid(prog->aux->user);
3163 if (prog->aux->attach_btf)
3164 btf_put(prog->aux->attach_btf);
3165 bpf_prog_free(prog);
3166 put_token:
3167 bpf_token_put(token);
3168 return err;
3169 }
3170
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Jiri Olsa
reviewerPATCH v3 7/24 bpf: Move sleepable verification code to btf_id_allow_sleepable
In reply to Jiri OlsaMove sleepable verification code to btf_id_allow_sleepable function. It will be used in following changes.
Adding code to retrieve type's name instead of passing it from bpf_check_attach_target function, because this function will be called from another place in following changes and it's easier to retrieve the name directly in here.
--- include/linux/bpf_verifier.h | 3 ++ kernel/bpf/verifier.c | 79 +++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 32 deletions(-)
include/linux/bpf_verifier.h +3 -0
@@ -932,6 +932,9 @@ static inline void bpf_trampoline_unpack_key(u64 key, u32 *obj_id, u32 *btf_id) *btf_id = key &0x7FFFFFFF ; } +int btf_id_allow_sleepable (u32 btf_id,unsigned long addr,const struct bpf_prog *prog, +const struct btf *btf); + int bpf_check_attach_target(struct bpf_verifier_log *log, const struct bpf_prog *prog, const struct bpf_prog *tgt_prog,
kernel/bpf/verifier.c +47 -32
91 lines not on this page · raw message
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 8/24 bpf: Add bpf_trampoline_multi_attach/detach functions
In reply to Jiri OlsaAdding bpf_trampoline_multi_attach/detach functions that allows to attach/detach tracing program to multiple functions/trampolines.
The attachment is defined with bpf_program and array of BTF ids of functions to attach the bpf program to.
Adding bpf_tracing_multi_link object that holds all the attached trampolines and is initialized in attach and used in detach.
The attachment allocates or uses currently existing trampoline for each function to attach and links it with the bpf program.
The attach works as follows:
- we get all the needed trampolines
- lock them and add the bpf program to each (__bpf_trampoline_link_prog)
- the trampoline_multi_ops passed in __bpf_trampoline_link_prog gathers ftrace_hash (ip -> trampoline) objects
- we call update_ftrace_direct_add/mod to update needed locations
- we unlock all the trampolines
The detach works as follows:
- we lock all the needed trampolines
- remove the program from each (__bpf_trampoline_unlink_prog)
- the trampoline_multi_ops passed in __bpf_trampoline_link_prog gathers ftrace_hash (ip -> trampoline) objects
- we call update_ftrace_direct_del/mod to update needed locations
- we unlock and put all the trampolines
Adding trampoline_(un)lock_all functions to (un)lock all trampolines to gate the tracing_multi attachment.
Note this is supported only for archs (x86_64) with ftrace direct and have single ops support.
CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS &&
CONFIG_HAVE_SINGLE_FTRACE_DIRECT_OPS
--- include/linux/bpf.h | 17 +++ kernel/bpf/trampoline.c | 243 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 260 insertions(+)
include/linux/bpf.h +17 -0
@@ -1464,6 +1464,12 @@ struct bpf_trampoline *bpf_trampoline_get(u64 key,void bpf_trampoline_put (struct bpf_trampoline *tr);int arch_prepare_bpf_dispatcher (void *image,void *buf,s64 *funcs,int num_funcs); +struct bpf_tracing_multi_link ; +int bpf_trampoline_multi_attach (struct bpf_prog *prog,u32 *ids, +struct bpf_tracing_multi_link *link); +int bpf_trampoline_multi_detach (struct bpf_prog *prog, +struct bpf_tracing_multi_link *link); +/* * When the architecture supports STATIC_CALL replace the bpf_dispatcher_fn * indirection with a direct call to the bpf program. If the architecture does
@@ -1888,6 +1894,17 @@ struct bpf_tracing_link {struct bpf_prog *tgt_prog; }; +struct bpf_tracing_multi_node { +struct bpf_tramp_node node; +struct bpf_trampoline *trampoline; +}; + +struct bpf_tracing_multi_link { +struct bpf_link link; +int nodes_cnt; + struct bpf_tracing_multi_node nodes[] __counted_by(nodes_cnt); +}; +struct bpf_raw_tp_link {struct bpf_link link;struct bpf_raw_event_map *btp;
kernel/bpf/trampoline.c +243 -0
255 lines not on this page · raw message
Signature · 1 line
2.53.0
[email protected]
AI reviewRe: [PATCHv3 bpf-next 08/24] bpf: Add bpf_trampoline_multi_attach/detach functions
The detach description references __bpf_trampoline_link_prog, but the detach path calls __bpf_trampoline_unlink_prog.
Quoted 5 lines
The detach works as follows:
- we lock all the needed trampolines
- remove the program from each (__bpf_trampoline_unlink_prog)
- thetrampoline_multi_opspassed in__bpf_trampoline_link_proggathersftrace_hash(ip -> trampoline) objects
The detach description references __bpf_trampoline_link_prog, but the detach path calls __bpf_trampoline_unlink_prog.
Quoted 4 lines
kernel/bpf/trampoline.c +0
-0
[ ... ]
kernel/bpf/trampoline.c int __weak arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags, · line 1491
Quoted 11 lines
kernel/bpf/trampoline.c +11
-0+static int modify_fentry_multi (struct bpf_trampoline *tr,u32 orig_flags,void *old_addr, +void *new_addr,bool lock_direct_mutex,void *ptr) +{ +unsigned long addr = (unsigned long ) new_addr; +unsigned long ip =ftrace_location (tr->ip); +struct fentry_multi_data *data = ptr; + +if (bpf_trampoline_use_jmp (tr->flags)) + addr =ftrace_jmp_set (addr); +return add_ftrace_hash_entry_direct (data->modify, ip, addr) ?0 : -ENOMEM ; +}
Unlike the standard modify_fentry() which calls direct_ops_mod() -> update_ftrace_direct_mod() to update ftrace immediately, modify_fentry_multi() only adds a hash entry. The actual ftrace update is deferred until after the link loop.
This matters because bpf_trampoline_update() unconditionally calls bpf_tramp_image_put() on the old cur_image after a successful modify_fentry callback:
bpf_trampoline_update() {
...
err = ops->modify_fentry(tr, ...);
...
if (tr->cur_image)
bpf_tramp_image_put(tr->cur_image);
tr->cur_image = im;
}With the standard ops, the old image is already unreachable when put. With multi ops, ftrace still points to the old image when it is put. bpf_tramp_image_put() text-pokes the old image to skip fexit programs and starts deferred freeing.
In the success path, the window between image_put and the batched update_ftrace_direct_mod is brief (bounded by trampoline_lock_all).
However, in the rollback path below, ftrace is never updated at all:
[ ... ]
Quoted 9 lines
kernel/bpf/trampoline.c +9
-0+trampoline_lock_all (); + +for (i =0 ; i < cnt; i++) { + mnode = &link->nodes[i]; + err =__bpf_trampoline_link_prog (&mnode->node, mnode->trampoline,NULL , + &trampoline_multi_ops, &data); +if (err) + goto rollback_unlink; + }
[ ... ]
kernel/bpf/trampoline.c int __weak arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags, · line 1621
Quoted 9 lines
kernel/bpf/trampoline.c +9
-0+rollback_unlink: +for (j =0 ; j < i; j++) { + mnode = &link->nodes[j]; +WARN_ON_ONCE (__bpf_trampoline_unlink_prog (&mnode->node, mnode->trampoline, +NULL , &trampoline_multi_ops, &data)); + } +trampoline_unlock_all (); + + i = cnt;
If a trampoline at index 0 already had programs attached through the standard single-trampoline path, and __bpf_trampoline_link_prog succeeds for it but fails for a later trampoline, the rollback path restores tr->cur_image to a correct new image but never calls update_ftrace_direct_mod.
At that point, ftrace still routes calls through the old image that was put during the link phase. bpf_tramp_image_put() has already patched that old image to skip fexit programs and started the deferred freeing sequence (percpu_ref_kill).
Could this leave existing fexit/fmod_ret programs on that trampoline non-functional? And once the percpu_ref drains during a quiet period, would the old image be freed while ftrace still references it?
[ ... ]
kernel/bpf/trampoline.c int __weak arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags, · line 1643
Quoted 13 lines
kernel/bpf/trampoline.c +13
-0+int bpf_trampoline_multi_detach (struct bpf_prog *prog,struct bpf_tracing_multi_link *link) +{ +struct bpf_tracing_multi_node *mnode; +struct fentry_multi_data data = {}; +int i, cnt = link->nodes_cnt; + + data.unreg =alloc_ftrace_hash (FTRACE_HASH_DEFAULT_BITS ); + data.modify =alloc_ftrace_hash (FTRACE_HASH_DEFAULT_BITS ); + +if (!data.unreg || !data.modify) { +free_fentry_multi_data (&data); +return -ENOMEM ; + }
bpf_trampoline_multi_detach can return -ENOMEM here without detaching anything. In e80a839e3d2c ("bpf: Add support for tracing multi link"), this is called from bpf_tracing_multi_link_release():
WARN_ON_ONCE(bpf_trampoline_multi_detach(link->prog, tr_link));
If detach fails, the programs remain linked to the trampolines via mnode->node.tramp_hlist, but the link (and its embedded nodes array) is freed by bpf_tracing_multi_link_dealloc(). Would this leave dangling hlist entries in each trampoline's progs_hlist?
---
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/23133791558
Re: [PATCHv3 bpf-next 08/24] bpf: Add bpf_trampoline_multi_attach/detach functions
Quoted 8 lines · On Mon, Mar 16, 2026 at 08:35:15AM +0000, [email protected] wrote:
Quoted 5 lines
The detach works as follows:
- we lock all the needed trampolines
- remove the program from each (__bpf_trampoline_unlink_prog)
- thetrampoline_multi_opspassed in__bpf_trampoline_link_proggathersftrace_hash(ip -> trampoline) objectsThe detach description references
__bpf_trampoline_link_prog, but the detach path calls__bpf_trampoline_unlink_prog.
ack
Quoted 78 lines
Quoted 5 lines
kernel/bpf/trampoline.c +0
-0[ ... ]
kernel/bpf/trampoline.c int __weak arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags, · line 1491
Quoted 11 lines
kernel/bpf/trampoline.c +11
-0+static int modify_fentry_multi (struct bpf_trampoline *tr,u32 orig_flags,void *old_addr, +void *new_addr,bool lock_direct_mutex,void *ptr) +{ +unsigned long addr = (unsigned long ) new_addr; +unsigned long ip =ftrace_location (tr->ip); +struct fentry_multi_data *data = ptr; + +if (bpf_trampoline_use_jmp (tr->flags)) + addr =ftrace_jmp_set (addr); +return add_ftrace_hash_entry_direct (data->modify, ip, addr) ?0 : -ENOMEM ; +}Unlike the standard
modify_fentry()which callsdirect_ops_mod()->update_ftrace_direct_mod()to update ftrace immediately,modify_fentry_multi()only adds a hash entry. The actual ftrace update is deferred until after the link loop.This matters because
bpf_trampoline_update()unconditionally callsbpf_tramp_image_put()on the oldcur_imageafter a successfulmodify_fentrycallback:bpf_trampoline_update() { ... err = ops->modify_fentry(tr, ...); ... if (tr->cur_image) bpf_tramp_image_put(tr->cur_image); tr->cur_image = im; }With the standard ops, the old image is already unreachable when put. With multi ops, ftrace still points to the old image when it is put.
bpf_tramp_image_put()text-pokes the old image to skip fexit programs and starts deferred freeing.In the success path, the window between
image_putand the batchedupdate_ftrace_direct_modis brief (bounded bytrampoline_lock_all).However, in the rollback path below, ftrace is never updated at all:
[ ... ]
Quoted 9 lines
kernel/bpf/trampoline.c +9
-0+trampoline_lock_all (); + +for (i =0 ; i < cnt; i++) { + mnode = &link->nodes[i]; + err =__bpf_trampoline_link_prog (&mnode->node, mnode->trampoline,NULL , + &trampoline_multi_ops, &data); +if (err) + goto rollback_unlink; + }[ ... ]
kernel/bpf/trampoline.c int __weak arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags, · line 1621
Quoted 9 lines
kernel/bpf/trampoline.c +9
-0+rollback_unlink: +for (j =0 ; j < i; j++) { + mnode = &link->nodes[j]; +WARN_ON_ONCE (__bpf_trampoline_unlink_prog (&mnode->node, mnode->trampoline, +NULL , &trampoline_multi_ops, &data)); + } +trampoline_unlock_all (); + + i = cnt;If a trampoline at index 0 already had programs attached through the standard single-trampoline path, and
__bpf_trampoline_link_progsucceeds for it but fails for a later trampoline, the rollback path restorestr->cur_imageto a correct new image but never callsupdate_ftrace_direct_mod.
Quoted 8 lines
At that point, ftrace still routes calls through the old image that was put during the link phase.
bpf_tramp_image_put()has already patched that old image to skip fexit programs and started the deferred freeing sequence (percpu_ref_kill).Could this leave existing fexit/fmod_ret programs on that trampoline non-functional? And once the
percpu_refdrains during a quiet period, would the old image be freed while ftrace still references it?
good catch, we need the update_ftrace_direct_mod call after the unlink, I changed the rollback test to hit the described issue, will fix
Quoted 21 lines
[ ... ]
kernel/bpf/trampoline.c int __weak arch_bpf_trampoline_size(const struct btf_func_model *m, u32 flags, · line 1643
Quoted 13 lines
kernel/bpf/trampoline.c +13
-0+int bpf_trampoline_multi_detach (struct bpf_prog *prog,struct bpf_tracing_multi_link *link) +{ +struct bpf_tracing_multi_node *mnode; +struct fentry_multi_data data = {}; +int i, cnt = link->nodes_cnt; + + data.unreg =alloc_ftrace_hash (FTRACE_HASH_DEFAULT_BITS ); + data.modify =alloc_ftrace_hash (FTRACE_HASH_DEFAULT_BITS ); + +if (!data.unreg || !data.modify) { +free_fentry_multi_data (&data); +return -ENOMEM ; + }
bpf_trampoline_multi_detachcan return-ENOMEMhere without detaching anything. Ine80a839e3d2c("bpf: Add support for tracing multi link"), this is called frombpf_tracing_multi_link_release():
Quoted 6 lines
WARN_ON_ONCE(bpf_trampoline_multi_detach(link->prog, tr_link));If detach fails, the programs remain linked to the trampolines via
mnode->node.tramp_hlist, but the link (and its embedded nodes array) is freed bybpf_tracing_multi_link_dealloc(). Would this leave dangling hlist entries in each trampoline'sprogs_hlist?
not sure there's anything useful we could do if allocation fails
jirka
kernel test robot
build botRe: [PATCHv3 bpf-next 08/24] bpf: Add bpf_trampoline_multi_attach/detach functions
In reply to Jiri Olsakernel test robot noticed the following build errors:
Hi Jiri,
kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
url: https://github.com/intel-lab-lkp/linux/commits/Jiri-Olsa/ftrace-Add-ftrace_hash_count-function/20260316-160117 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20260316075138.465430-9-jolsa%40kernel.org patch subject: [PATCHv3 bpf-next 08/24] bpf: Add bpf_trampoline_multi_attach/detach functions config: x86_64-randconfig-075-20260320 (https://download.01.org/0day-ci/archive/20260320/[email protected]/config) compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261) rustc: rustc 1.88.0 (6b00bc388 2025-06-23) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260320/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> kernel/bpf/trampoline.c:1520:8: error: call to undeclared function 'btf_distill_func_proto'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
1520 | err = btf_distill_func_proto(NULL, btf, t, tname, &tgt_info->fmodel);
| ^1 error generated.
vim +/btf_distill_func_proto +1520 kernel/bpf/trampoline.c
1498
1499 static int bpf_get_btf_id_target(struct btf *btf, struct bpf_prog *prog, u32 btf_id,
1500 struct bpf_attach_target_info *tgt_info)
1501 {
1502 const struct btf_type *t;
1503 unsigned long addr;
1504 const char *tname;
1505 int err;
1506
1507 if (!btf_id || !btf)
1508 return -EINVAL;
1509 t = btf_type_by_id(btf, btf_id);
1510 if (!t)
1511 return -EINVAL;
1512 tname = btf_name_by_offset(btf, t->name_off);
1513 if (!tname)
1514 return -EINVAL;
1515 if (!btf_type_is_func(t))
1516 return -EINVAL;
1517 t = btf_type_by_id(btf, t->type);
1518 if (!btf_type_is_func_proto(t))
1519 return -EINVAL;
> 1520 err = btf_distill_func_proto(NULL, btf, t, tname, &tgt_info->fmodel);
1521 if (err < 0)
1522 return err;
1523 if (btf_is_module(btf)) {
1524 /* The bpf program already holds refference to module. */
1525 if (WARN_ON_ONCE(!prog->aux->mod))
1526 return -EINVAL;
1527 addr = find_kallsyms_symbol_value(prog->aux->mod, tname);
1528 } else {
1529 addr = kallsyms_lookup_name(tname);
1530 }
1531 if (!addr || !ftrace_location(addr))
1532 return -ENOENT;
1533 tgt_info->tgt_addr = addr;
1534 return 0;
1535 }
1536
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Jiri Olsa
reviewerPATCH v3 9/24 bpf: Add support for tracing multi link
In reply to Jiri OlsaAdding new link to allow to attach program to multiple function BTF IDs. The link is represented by struct bpf_tracing_multi_link.
To configure the link, new fields are added to bpf_attr::link_create to pass array of BTF IDs;
struct {
__aligned_u64 ids;
__u32 cnt;
} tracing_multi;Each BTF ID represents function (BTF_KIND_FUNC) that the link will attach bpf program to.
We use previously added bpf_trampoline_multi_attach/detach functions to attach/detach the link.
The linkinfo/fdinfo callbacks will be implemented in following changes.
Note this is supported only for archs (x86_64) with ftrace direct and have single ops support.
CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS &&
CONFIG_HAVE_SINGLE_FTRACE_DIRECT_OPS
--- include/linux/bpf_types.h | 1 + include/linux/trace_events.h | 6 +++ include/uapi/linux/bpf.h | 5 ++ kernel/bpf/syscall.c | 2 + kernel/trace/bpf_trace.c | 90 ++++++++++++++++++++++++++++++++++ tools/include/uapi/linux/bpf.h | 6 +++ tools/lib/bpf/libbpf.c | 1 + 7 files changed, 111 insertions(+)
include/linux/bpf_types.h +1 -0
@@ -155,3 +155,4 @@ BPF_LINK_TYPE(BPF_LINK_TYPE_PERF_EVENT, perf) BPF_LINK_TYPE(BPF_LINK_TYPE_KPROBE_MULTI, kprobe_multi) BPF_LINK_TYPE(BPF_LINK_TYPE_STRUCT_OPS, struct_ops) BPF_LINK_TYPE(BPF_LINK_TYPE_UPROBE_MULTI, uprobe_multi) +BPF_LINK_TYPE (BPF_LINK_TYPE_TRACING_MULTI , tracing_multi)
include/linux/trace_events.h +6 -0
@@ -783,6 +783,7 @@ int bpf_get_perf_event_info(const struct perf_event *event, u32 *prog_id, unsigned long *missed);int bpf_kprobe_multi_link_attach (const union bpf_attr *attr,struct bpf_prog *prog);int bpf_uprobe_multi_link_attach (const union bpf_attr *attr,struct bpf_prog *prog); +int bpf_tracing_multi_attach (struct bpf_prog *prog,const union bpf_attr *attr);#else static inline unsigned int trace_call_bpf (struct trace_event_call *call,void *ctx) {
@@ -835,6 +836,11 @@ bpf_uprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog) {return -EOPNOTSUPP ; } +static inline int +bpf_tracing_multi_attach (struct bpf_prog *prog,const union bpf_attr *attr) +{ +return -EOPNOTSUPP ; +}#endif enum {
include/uapi/linux/bpf.h +5 -0
@@ -1180,6 +1180,7 @@ enum bpf_link_type {BPF_LINK_TYPE_UPROBE_MULTI =12 ,BPF_LINK_TYPE_NETKIT =13 ,BPF_LINK_TYPE_SOCKMAP =14 , +BPF_LINK_TYPE_TRACING_MULTI =15 , __MAX_BPF_LINK_TYPE, };
@@ -1863,6 +1864,10 @@ union bpf_attr { };__u64 expected_revision; } cgroup; +struct { +__aligned_u64 ids; +__u32 cnt; + } tracing_multi; }; } link_create;
kernel/bpf/syscall.c +2 -0
@@ -5749,6 +5749,8 @@ static int link_create(union bpf_attr *attr, bpfptr_t uattr) ret =bpf_iter_link_attach (attr, uattr, prog); else if (prog->expected_attach_type == BPF_LSM_CGROUP) ret =cgroup_bpf_link_attach (attr, prog); + else if (is_tracing_multi(prog->expected_attach_type)) + ret =bpf_tracing_multi_attach (prog, attr); else ret = bpf_tracing_prog_attach(prog, attr->link_create.target_fd,
kernel/trace/bpf_trace.c +90 -0
99 lines not on this page · raw message
tools/include/uapi/linux/bpf.h +6 -0
@@ -1180,6 +1180,7 @@ enum bpf_link_type {BPF_LINK_TYPE_UPROBE_MULTI =12 ,BPF_LINK_TYPE_NETKIT =13 ,BPF_LINK_TYPE_SOCKMAP =14 , +BPF_LINK_TYPE_TRACING_MULTI =15 , __MAX_BPF_LINK_TYPE, };
@@ -1863,6 +1864,10 @@ union bpf_attr { };__u64 expected_revision; } cgroup; +struct { +__aligned_u64 ids; +__u32 cnt; + } tracing_multi; }; } link_create;
@@ -7236,6 +7241,7 @@ enum {TCP_BPF_SOCK_OPS_CB_FLAGS =1008 ,/* Get or Set TCP sock ops flags */ SK_BPF_CB_FLAGS =1009 ,/* Get or set sock ops flags in socket */ SK_BPF_BYPASS_PROT_MEM = 1010, /* Get or Set sk->sk_bypass_prot_mem */ + }; enum {
tools/lib/bpf/libbpf.c +1 -0
@@ -156,6 +156,7 @@ static const char * const link_type_name[] = { [BPF_LINK_TYPE_UPROBE_MULTI] = "uprobe_multi", [BPF_LINK_TYPE_NETKIT] = "netkit", [BPF_LINK_TYPE_SOCKMAP] = "sockmap", + [BPF_LINK_TYPE_TRACING_MULTI] = "tracing_multi", };static const char *const map_type_name[] = {
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 10/24 bpf: Add support for tracing_multi link cookies
In reply to Jiri OlsaAdd support to specify cookies for tracing_multi link.
Cookies are provided in array where each value is paired with provided BTF ID value with the same array index.
Such cookie can be retrieved by bpf program with bpf_get_attach_cookie helper call.
--- include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 1 + kernel/bpf/trampoline.c | 1 + kernel/trace/bpf_trace.c | 18 ++++++++++++++++++ tools/include/uapi/linux/bpf.h | 1 + 5 files changed, 22 insertions(+)
include/linux/bpf.h +1 -0
@@ -1901,6 +1901,7 @@ struct bpf_tracing_multi_node {struct bpf_tracing_multi_link {struct bpf_link link; +u64 *cookies;int nodes_cnt; struct bpf_tracing_multi_node nodes[] __counted_by(nodes_cnt); };
include/uapi/linux/bpf.h +1 -0
@@ -1866,6 +1866,7 @@ union bpf_attr { } cgroup;struct {__aligned_u64 ids; +__aligned_u64 cookies;__u32 cnt; } tracing_multi; };
kernel/bpf/trampoline.c +1 -0
@@ -1579,6 +1579,7 @@ int bpf_trampoline_multi_attach(struct bpf_prog *prog, u32 *ids, mnode = &link->nodes[i]; mnode->trampoline = tr; mnode->node.link = &link->link; + mnode->node.cookie = link->cookies ? link->cookies[i] :0 ; }trampoline_lock_all ();
kernel/trace/bpf_trace.c +18 -0
@@ -3612,6 +3612,7 @@ static void bpf_tracing_multi_link_dealloc(struct bpf_link *link)struct bpf_tracing_multi_link *tr_link = container_of(link, struct bpf_tracing_multi_link, link); +kvfree (tr_link->cookies);kvfree (tr_link); }
@@ -3625,6 +3626,8 @@ int bpf_tracing_multi_attach(struct bpf_prog *prog, const union bpf_attr *attr)struct bpf_tracing_multi_link *link =NULL ;struct bpf_link_primer link_primer;u32 cnt, *ids =NULL ; +u64 __user *ucookies; +u64 *cookies =NULL ;u32 __user *uids;int err;
@@ -3647,6 +3650,19 @@ int bpf_tracing_multi_attach(struct bpf_prog *prog, const union bpf_attr *attr) goto error; } + ucookies =u64_to_user_ptr (attr->link_create.tracing_multi.cookies); +if (ucookies) { + cookies =kvmalloc_objs (*cookies, cnt); +if (!cookies) { + err = -ENOMEM ; + goto error; + } +if (copy_from_user (cookies, ucookies, cnt *sizeof (*cookies))) { + err = -EFAULT ; + goto error; + } + } + link =kvzalloc_flex (*link, nodes, cnt);if (!link) { err = -ENOMEM ;
@@ -3661,6 +3677,7 @@ int bpf_tracing_multi_attach(struct bpf_prog *prog, const union bpf_attr *attr) goto error; link->nodes_cnt = cnt; + link->cookies = cookies; err =bpf_trampoline_multi_attach (prog, ids, link);kvfree (ids);
@@ -3671,6 +3688,7 @@ int bpf_tracing_multi_attach(struct bpf_prog *prog, const union bpf_attr *attr)return bpf_link_settle (&link_primer); error: +kvfree (cookies);kvfree (ids);kvfree (link);return err;
tools/include/uapi/linux/bpf.h +1 -0
@@ -1866,6 +1866,7 @@ union bpf_attr { } cgroup;struct {__aligned_u64 ids; +__aligned_u64 cookies;__u32 cnt; } tracing_multi; };
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 11/24 bpf: Add support for tracing_multi link session
In reply to Jiri OlsaAdding support to use session attachment with tracing_multi link.
Adding new BPF_TRACE_FSESSION_MULTI program attach type, that follows the BPF_TRACE_FSESSION behaviour but on the tracing_multi link.
Such program is called on entry and exit of the attached function and allows to pass cookie value from entry to exit execution.
--- include/linux/bpf.h | 6 ++++- include/uapi/linux/bpf.h | 1 + kernel/bpf/btf.c | 2 ++ kernel/bpf/syscall.c | 1 + kernel/bpf/trampoline.c | 43 +++++++++++++++++++++++++++------- kernel/bpf/verifier.c | 17 ++++++++++---- kernel/trace/bpf_trace.c | 15 +++++++++++- net/bpf/test_run.c | 1 + tools/include/uapi/linux/bpf.h | 1 + tools/lib/bpf/libbpf.c | 1 + 10 files changed, 73 insertions(+), 15 deletions(-)
include/linux/bpf.h +5 -1
@@ -1902,6 +1902,7 @@ struct bpf_tracing_multi_node {struct bpf_tracing_multi_link {struct bpf_link link;u64 *cookies; +struct bpf_tramp_node *fexits;int nodes_cnt; struct bpf_tracing_multi_node nodes[] __counted_by(nodes_cnt); };
@@ -2136,7 +2137,8 @@ u32 bpf_struct_ops_id(const void *kdata);static inline bool is_tracing_multi (enum bpf_attach_type type) { -return type ==BPF_TRACE_FENTRY_MULTI || type ==BPF_TRACE_FEXIT_MULTI ; +return type ==BPF_TRACE_FENTRY_MULTI || type ==BPF_TRACE_FEXIT_MULTI || + type ==BPF_TRACE_FSESSION_MULTI ; }#ifdef CONFIG_NET
@@ -2213,6 +2215,8 @@ static inline int bpf_fsession_cnt(struct bpf_tramp_nodes *nodes)for (int i =0 ; i < nodes[BPF_TRAMP_FENTRY ].nr_nodes; i++) {if (fentries.nodes[i]->link->prog->expected_attach_type ==BPF_TRACE_FSESSION ) cnt++; +if (fentries.nodes[i]->link->prog->expected_attach_type ==BPF_TRACE_FSESSION_MULTI ) + cnt++; }return cnt;
include/uapi/linux/bpf.h +1 -0
@@ -1156,6 +1156,7 @@ enum bpf_attach_type {BPF_TRACE_FSESSION ,BPF_TRACE_FENTRY_MULTI ,BPF_TRACE_FEXIT_MULTI , +BPF_TRACE_FSESSION_MULTI , __MAX_BPF_ATTACH_TYPE };
kernel/bpf/btf.c +2 -0
@@ -6221,6 +6221,7 @@ static int btf_validate_prog_ctx_type(struct bpf_verifier_log *log, const structcase BPF_TRACE_FEXIT :case BPF_MODIFY_RETURN :case BPF_TRACE_FSESSION : +case BPF_TRACE_FSESSION_MULTI :case BPF_TRACE_FENTRY_MULTI :case BPF_TRACE_FEXIT_MULTI :/* allow u64* as ctx */
@@ -6825,6 +6826,7 @@ bool btf_ctx_access(int off, int size, enum bpf_access_type type,case BPF_LSM_CGROUP :case BPF_TRACE_FEXIT :case BPF_TRACE_FSESSION : +case BPF_TRACE_FSESSION_MULTI :/* When LSM programs are attached to void LSM hooks * they use FEXIT trampolines and when attached to * int LSM hooks, they use MODIFY_RETURN trampolines.
kernel/bpf/syscall.c +1 -0
@@ -4388,6 +4388,7 @@ attach_type_to_prog_type(enum bpf_attach_type attach_type)case BPF_TRACE_FENTRY :case BPF_TRACE_FEXIT :case BPF_TRACE_FSESSION : +case BPF_TRACE_FSESSION_MULTI :case BPF_TRACE_FENTRY_MULTI :case BPF_TRACE_FEXIT_MULTI :case BPF_MODIFY_RETURN :
kernel/bpf/trampoline.c +34 -9
93 lines not on this page · raw message
kernel/bpf/verifier.c +13 -4
@@ -17959,6 +17959,7 @@ static bool return_retval_range(struct bpf_verifier_env *env, struct bpf_retval_case BPF_TRACE_FSESSION :case BPF_TRACE_FENTRY_MULTI :case BPF_TRACE_FEXIT_MULTI : +case BPF_TRACE_FSESSION_MULTI : *range =retval_range (0 ,0 );break ;case BPF_TRACE_RAW_TP :
@@ -23348,7 +23349,8 @@ static int fixup_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, insn_buf[0 ] =BPF_MOV64_REG (BPF_REG_0 ,BPF_REG_1 ); *cnt =1 ; }else if (desc->func_id == special_kfunc_list[KF_bpf_session_is_return] && - env->prog->expected_attach_type ==BPF_TRACE_FSESSION ) { + (env->prog->expected_attach_type ==BPF_TRACE_FSESSION || + env->prog->expected_attach_type ==BPF_TRACE_FSESSION_MULTI )) {/* * inline the bpf_session_is_return() for fsession: * bool bpf_session_is_return(void *ctx)
@@ -23361,7 +23363,8 @@ static int fixup_kfunc_call(struct bpf_verifier_env *env, struct bpf_insn *insn, insn_buf[2 ] =BPF_ALU64_IMM (BPF_AND ,BPF_REG_0 ,1 ); *cnt =3 ; }else if (desc->func_id == special_kfunc_list[KF_bpf_session_cookie] && - env->prog->expected_attach_type ==BPF_TRACE_FSESSION ) { + (env->prog->expected_attach_type ==BPF_TRACE_FSESSION || + env->prog->expected_attach_type ==BPF_TRACE_FSESSION_MULTI )) {/* * inline bpf_session_cookie() for fsession: * __u64 *bpf_session_cookie(void *ctx)
@@ -24149,6 +24152,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env)if (eatype ==BPF_TRACE_FEXIT || eatype ==BPF_TRACE_FSESSION || eatype ==BPF_TRACE_FEXIT_MULTI || + eatype ==BPF_TRACE_FSESSION_MULTI || eatype ==BPF_MODIFY_RETURN ) {/* Load nr_args from ctx - 8 */ insn_buf[0 ] =BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_1 ,-8 );
@@ -25229,7 +25233,8 @@ int bpf_check_attach_target(struct bpf_verifier_log *log, tgt_prog->expected_attach_type ==BPF_TRACE_FEXIT || tgt_prog->expected_attach_type ==BPF_TRACE_FENTRY_MULTI || tgt_prog->expected_attach_type ==BPF_TRACE_FEXIT_MULTI || - tgt_prog->expected_attach_type == BPF_TRACE_FSESSION)) { + tgt_prog->expected_attach_type ==BPF_TRACE_FSESSION || + tgt_prog->expected_attach_type == BPF_TRACE_FSESSION_MULTI)) {/* Program extensions can extend all program types * except fentry/fexit. The reason is the following. * The fentry/fexit programs are used for performance
@@ -25329,9 +25334,11 @@ int bpf_check_attach_target(struct bpf_verifier_log *log,case BPF_TRACE_FENTRY :case BPF_TRACE_FEXIT :case BPF_TRACE_FSESSION : +case BPF_TRACE_FSESSION_MULTI :case BPF_TRACE_FENTRY_MULTI :case BPF_TRACE_FEXIT_MULTI : -if (prog->expected_attach_type ==BPF_TRACE_FSESSION && +if ((prog->expected_attach_type ==BPF_TRACE_FSESSION || + prog->expected_attach_type ==BPF_TRACE_FSESSION_MULTI ) && !bpf_jit_supports_fsession ()) {bpf_log (log,"JIT does not support fsession\n" );return -EOPNOTSUPP ;
@@ -25482,6 +25489,7 @@ static bool can_be_sleepable(struct bpf_prog *prog)case BPF_MODIFY_RETURN :case BPF_TRACE_ITER :case BPF_TRACE_FSESSION : +case BPF_TRACE_FSESSION_MULTI :case BPF_TRACE_FENTRY_MULTI :case BPF_TRACE_FEXIT_MULTI :return true;
@@ -25566,6 +25574,7 @@ static int check_attach_btf_id(struct bpf_verifier_env *env)return -EINVAL ; }else if ((prog->expected_attach_type ==BPF_TRACE_FEXIT || prog->expected_attach_type ==BPF_TRACE_FSESSION || + prog->expected_attach_type ==BPF_TRACE_FSESSION_MULTI || prog->expected_attach_type ==BPF_MODIFY_RETURN ) &&btf_id_set_contains (&noreturn_deny, btf_id)) { verbose(env, "Attaching fexit/fsession/fmod_ret to __noreturn function '%s' is rejected.\n",
kernel/trace/bpf_trace.c +14 -1
@@ -1306,7 +1306,8 @@ static inline bool is_uprobe_session(const struct bpf_prog *prog)static inline bool is_trace_fsession (const struct bpf_prog *prog) {return prog->type ==BPF_PROG_TYPE_TRACING && - prog->expected_attach_type ==BPF_TRACE_FSESSION ; + (prog->expected_attach_type ==BPF_TRACE_FSESSION || + prog->expected_attach_type ==BPF_TRACE_FSESSION_MULTI ); } static const struct bpf_func_proto *
@@ -3612,6 +3613,7 @@ static void bpf_tracing_multi_link_dealloc(struct bpf_link *link)struct bpf_tracing_multi_link *tr_link = container_of(link, struct bpf_tracing_multi_link, link); +kvfree (tr_link->fexits);kvfree (tr_link->cookies);kvfree (tr_link); }
@@ -3624,6 +3626,7 @@ static const struct bpf_link_ops bpf_tracing_multi_link_lops = {int bpf_tracing_multi_attach (struct bpf_prog *prog,const union bpf_attr *attr) {struct bpf_tracing_multi_link *link =NULL ; +struct bpf_tramp_node *fexits =NULL ;struct bpf_link_primer link_primer;u32 cnt, *ids =NULL ;u64 __user *ucookies;
@@ -3663,6 +3666,14 @@ int bpf_tracing_multi_attach(struct bpf_prog *prog, const union bpf_attr *attr) } } +if (prog->expected_attach_type ==BPF_TRACE_FSESSION_MULTI ) { + fexits =kvmalloc_objs (*fexits, cnt); +if (!fexits) { + err = -ENOMEM ; + goto error; + } + } + link =kvzalloc_flex (*link, nodes, cnt);if (!link) { err = -ENOMEM ;
@@ -3678,6 +3689,7 @@ int bpf_tracing_multi_attach(struct bpf_prog *prog, const union bpf_attr *attr) link->nodes_cnt = cnt; link->cookies = cookies; + link->fexits = fexits; err =bpf_trampoline_multi_attach (prog, ids, link);kvfree (ids);
@@ -3688,6 +3700,7 @@ int bpf_tracing_multi_attach(struct bpf_prog *prog, const union bpf_attr *attr)return bpf_link_settle (&link_primer); error: +kvfree (fexits);kvfree (cookies);kvfree (ids);kvfree (link);
net/bpf/test_run.c +1 -0
@@ -688,6 +688,7 @@ int bpf_prog_test_run_tracing(struct bpf_prog *prog,case BPF_TRACE_FSESSION :case BPF_TRACE_FENTRY_MULTI :case BPF_TRACE_FEXIT_MULTI : +case BPF_TRACE_FSESSION_MULTI : if (bpf_fentry_test1(1) != 2 || bpf_fentry_test2(2, 3) != 5 || bpf_fentry_test3(4, 5, 6) != 15 ||
tools/include/uapi/linux/bpf.h +1 -0
@@ -1156,6 +1156,7 @@ enum bpf_attach_type {BPF_TRACE_FSESSION ,BPF_TRACE_FENTRY_MULTI ,BPF_TRACE_FEXIT_MULTI , +BPF_TRACE_FSESSION_MULTI , __MAX_BPF_ATTACH_TYPE };
tools/lib/bpf/libbpf.c +1 -0
@@ -138,6 +138,7 @@ static const char * const attach_type_name[] = { [BPF_TRACE_UPROBE_SESSION] = "trace_uprobe_session", [BPF_TRACE_FENTRY_MULTI] = "trace_fentry_multi", [BPF_TRACE_FEXIT_MULTI] = "trace_fexit_multi", + [BPF_TRACE_FSESSION_MULTI] = "trace_fsession_multi", };static const char *const link_type_name[] = {
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 12/24 bpf: Add support for tracing_multi link fdinfo
In reply to Jiri OlsaAdding 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 8 91203 bpf_fentry_test1+0x4/0x10 9 91205 bpf_fentry_test2+0x4/0x10 7 91206 bpf_fentry_test3+0x4/0x20 5 91207 bpf_fentry_test4+0x4/0x20 4 91208 bpf_fentry_test5+0x4/0x20 2 91209 bpf_fentry_test6+0x4/0x20 3 91210 bpf_fentry_test7+0x4/0x10 1 91211 bpf_fentry_test8+0x4/0x10 10 91212 bpf_fentry_test9+0x4/0x10 6 91204 bpf_fentry_test10+0x4/0x10
--- kernel/trace/bpf_trace.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
kernel/trace/bpf_trace.c +26 -0
@@ -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,"%s\t %s\t %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,"%llu\t %u\t %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)
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 13/24 libbpf: Add bpf_object_cleanup_btf function
In reply to Jiri OlsaAdding bpf_object_cleanup_btf function to cleanup btf objects. It will be used in following changes.
--- tools/lib/bpf/libbpf.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
tools/lib/bpf/libbpf.c +12 -4
@@ -8885,13 +8885,10 @@ static void bpf_object_unpin(struct bpf_object *obj)bpf_map__unpin (&obj->maps[i],NULL ); } -static void bpf_object_post_load_cleanup (struct bpf_object *obj) +static void bpf_object_cleanup_btf (struct bpf_object *obj) {int i; -/* clean up fd_array */ -zfree (&obj->fd_array); -/* clean up module BTFs */ for (i =0 ; i < obj->btf_module_cnt; i++) {close (obj->btf_modules[i].fd);
@@ -8899,6 +8896,8 @@ static void bpf_object_post_load_cleanup(struct bpf_object *obj)free (obj->btf_modules[i].name); } obj->btf_module_cnt =0 ; + obj->btf_module_cap =0 ; + obj->btf_modules_loaded = false;zfree (&obj->btf_modules);/* clean up vmlinux BTF */
@@ -8906,6 +8905,15 @@ static void bpf_object_post_load_cleanup(struct bpf_object *obj) obj->btf_vmlinux =NULL ; } +static void bpf_object_post_load_cleanup (struct bpf_object *obj) +{ +/* clean up fd_array */ +zfree (&obj->fd_array); + +/* clean up BTF */ +bpf_object_cleanup_btf (obj); +} +static int bpf_object_prepare (struct bpf_object *obj,const char *target_btf_path) {int err;
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 14/24 libbpf: Add bpf_link_create support for tracing_multi link
In reply to Jiri OlsaAdding bpf_link_create support for tracing_multi link with new tracing_multi record in struct bpf_link_create_opts.
--- tools/lib/bpf/bpf.c | 9 +++++++++ tools/lib/bpf/bpf.h | 5 +++++ 2 files changed, 14 insertions(+)
tools/lib/bpf/bpf.c +9 -0
@@ -790,6 +790,15 @@ int bpf_link_create(int prog_fd, int target_fd,if (!OPTS_ZEROED (opts, uprobe_multi))return libbpf_err (-EINVAL );break ; +case BPF_TRACE_FENTRY_MULTI : +case BPF_TRACE_FEXIT_MULTI : +case BPF_TRACE_FSESSION_MULTI : + attr.link_create.tracing_multi.ids =ptr_to_u64 (OPTS_GET (opts, tracing_multi.ids,0 )); + attr.link_create.tracing_multi.cookies =ptr_to_u64 (OPTS_GET (opts, tracing_multi.cookies,0 )); + attr.link_create.tracing_multi.cnt =OPTS_GET (opts, tracing_multi.cnt,0 ); +if (!OPTS_ZEROED (opts, tracing_multi)) +return libbpf_err (-EINVAL ); +break ;case BPF_TRACE_RAW_TP :case BPF_TRACE_FENTRY :case BPF_TRACE_FEXIT :
tools/lib/bpf/bpf.h +5 -0
@@ -454,6 +454,11 @@ struct bpf_link_create_opts {__u32 relative_id;__u64 expected_revision; } cgroup; +struct { +__u32 *ids; +__u64 *cookies; +__u32 cnt; + } tracing_multi; }; size_t :0; };
Signature · 1 line
2.53.0
[email protected]
AI reviewRe: [PATCHv3 bpf-next 14/24] libbpf: Add bpf_link_create support for tracing_multi link
Should the ids and cookies pointers be const-qualified here? Every other multi-attach member in this union uses const for its pointer fields, for example in kprobe_multi:
tools/lib/bpf/bpf.h struct bpf_link_create_opts { · line 461
Quoted 12 lines
tools/lib/bpf/bpf.h +5
-0@@ -454,6 +454,11 @@ struct bpf_link_create_opts {__u64 expected_revision; } cgroup; +struct { +__u32 *ids; +__u64 *cookies; +__u32 cnt; + } tracing_multi; };
Should the ids and cookies pointers be const-qualified here? Every other multi-attach member in this union uses const for its pointer fields, for example in kprobe_multi:
const char **syms;
const unsigned long *addrs;
const __u64 *cookies;and in uprobe_multi:
const unsigned long *offsets;
const unsigned long *ref_ctr_offsets;
const __u64 *cookies;These arrays are input-only (passed straight through to the kernel via ptr_to_u64), so marking them const would be consistent with the existing convention and would avoid compiler warnings for callers passing const arrays.
---
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/23133791558
Re: [PATCHv3 bpf-next 14/24] libbpf: Add bpf_link_create support for tracing_multi link
Quoted 23 lines · On Mon, Mar 16, 2026 at 08:35:10AM +0000, [email protected] wrote:
tools/lib/bpf/bpf.h struct bpf_link_create_opts { · line 461
Quoted 12 lines
tools/lib/bpf/bpf.h +5
-0@@ -454,6 +454,11 @@ struct bpf_link_create_opts {__u64 expected_revision; } cgroup; +struct { +__u32 *ids; +__u64 *cookies; +__u32 cnt; + } tracing_multi; };Should the ids and cookies pointers be const-qualified here? Every other multi-attach member in this union uses const for its pointer fields, for example in
kprobe_multi:const char **syms; const unsigned long *addrs; const __u64 *cookies;and in
uprobe_multi:
Quoted 8 lines
const unsigned long *offsets; const unsigned long *ref_ctr_offsets; const __u64 *cookies;These arrays are input-only (passed straight through to the kernel via
ptr_to_u64), so marking them const would be consistent with the existing convention and would avoid compiler warnings for callers passing const arrays.
yep, will make it const
jirka
Quoted 7 lines
---
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/23133791558
Jiri Olsa
reviewerPATCH v3 15/24 libbpf: Add btf_type_is_traceable_func function
In reply to Jiri OlsaAdding btf_type_is_traceable_func function to perform same checks as the kernel's btf_distill_func_proto function to prevent attachment on some of the functions.
Exporting the function via libbpf_internal.h because it will be used by benchmark test in following changes.
--- tools/lib/bpf/libbpf.c | 54 +++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf_internal.h | 1 + 2 files changed, 55 insertions(+)
tools/lib/bpf/libbpf.c +54 -0
@@ -12275,6 +12275,60 @@ static int attach_uprobe_multi(const struct bpf_program *prog, long cookie, strureturn ret; } +#define MAX_BPF_FUNC_ARGS 12 + +static bool btf_type_is_modifier (const struct btf_type *t) +{ +switch (BTF_INFO_KIND (t->info)) { +case BTF_KIND_TYPEDEF : +case BTF_KIND_VOLATILE : +case BTF_KIND_CONST : +case BTF_KIND_RESTRICT : +case BTF_KIND_TYPE_TAG : +return true; +default : +return false; + } +} + +bool btf_type_is_traceable_func (const struct btf *btf,const struct btf_type *t) +{ +const struct btf_type *proto; +const struct btf_param *args; +__u32 i, nargs; +__s64 ret; + + proto =btf_type_by_id (btf, t->type); +if (BTF_INFO_KIND (proto->info) !=BTF_KIND_FUNC_PROTO ) +return false; + + args = (const struct btf_param *)(proto +1 ); + nargs =btf_vlen (proto); +if (nargs >MAX_BPF_FUNC_ARGS ) +return false; + +/* No support for struct/union return argument type. */ + t =btf__type_by_id (btf, proto->type); +while (t &&btf_type_is_modifier (t)) + t =btf__type_by_id (btf, t->type); + +if (btf_is_struct (t) ||btf_is_union (t)) +return false; + +for (i =0 ; i < nargs; i++) { +/* No support for variable args. */ +if (i == nargs -1 && args[i].type ==0 ) +return false; + +/* No support of struct argument size greater than 16 bytes. */ + ret =btf__resolve_size (btf, args[i].type); +if (ret <0 || ret >16 ) +return false; + } + +return true; +} +static inline int add_uprobe_event_legacy (const char *probe_name,bool retprobe,const char *binary_path,size_t offset) {
tools/lib/bpf/libbpf_internal.h +1 -0
@@ -250,6 +250,7 @@ const struct btf_type *skip_mods_and_typedefs(const struct btf *btf, __u32 id, _const struct btf_header *btf_header (const struct btf *btf);void btf_set_base_btf (struct btf *btf,const struct btf *base_btf);int btf_relocate (struct btf *btf,const struct btf *base_btf,__u32 **id_map); +bool btf_type_is_traceable_func (const struct btf *btf,const struct btf_type *t);static inline enum btf_func_linkage btf_func_linkage (const struct btf_type *t) {
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 16/24 libbpf: Add support to create tracing multi link
In reply to Jiri OlsaAdding bpf_program__attach_tracing_multi function for attaching tracing program to multiple functions.
struct bpf_link *
bpf_program__attach_tracing_multi(const struct bpf_program *prog,
const char *pattern,
const struct bpf_tracing_multi_opts *opts);
User can specify functions to attach with 'pattern' argument that allows wildcards (*?' supported) or provide BTF ids of functions in array directly via opts argument. These options are mutually exclusive.
When using BTF ids, user can also provide cookie value for each provided id/function, that can be retrieved later in bpf program with bpf_get_attach_cookie helper. Each cookie value is paired with provided BTF id with the same array index.
Adding support to auto attach programs with following sections:
fsession.multi/<pattern>
fsession.multi.s/<pattern>
fentry.multi/<pattern>
fexit.multi/<pattern>
fentry.multi.s/<pattern>
fexit.multi.s/<pattern>
The provided <pattern> is used as 'pattern' argument in bpf_program__attach_kprobe_multi_opts function.
The <pattern> allows to specify optional kernel module name with following syntax:
<module>:<function_pattern>
In order to attach tracing_multi link to a module functions:
- program must be loaded with 'module' btf fd
(in attr::attach_btf_obj_fd)
- bpf_program__attach_tracing_multi must either have pattern with module spec or BTF ids from the module
--- tools/lib/bpf/libbpf.c | 263 +++++++++++++++++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 15 +++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 279 insertions(+)
tools/lib/bpf/libbpf.c +263 -0
@@ -7716,6 +7716,69 @@ static int bpf_object__sanitize_prog(struct bpf_object *obj, struct bpf_programstatic int libbpf_find_attach_btf_id (struct bpf_program *prog,const char *attach_name,int *btf_obj_fd,int *btf_type_id); +static inline bool is_tracing_multi (enum bpf_attach_type type) +{ +return type ==BPF_TRACE_FENTRY_MULTI || type ==BPF_TRACE_FEXIT_MULTI || + type ==BPF_TRACE_FSESSION_MULTI ; +} + +static const struct module_btf *find_attach_module (struct bpf_object *obj,const char *attach) +{ +const char *sep, *mod_name =NULL ; +int i, mod_len, err; + +/* +* We expect attach string in the form of either +* - function_pattern or +* - <module>:function_pattern +*/ + sep =strchr (attach,':' ); +if (sep) { + mod_name = attach; + mod_len = sep - mod_name; + } +if (!mod_name) +return NULL ; + + err =load_module_btfs (obj); +if (err) +return NULL ; + +for (i =0 ; i < obj->btf_module_cnt; i++) { +const struct module_btf *mod = &obj->btf_modules[i]; + +if (strncmp (mod->name, mod_name, mod_len) ==0 && mod->name[mod_len] =='\0' ) +return mod; + } +return NULL ; +} + +static int tracing_multi_mod_fd (struct bpf_program *prog,int *btf_obj_fd) +{ +const char *attach_name, *sep; +const struct module_btf *mod; + + *btf_obj_fd =0 ; + attach_name =strchr (prog->sec_name,'/' ); + +/* Program with no details in spec, using kernel btf. */ +if (!attach_name) +return 0 ; + +/* Program with no module section, using kernel btf. */ + sep =strchr (++attach_name,':' ); +if (!sep) +return 0 ; + +/* Program with module specified, get its btf fd. */ + mod =find_attach_module (prog->obj, attach_name); +if (!mod) +return -EINVAL ; + + *btf_obj_fd = mod->fd; +return 0 ; +} +/* this is called as prog->sec_def->prog_prepare_load_fn for libbpf-supported sec_defs */ static int libbpf_prepare_prog_load (struct bpf_program *prog,struct bpf_prog_load_opts *opts,long cookie)
@@ -7779,6 +7842,18 @@ static int libbpf_prepare_prog_load(struct bpf_program *prog, opts->attach_btf_obj_fd = btf_obj_fd; opts->attach_btf_id = btf_type_id; } + +if (is_tracing_multi (prog->expected_attach_type)) { +int err, btf_obj_fd =0 ; + + err =tracing_multi_mod_fd (prog, &btf_obj_fd); +if (err <0 ) +return err; + + prog->attach_btf_obj_fd = btf_obj_fd; + opts->attach_btf_obj_fd = btf_obj_fd; + } +return 0 ; }
@@ -9835,6 +9910,7 @@ static int attach_kprobe_session(const struct bpf_program *prog, long cookie, ststatic int attach_uprobe_multi (const struct bpf_program *prog,long cookie,struct bpf_link **link);static int attach_lsm (const struct bpf_program *prog,long cookie,struct bpf_link **link);static int attach_iter (const struct bpf_program *prog,long cookie,struct bpf_link **link); +static int attach_tracing_multi (const struct bpf_program *prog,long cookie,struct bpf_link **link);static const struct bpf_sec_def section_defs[] = {SEC_DEF ("socket" ,SOCKET_FILTER ,0 ,SEC_NONE ),
@@ -9883,6 +9959,12 @@ static const struct bpf_sec_def section_defs[] = {SEC_DEF ("fexit.s+" ,TRACING ,BPF_TRACE_FEXIT ,SEC_ATTACH_BTF |SEC_SLEEPABLE , attach_trace),SEC_DEF ("fsession+" ,TRACING ,BPF_TRACE_FSESSION ,SEC_ATTACH_BTF , attach_trace),SEC_DEF ("fsession.s+" ,TRACING ,BPF_TRACE_FSESSION ,SEC_ATTACH_BTF |SEC_SLEEPABLE , attach_trace), +SEC_DEF ("fsession.multi+" ,TRACING ,BPF_TRACE_FSESSION_MULTI ,0 , attach_tracing_multi), +SEC_DEF ("fsession.multi.s+" ,TRACING ,BPF_TRACE_FSESSION_MULTI ,SEC_SLEEPABLE , attach_tracing_multi), +SEC_DEF ("fentry.multi+" ,TRACING ,BPF_TRACE_FENTRY_MULTI ,0 , attach_tracing_multi), +SEC_DEF ("fexit.multi+" ,TRACING ,BPF_TRACE_FEXIT_MULTI ,0 , attach_tracing_multi), +SEC_DEF ("fentry.multi.s+" ,TRACING ,BPF_TRACE_FENTRY_MULTI ,SEC_SLEEPABLE , attach_tracing_multi), +SEC_DEF ("fexit.multi.s+" ,TRACING ,BPF_TRACE_FEXIT_MULTI ,SEC_SLEEPABLE , attach_tracing_multi),SEC_DEF ("freplace+" ,EXT ,0 ,SEC_ATTACH_BTF , attach_trace),SEC_DEF ("lsm+" ,LSM ,BPF_LSM_MAC ,SEC_ATTACH_BTF , attach_lsm), SEC_DEF("lsm.s+", LSM, BPF_LSM_MAC, SEC_ATTACH_BTF | SEC_SLEEPABLE, attach_lsm),
@@ -12329,6 +12411,187 @@ bool btf_type_is_traceable_func(const struct btf *btf, const struct btf_type *t)return true; } +static int +collect_btf_func_ids_by_glob (const struct btf *btf,const char *pattern,__u32 **ids) +{ +__u32 type_id, nr_types =btf__type_cnt (btf); +size_t cap =0 , cnt =0 ; + +if (!pattern) +return -EINVAL ; + +for (type_id =1 ; type_id < nr_types; type_id++) { +const struct btf_type *t =btf__type_by_id (btf, type_id); +const char *name; +int err; + +if (btf_kind (t) !=BTF_KIND_FUNC ) +continue ; + name =btf__name_by_offset (btf, t->name_off); +if (!name) +continue ; + +if (!glob_match (name, pattern)) +continue ; +if (!btf_type_is_traceable_func (btf, t)) +continue ; + + err =libbpf_ensure_mem ((void **) ids, &cap,sizeof (**ids), cnt +1 ); +if (err) { +free (*ids); +return -ENOMEM ; + } + (*ids)[cnt++] = type_id; + } + +return cnt; +} + +static int collect_func_ids_by_glob (struct bpf_object *obj,const char *pattern,__u32 **ids) +{ +const struct module_btf *mod; +struct btf *btf =NULL ; +const char *sep; +int err; + + err =bpf_object__load_vmlinux_btf (obj, true); +if (err) +return err; + +/* In case we have module specified, we will find its btf and use that. */ + sep =strchr (pattern,':' ); +if (sep) { + mod =find_attach_module (obj, pattern); +if (!mod) { + err = -EINVAL ; + goto cleanup; + } + btf = mod->btf; + pattern = sep +1 ; + }else { + btf = obj->btf_vmlinux; + } + + err =collect_btf_func_ids_by_glob (btf, pattern, ids); + +cleanup: +bpf_object_cleanup_btf (obj); +return err; +} + +struct bpf_link * +bpf_program__attach_tracing_multi (const struct bpf_program *prog,const char *pattern, +const struct bpf_tracing_multi_opts *opts) +{ +LIBBPF_OPTS (bpf_link_create_opts, lopts); +int prog_fd, link_fd, err, cnt; +__u32 *ids, *free_ids =NULL ; +struct bpf_link *link; +__u64 *cookies; + +if (!OPTS_VALID (opts, bpf_tracing_multi_opts)) +return libbpf_err_ptr (-EINVAL ); + + cnt =OPTS_GET (opts, cnt,0 ); + ids =OPTS_GET (opts, ids,NULL ); + cookies =OPTS_GET (opts, cookies,NULL ); + +if (!!ids != !!cnt) +return libbpf_err_ptr (-EINVAL ); +if (pattern && (ids || cookies)) +return libbpf_err_ptr (-EINVAL ); +if (!pattern && !ids) +return libbpf_err_ptr (-EINVAL ); + +if (pattern) { + cnt =collect_func_ids_by_glob (prog->obj, pattern, &ids); +if (cnt <0 ) +return libbpf_err_ptr (cnt); +if (cnt ==0 ) +return libbpf_err_ptr (-EINVAL ); + free_ids = ids; + } + + lopts.tracing_multi.ids = ids; + lopts.tracing_multi.cookies = cookies; + lopts.tracing_multi.cnt = cnt; + + link =calloc (1 ,sizeof (*link)); +if (!link) { + err = -ENOMEM ; + goto error; + } + link->detach = &bpf_link__detach_fd; + + prog_fd =bpf_program__fd (prog); + link_fd =bpf_link_create (prog_fd,0 , prog->expected_attach_type, &lopts); +if (link_fd <0 ) { + err = -errno; +pr_warn ("prog '%s': failed to attach: %s\n" , prog->name,errstr (err)); + goto error; + } + link->fd = link_fd; +free (free_ids); +return link; + +error: +free (link); +free (free_ids); +return libbpf_err_ptr (err); +} + +static int attach_tracing_multi (const struct bpf_program *prog,long cookie,struct bpf_link **link) +{ +static const char *const prefixes[] = { +"fentry.multi" , +"fexit.multi" , +"fsession.multi" , +"fentry.multi.s" , +"fexit.multi.s" , +"fsession.multi.s" , + }; +const char *spec =NULL ; +char *pattern; +size_t i; +int n; + + *link =NULL ; + +for (i =0 ; i <ARRAY_SIZE (prefixes); i++) { +size_t pfx_len; + +if (!str_has_pfx (prog->sec_name, prefixes[i])) +continue ; + + pfx_len =strlen (prefixes[i]); +/* no auto-attach case of, e.g., SEC("fentry.multi") */ +if (prog->sec_name[pfx_len] =='\0' ) +return 0 ; + +if (prog->sec_name[pfx_len] !='/' ) +continue ; + + spec = prog->sec_name + pfx_len +1 ; +break ; + } + +if (!spec) { +pr_warn ("prog '%s': invalid section name '%s'\n" , + prog->name, prog->sec_name); +return -EINVAL ; + } + + n =sscanf (spec,"%m[a-zA-Z0-9_.*?:]" , &pattern); +if (n <1 ) { +pr_warn ("tracing multi pattern is invalid: %s\n" , spec); +return -EINVAL ; + } + + *link =bpf_program__attach_tracing_multi (prog, pattern,NULL ); +free (pattern); +return libbpf_get_error (*link); +} +static inline int add_uprobe_event_legacy (const char *probe_name,bool retprobe,const char *binary_path,size_t offset) {
tools/lib/bpf/libbpf.h +15 -0
@@ -701,6 +701,21 @@ bpf_program__attach_ksyscall(const struct bpf_program *prog,const char *syscall_name, const struct bpf_ksyscall_opts *opts); +struct bpf_tracing_multi_opts { +/* size of this struct, for forward/backward compatibility */ +size_t sz; +__u32 *ids; +__u64 *cookies; +size_t cnt; + size_t :0; +}; + +#define bpf_tracing_multi_opts__last_field cnt + +LIBBPF_API struct bpf_link * +bpf_program__attach_tracing_multi (const struct bpf_program *prog,const char *pattern, +const struct bpf_tracing_multi_opts *opts); +struct bpf_uprobe_opts {/* size of this struct, for forward/backward compatibility */ size_t sz;
tools/lib/bpf/libbpf.map +1 -0
@@ -452,6 +452,7 @@ LIBBPF_1.7.0 { bpf_map__set_exclusive_program; bpf_map__exclusive_program; bpf_prog_assoc_struct_ops; + bpf_program__attach_tracing_multi; bpf_program__assoc_struct_ops; btf__permute; } LIBBPF_1.6.0;
Signature · 1 line
2.53.0
[email protected]
AI reviewRe: [PATCHv3 bpf-next 16/24] libbpf: Add support to create tracing multi link
Should this say bpf_program__attach_tracing_multi instead of bpf_program__attach_kprobe_multi_opts? The auto-attach path in attach_tracing_multi() calls bpf_program__attach_tracing_multi(), not the…
Quoted 2 lines
The provided <pattern> is used as 'pattern' argument in
bpf_program__attach_kprobe_multi_optsfunction.
Should this say bpf_program__attach_tracing_multi instead of bpf_program__attach_kprobe_multi_opts? The auto-attach path in attach_tracing_multi() calls bpf_program__attach_tracing_multi(), not the kprobe variant.
---
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/23133791558
Re: [PATCHv3 bpf-next 16/24] libbpf: Add support to create tracing multi link
Quoted 7 lines · On Mon, Mar 16, 2026 at 08:35:12AM +0000, [email protected] wrote:
Quoted 2 lines
The provided <pattern> is used as 'pattern' argument in
bpf_program__attach_kprobe_multi_optsfunction.Should this say
bpf_program__attach_tracing_multiinstead ofbpf_program__attach_kprobe_multi_opts? The auto-attach path inattach_tracing_multi()callsbpf_program__attach_tracing_multi(), not the kprobe variant.
no, it's a refference to similar kprobe function
jirka
Quoted 7 lines
---
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/23133791558
Jiri Olsa
reviewerPATCH v3 17/24 selftests/bpf: Add tracing multi skel/pattern/ids attach tests
In reply to Jiri OlsaAdding tests for tracing_multi link attachment via all possible libbpf apis - skeleton, function pattern and btf ids.
--- tools/testing/selftests/bpf/Makefile | 3 +- .../selftests/bpf/prog_tests/tracing_multi.c | 245 ++++++++++++++++++ .../bpf/progs/tracing_multi_attach.c | 40 +++ .../selftests/bpf/progs/tracing_multi_check.c | 150 +++++++++++ 4 files changed, 437 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_multi.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_attach.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_check.c
tools/testing/selftests/bpf/Makefile +2 -1
@@ -485,7 +485,7 @@ SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ linked_vars.skel.h linked_maps.skel.h \ test_subskeleton.skel.h test_subskeleton_lib.skel.h \ - test_usdt.skel.h + test_usdt.skel.h tracing_multi.skel.h LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c \ core_kern.c core_kern_overflow.c test_ringbuf.c \
@@ -511,6 +511,7 @@ test_usdt.skel.h-deps := test_usdt.bpf.o test_usdt_multispec.bpf.o xsk_xdp_progs.skel.h-deps := xsk_xdp_progs.bpf.o xdp_hw_metadata.skel.h-deps := xdp_hw_metadata.bpf.o xdp_features.skel.h-deps := xdp_features.bpf.o +tracing_multi.skel.h-deps := tracing_multi_attach.bpf.o tracing_multi_check.bpf.o LINKED_BPF_OBJS := $(foreach skel,$(LINKED_SKELS),$($(skel)-deps)) LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(LINKED_BPF_OBJS))
tools/testing/selftests/bpf/prog_tests/tracing_multi.c new file +245 -0
245 lines not on this page · raw message
tools/testing/selftests/bpf/progs/tracing_multi_attach.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +__hidden extern void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return); + +__u64 test_result_fentry =0 ; +__u64 test_result_fexit =0 ; + +SEC("fentry.multi/bpf_fentry_test*") +int BPF_PROG (test_fentry ) +{ +tracing_multi_arg_check (ctx, &test_result_fentry, false); +return 0 ; +} + +SEC("fexit.multi/bpf_fentry_test*") +int BPF_PROG (test_fexit ) +{ +tracing_multi_arg_check (ctx, &test_result_fexit, true); +return 0 ; +} + +SEC("fentry.multi.s/bpf_fentry_test1") +int BPF_PROG (test_fentry_s ) +{ +tracing_multi_arg_check (ctx, &test_result_fentry, false); +return 0 ; +} + +SEC("fexit.multi.s/bpf_fentry_test1") +int BPF_PROG (test_fexit_s ) +{ +tracing_multi_arg_check (ctx, &test_result_fexit, true); +return 0 ; +}
tools/testing/selftests/bpf/progs/tracing_multi_check.c new file +150 -0
150 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 17/24] selftests/bpf: Add tracing multi skel/pattern/ids attach tests
Quoted 80 lines · Jiri Olsa
Adding tests for
tracing_multilink attachment via all possible libbpf apis - skeleton, function pattern and btf ids.Signed-off-by Jiri Olsa <[email protected]>--- tools/testing/selftests/bpf/Makefile | 3 +- .../selftests/bpf/prog_tests/tracing_multi.c | 245 ++++++++++++++++++ .../bpf/progs/tracing_multi_attach.c | 40 +++ .../selftests/bpf/progs/tracing_multi_check.c | 150 +++++++++++ 4 files changed, 437 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/tracing_multi.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_attach.c create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_check.ctools/testing/selftests/bpf/Makefile +2
-1@@ -485,7 +485,7 @@ SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ linked_vars.skel.h linked_maps.skel.h \ test_subskeleton.skel.h test_subskeleton_lib.skel.h \ - test_usdt.skel.h + test_usdt.skel.h tracing_multi.skel.h LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c \ core_kern.c core_kern_overflow.c test_ringbuf.c \@@ -511,6 +511,7 @@ test_usdt.skel.h-deps := test_usdt.bpf.o test_usdt_multispec.bpf.o xsk_xdp_progs.skel.h-deps := xsk_xdp_progs.bpf.o xdp_hw_metadata.skel.h-deps := xdp_hw_metadata.bpf.o xdp_features.skel.h-deps := xdp_features.bpf.o +tracing_multi.skel.h-deps := tracing_multi_attach.bpf.o tracing_multi_check.bpf.o LINKED_BPF_OBJS := $(foreach skel,$(LINKED_SKELS),$($(skel)-deps)) LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(LINKED_BPF_OBJS))tools/testing/selftests/bpf/prog_tests/tracing_multi.c new file +39
-0@@ -0,0 +1,245 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <test_progs.h> +#include <bpf/btf.h> +#include <search.h> +#include "bpf/libbpf_internal.h" +#include "tracing_multi.skel.h" +#include "trace_helpers.h" + +static const char *const bpf_fentry_test[] = { +"bpf_fentry_test1" , +"bpf_fentry_test2" , +"bpf_fentry_test3" , +"bpf_fentry_test4" , +"bpf_fentry_test5" , +"bpf_fentry_test6" , +"bpf_fentry_test7" , +"bpf_fentry_test8" , +"bpf_fentry_test9" , +"bpf_fentry_test10" , +}; + +#define FUNCS_CNT (ARRAY_SIZE(bpf_fentry_test)) + +static int compare (const void *ppa,const void *ppb) +{ +const char *pa = *(const char **) ppa; +const char *pb = *(const char **) ppb; + +return strcmp (pa, pb); +} + +static __u32 *get_ids (const char *const funcs[],int funcs_cnt,const char *mod) +{ +struct btf *btf, *vmlinux_btf; +__u32 nr, type_id, cnt =0 ; +void *root =NULL ; +__u32 *ids =NULL ; +int i, err =0 ;
tools/testing/selftests/bpf/prog_tests/tracing_multi.c line 49
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c new file +10
-0+ + btf =btf__load_vmlinux_btf (); +if (!ASSERT_OK_PTR (btf,"btf__load_vmlinux_btf" )) +return NULL ; + +if (mod) { + vmlinux_btf = btf; + btf =btf__load_module_btf (mod, vmlinux_btf); +if (!ASSERT_OK_PTR (btf,"btf__load_module_btf" )) +return NULL ;
^ vmlinux_btf does not get released.
tools/testing/selftests/bpf/prog_tests/tracing_multi.c line 61
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c new file +12
-0+ } + + ids =calloc (funcs_cnt,sizeof (ids[0 ])); +if (!ids) + goto out; + +/* +* We sort function names by name and search them +* below for each function. +*/ +for (i =0 ; i < funcs_cnt; i++) +tsearch (&funcs[i], &root, compare);
^ tdestroy() is missing to free tree nodes?
Thanks,
Leon
[...]
Re: [PATCHv3 bpf-next 17/24] selftests/bpf: Add tracing multi skel/pattern/ids attach tests
On Tue, Mar 17, 2026 at 11:04:57AM +0800, Leon Hwang wrote:
SNIP
Quoted 10 lines
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c new file +10
-0+static __u32 *get_ids (const char *const funcs[],int funcs_cnt,const char *mod) +{ +struct btf *btf, *vmlinux_btf; +__u32 nr, type_id, cnt =0 ; +void *root =NULL ; +__u32 *ids =NULL ; +int i, err =0 ; + + btf =btf__load_vmlinux_btf (); +if (!ASSERT_OK_PTR (btf,"btf__load_vmlinux_btf" ))
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c line 49
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c new file +7
-0+return NULL ; + +if (mod) { + vmlinux_btf = btf; + btf =btf__load_module_btf (mod, vmlinux_btf); +if (!ASSERT_OK_PTR (btf,"btf__load_module_btf" )) +return NULL ;^
vmlinux_btfdoes not get released.
right, needs to be 'goto out'
Quoted 14 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c line 61
Quoted 13 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c new file +12
-0+ } + + ids =calloc (funcs_cnt,sizeof (ids[0 ])); +if (!ids) + goto out; + +/* +* We sort function names by name and search them +* below for each function. +*/ +for (i =0 ; i < funcs_cnt; i++) +tsearch (&funcs[i], &root, compare);^
tdestroy()is missing to free tree nodes?
right, will add, thanks
jirka
Jiri Olsa
reviewerPATCH v3 18/24 selftests/bpf: Add tracing multi skel/pattern/ids module attach tests
In reply to Jiri OlsaAdding tests for tracing_multi link attachment via all possible libbpf apis - skeleton, function pattern and btf ids on top of bpf_testmod kernel module.
--- tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/prog_tests/tracing_multi.c | 105 ++++++++++++++++++ .../bpf/progs/tracing_multi_attach_module.c | 26 +++++ .../selftests/bpf/progs/tracing_multi_check.c | 50 +++++++++ 4 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_attach_module.c
tools/testing/selftests/bpf/Makefile +3 -1
@@ -485,7 +485,8 @@ SKEL_BLACKLIST := btf__% test_pinning_invalid.c test_sk_assign.c LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ linked_vars.skel.h linked_maps.skel.h \ test_subskeleton.skel.h test_subskeleton_lib.skel.h \ - test_usdt.skel.h tracing_multi.skel.h + test_usdt.skel.h tracing_multi.skel.h \ + tracing_multi_module.skel.h LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c \ core_kern.c core_kern_overflow.c test_ringbuf.c \
@@ -512,6 +513,7 @@ xsk_xdp_progs.skel.h-deps := xsk_xdp_progs.bpf.o xdp_hw_metadata.skel.h-deps := xdp_hw_metadata.bpf.o xdp_features.skel.h-deps := xdp_features.bpf.o tracing_multi.skel.h-deps := tracing_multi_attach.bpf.o tracing_multi_check.bpf.o +tracing_multi_module.skel.h-deps := tracing_multi_attach_module.bpf.o tracing_multi_check.bpf.o LINKED_BPF_OBJS := $(foreach skel,$(LINKED_SKELS),$($(skel)-deps)) LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(LINKED_BPF_OBJS))
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +105 -0
127 lines not on this page · raw message
tools/testing/selftests/bpf/progs/tracing_multi_attach_module.c new file +26 -0
@@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +__hidden extern void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return); + +__u64 test_result_fentry =0 ; +__u64 test_result_fexit =0 ; + +SEC("fentry.multi/bpf_testmod:bpf_testmod_fentry_test*") +int BPF_PROG (test_fentry ) +{ +tracing_multi_arg_check (ctx, &test_result_fentry, false); +return 0 ; +} + +SEC("fexit.multi/bpf_testmod:bpf_testmod_fentry_test*") +int BPF_PROG (test_fexit ) +{ +tracing_multi_arg_check (ctx, &test_result_fexit, true); +return 0 ; +}
tools/testing/selftests/bpf/progs/tracing_multi_check.c +50 -0
61 lines not on this page · raw message
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 19/24 selftests/bpf: Add tracing multi intersect tests
In reply to Jiri OlsaAdding tracing multi tests for intersecting attached functions.
Using bits from (from 1 to 16 values) to specify (up to 4) attached programs, and randomly choosing bpf_fentry_test* functions they are attached to.
--- tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/prog_tests/tracing_multi.c | 99 +++++++++++++++++++ .../progs/tracing_multi_intersect_attach.c | 42 ++++++++ 3 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c
tools/testing/selftests/bpf/Makefile +3 -1
@@ -486,7 +486,8 @@ LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ linked_vars.skel.h linked_maps.skel.h \ test_subskeleton.skel.h test_subskeleton_lib.skel.h \ test_usdt.skel.h tracing_multi.skel.h \ - tracing_multi_module.skel.h + tracing_multi_module.skel.h \ + tracing_multi_intersect.skel.h LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c \ core_kern.c core_kern_overflow.c test_ringbuf.c \
@@ -514,6 +515,7 @@ xdp_hw_metadata.skel.h-deps := xdp_hw_metadata.bpf.o xdp_features.skel.h-deps := xdp_features.bpf.o tracing_multi.skel.h-deps := tracing_multi_attach.bpf.o tracing_multi_check.bpf.o tracing_multi_module.skel.h-deps := tracing_multi_attach_module.bpf.o tracing_multi_check.bpf.o +tracing_multi_intersect.skel.h-deps := tracing_multi_intersect_attach.bpf.o tracing_multi_check.bpf.o LINKED_BPF_OBJS := $(foreach skel,$(LINKED_SKELS),$($(skel)-deps)) LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(LINKED_BPF_OBJS))
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +99 -0
121 lines not on this page · raw message
tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 19/24] selftests/bpf: Add tracing multi intersect tests
Quoted 49 lines · Jiri Olsa
Adding tracing multi tests for intersecting attached functions.
Using bits from (from 1 to 16 values) to specify (up to 4) attached programs, and randomly choosing bpf_fentry_test* functions they are attached to.
Signed-off-by Jiri Olsa <[email protected]>--- tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/prog_tests/tracing_multi.c | 99 +++++++++++++++++++ .../progs/tracing_multi_intersect_attach.c | 42 ++++++++ 3 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.ctools/testing/selftests/bpf/Makefile +3
-1@@ -486,7 +486,8 @@ LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ linked_vars.skel.h linked_maps.skel.h \ test_subskeleton.skel.h test_subskeleton_lib.skel.h \ test_usdt.skel.h tracing_multi.skel.h \ - tracing_multi_module.skel.h + tracing_multi_module.skel.h \ + tracing_multi_intersect.skel.h LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c \ core_kern.c core_kern_overflow.c test_ringbuf.c \@@ -514,6 +515,7 @@ xdp_hw_metadata.skel.h-deps := xdp_hw_metadata.bpf.o xdp_features.skel.h-deps := xdp_features.bpf.o tracing_multi.skel.h-deps := tracing_multi_attach.bpf.o tracing_multi_check.bpf.o tracing_multi_module.skel.h-deps := tracing_multi_attach_module.bpf.o tracing_multi_check.bpf.o +tracing_multi_intersect.skel.h-deps := tracing_multi_intersect_attach.bpf.o tracing_multi_check.bpf.o LINKED_BPF_OBJS := $(foreach skel,$(LINKED_SKELS),$($(skel)-deps)) LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(LINKED_BPF_OBJS))tools/testing/selftests/bpf/prog_tests/tracing_multi.c +1
-0@@ -6,6 +6,7 @@#include "bpf/libbpf_internal.h" #include "tracing_multi.skel.h" #include "tracing_multi_module.skel.h" +#include "tracing_multi_intersect.skel.h" #include "trace_helpers.h" static const char *const bpf_fentry_test[] = {
tools/testing/selftests/bpf/prog_tests/tracing_multi.c static const char * const bpf_testmod_fentry_test[] = { · line 40
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +6
-0@@ -31,6 +32,20 @@ static const char * const bpf_testmod_fentry_test[] = {#define FUNCS_CNT (ARRAY_SIZE(bpf_fentry_test)) +static int get_random_funcs (const char **funcs) +{ +int i, cnt =0 ; + +for (i =0 ; i <FUNCS_CNT ; i++) { +if (rand () %2 )
^ srand() is missing for rand() ?
Quoted 113 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +92
-0+ funcs[cnt++] = bpf_fentry_test[i]; + } +/* we always need at least one.. */ +if (!cnt) + funcs[cnt++] = bpf_fentry_test[rand () %FUNCS_CNT ]; +return cnt; +} +static int compare (const void *ppa,const void *ppb) {const char *pa = *(const char **) ppa;@@ -328,6 +343,88 @@ static void test_module_link_api_ids(void)free (ids); } +static bool is_set (__u32 mask,__u32 bit) +{ +return (1 << bit) & mask; +} + +static void __test_intersect (__u32 mask,const struct bpf_program *progs[4 ],__u64 *test_results[4 ]) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +LIBBPF_OPTS (bpf_test_run_opts, topts); +struct bpf_link *links[4 ] = {NULL }; +const char *funcs[FUNCS_CNT ]; +__u64 expected[4 ]; +__u32 *ids, i; +int err, cnt; + +/* +* We have 4 programs in progs and the mask bits pick which +* of them gets attached to randomly chosen functions. +*/ +for (i =0 ; i <4 ; i++) { +if (!is_set (mask, i)) +continue ; + + cnt =get_random_funcs (funcs); + ids =get_ids (funcs, cnt,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" )) + goto cleanup; + + opts.ids = ids; + opts.cnt = cnt; + links[i] =bpf_program__attach_tracing_multi (progs[i],NULL , &opts); +free (ids); + +if (!ASSERT_OK_PTR (links[i],"bpf_program__attach_tracing_multi" )) + goto cleanup; + + expected[i] = *test_results[i] + cnt; + } + + err =bpf_prog_test_run_opts (bpf_program__fd (progs[0 ]), &topts); +ASSERT_OK (err,"test_run" ); + +for (i =0 ; i <4 ; i++) { +if (!is_set (mask, i)) +continue ; +ASSERT_EQ (*test_results[i], expected[i],"test_results" ); + } + +cleanup: +for (i =0 ; i <4 ; i++) +bpf_link__destroy (links[i]); +} + +static void test_intersect (void ) +{ +struct tracing_multi_intersect *skel; +const struct bpf_program *progs[4 ]; +__u64 *test_results[4 ]; +__u32 i; + + skel =tracing_multi_intersect__open_and_load (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_intersect__open_and_load" )) +return ; + + skel->bss->pid =getpid (); + + progs[0 ] = skel->progs.fentry_1; + progs[1 ] = skel->progs.fexit_1; + progs[2 ] = skel->progs.fentry_2; + progs[3 ] = skel->progs.fexit_2; + + test_results[0 ] = &skel->bss->test_result_fentry_1; + test_results[1 ] = &skel->bss->test_result_fexit_1; + test_results[2 ] = &skel->bss->test_result_fentry_2; + test_results[3 ] = &skel->bss->test_result_fexit_2; + +for (i =1 ; i <16 ; i++) +__test_intersect (i, progs, test_results); + +tracing_multi_intersect__destroy (skel); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__@@ -347,4 +444,6 @@ void test_tracing_multi_test(void)test_module_link_api_pattern ();if (test__start_subtest ("module_link_api_ids" ))test_module_link_api_ids (); +if (test__start_subtest ("intersect" )) +test_intersect (); }tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c new file +0
-0
tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c line 3
Quoted 3 lines
tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c new file +3
-0@@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h>
NIT: ^ vmlinux.h is better than stdbool.h + bpf.h.
Thanks,
Leon
Quoted 39 lines
tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c new file +39
-0+#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +__hidden extern void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return); + +__u64 test_result_fentry_1 =0 ; +__u64 test_result_fentry_2 =0 ; +__u64 test_result_fexit_1 =0 ; +__u64 test_result_fexit_2 =0 ; + +SEC("fentry.multi") +int BPF_PROG (fentry_1 ) +{ +tracing_multi_arg_check (ctx, &test_result_fentry_1, false); +return 0 ; +} + +SEC("fentry.multi") +int BPF_PROG (fentry_2 ) +{ +tracing_multi_arg_check (ctx, &test_result_fentry_2, false); +return 0 ; +} + +SEC("fexit.multi") +int BPF_PROG (fexit_1 ) +{ +tracing_multi_arg_check (ctx, &test_result_fexit_1, true); +return 0 ; +} + +SEC("fexit.multi") +int BPF_PROG (fexit_2 ) +{ +tracing_multi_arg_check (ctx, &test_result_fexit_2, true); +return 0 ; +}
Re: [PATCHv3 bpf-next 19/24] selftests/bpf: Add tracing multi intersect tests
On Tue, Mar 17, 2026 at 11:05:29AM +0800, Leon Hwang wrote:
SNIP
Quoted 16 lines
Quoted 16 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +1
-0@@ -6,6 +6,7 @@#include "bpf/libbpf_internal.h" #include "tracing_multi.skel.h" #include "tracing_multi_module.skel.h" +#include "tracing_multi_intersect.skel.h" #include "trace_helpers.h" static const char *const bpf_fentry_test[] = {@@ -31,6 +32,20 @@ static const char * const bpf_testmod_fentry_test[] = {#define FUNCS_CNT (ARRAY_SIZE(bpf_fentry_test))
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c static const char * const bpf_testmod_fentry_test[] = { · line 40
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +6
-0+static int get_random_funcs (const char **funcs) +{ +int i, cnt =0 ; + +for (i =0 ; i <FUNCS_CNT ; i++) { +if (rand () %2 )^
srand()is missing forrand()?
it's in test_progs main
Quoted 41 lines
Quoted 41 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +31
-0+static void test_intersect (void ) +{ +struct tracing_multi_intersect *skel; +const struct bpf_program *progs[4 ]; +__u64 *test_results[4 ]; +__u32 i; + + skel =tracing_multi_intersect__open_and_load (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_intersect__open_and_load" )) +return ; + + skel->bss->pid =getpid (); + + progs[0 ] = skel->progs.fentry_1; + progs[1 ] = skel->progs.fexit_1; + progs[2 ] = skel->progs.fentry_2; + progs[3 ] = skel->progs.fexit_2; + + test_results[0 ] = &skel->bss->test_result_fentry_1; + test_results[1 ] = &skel->bss->test_result_fexit_1; + test_results[2 ] = &skel->bss->test_result_fentry_2; + test_results[3 ] = &skel->bss->test_result_fexit_2; + +for (i =1 ; i <16 ; i++) +__test_intersect (i, progs, test_results); + +tracing_multi_intersect__destroy (skel); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__@@ -347,4 +444,6 @@ void test_tracing_multi_test(void)test_module_link_api_pattern ();if (test__start_subtest ("module_link_api_ids" ))test_module_link_api_ids (); +if (test__start_subtest ("intersect" )) +test_intersect (); }tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c new file +0
-0
Quoted 8 lines
tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c line 3
Quoted 7 lines
index 000000000000..b8aecbf44093
tools/testing/selftests/bpf/progs/tracing_multi_intersect_attach.c new file +3
-0@@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> NIT: ^
vmlinux.his better thanstdbool.h+bpf.h.
ok, thanks
jirka
Jiri Olsa
reviewerPATCH v3 20/24 selftests/bpf: Add tracing multi cookies test
In reply to Jiri OlsaAdding tests for using cookies on tracing multi link.
--- .../selftests/bpf/prog_tests/tracing_multi.c | 23 +++++++++++++++++-- .../selftests/bpf/progs/tracing_multi_check.c | 15 +++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-)
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +21 -2
@@ -9,6 +9,19 @@#include "tracing_multi_intersect.skel.h" #include "trace_helpers.h" +static __u64 bpf_fentry_test_cookies[] = { +8 ,/* bpf_fentry_test1 */ +9 ,/* bpf_fentry_test2 */ +7 ,/* bpf_fentry_test3 */ +5 ,/* bpf_fentry_test4 */ +4 ,/* bpf_fentry_test5 */ +2 ,/* bpf_fentry_test6 */ +3 ,/* bpf_fentry_test7 */ +1 ,/* bpf_fentry_test8 */ +10 ,/* bpf_fentry_test9 */ +6 ,/* bpf_fentry_test10 */ +}; +static const char *const bpf_fentry_test[] = {"bpf_fentry_test1" ,"bpf_fentry_test2" ,
@@ -204,7 +217,7 @@ static void test_link_api_pattern(void)tracing_multi__destroy (skel); } -static void test_link_api_ids (void ) +static void test_link_api_ids (bool test_cookies) {LIBBPF_OPTS (bpf_tracing_multi_opts, opts);struct tracing_multi *skel;
@@ -216,6 +229,7 @@ static void test_link_api_ids(void)return ; skel->bss->pid =getpid (); + skel->bss->test_cookies = test_cookies; ids =get_ids (bpf_fentry_test, cnt,NULL );if (!ASSERT_OK_PTR (ids,"get_ids" ))
@@ -224,6 +238,9 @@ static void test_link_api_ids(void) opts.ids = ids; opts.cnt = cnt; +if (test_cookies) + opts.cookies = bpf_fentry_test_cookies; + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry,NULL , &opts);if (!ASSERT_OK_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" ))
@@ -437,7 +454,7 @@ void test_tracing_multi_test(void)if (test__start_subtest ("link_api_pattern" ))test_link_api_pattern ();if (test__start_subtest ("link_api_ids" )) -test_link_api_ids (); +test_link_api_ids (false);if (test__start_subtest ("module_skel_api" ))test_module_skel_api ();if (test__start_subtest ("module_link_api_pattern" ))
@@ -446,4 +463,6 @@ void test_tracing_multi_test(void)test_module_link_api_ids ();if (test__start_subtest ("intersect" ))test_intersect (); +if (test__start_subtest ("cookies" )) +test_link_api_ids (true); }
tools/testing/selftests/bpf/progs/tracing_multi_check.c +14 -1
@@ -7,6 +7,7 @@ char _license[] SEC("license") = "GPL";int pid =0 ; +bool test_cookies = false; extern const void bpf_fentry_test1 __ksym; extern const void bpf_fentry_test2 __ksym;
@@ -28,7 +29,7 @@ extern const void bpf_testmod_fentry_test11 __ksym;void tracing_multi_arg_check (__u64 *ctx,__u64 *test_result,bool is_return) {void *ip = (void *)bpf_get_func_ip (ctx); -__u64 value =0 , ret =0 ; +__u64 value =0 , ret =0 , cookie =0 ;long err =0 ;if (bpf_get_current_pid_tgid () >>32 != pid)
@@ -36,6 +37,8 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return)if (is_return) err |=bpf_get_func_ret (ctx, &ret); +if (test_cookies) + cookie = test_cookies ?bpf_get_attach_cookie (ctx) :0 ;if (ip == &bpf_fentry_test1) {int a;
@@ -44,6 +47,7 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return) a = (int ) value; err |= is_return ? ret !=2 :0 ; + err |= test_cookies ? cookie !=8 :0 ; *test_result += err ==0 && a ==1 ; }else if (ip == &bpf_fentry_test2) {
@@ -56,6 +60,7 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return) b = value; err |= is_return ? ret !=5 :0 ; + err |= test_cookies ? cookie !=9 :0 ; *test_result += err ==0 && a ==2 && b ==3 ; }else if (ip == &bpf_fentry_test3) {
@@ -71,6 +76,7 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return) c = value; err |= is_return ? ret !=15 :0 ; + err |= test_cookies ? cookie !=7 :0 ; *test_result += err ==0 && a ==4 && b ==5 && c ==6 ; }else if (ip == &bpf_fentry_test4) {
@@ -89,6 +95,7 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return) d = value; err |= is_return ? ret !=34 :0 ; + err |= test_cookies ? cookie !=5 :0 ; *test_result += err ==0 && a == (void *)7 && b ==8 && c ==9 && d ==10 ; }else if (ip == &bpf_fentry_test5) {
@@ -110,6 +117,7 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return) e = value; err |= is_return ? ret !=65 :0 ; + err |= test_cookies ? cookie !=4 :0 ; *test_result += err ==0 && a ==11 && b == (void *)12 && c ==13 && d ==14 && e ==15 ; }else if (ip == &bpf_fentry_test6) {
@@ -134,22 +142,27 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return) f = value; err |= is_return ? ret !=111 :0 ; + err |= test_cookies ? cookie !=2 :0 ; *test_result += err ==0 && a ==16 && b == (void *)17 && c ==18 && d ==19 && e == (void *)20 && f ==21 ; }else if (ip == &bpf_fentry_test7) { err |= is_return ? ret !=0 :0 ; + err |= test_cookies ? cookie !=3 :0 ; *test_result += err ==0 ?1 :0 ; }else if (ip == &bpf_fentry_test8) { err |= is_return ? ret !=0 :0 ; + err |= test_cookies ? cookie !=1 :0 ; *test_result += err ==0 ?1 :0 ; }else if (ip == &bpf_fentry_test9) { err |= is_return ? ret !=0 :0 ; + err |= test_cookies ? cookie !=10 :0 ; *test_result += err ==0 ?1 :0 ; }else if (ip == &bpf_fentry_test10) { err |= is_return ? ret !=0 :0 ; + err |= test_cookies ? cookie !=6 :0 ; *test_result += err ==0 ?1 :0 ; }else if (ip == &bpf_testmod_fentry_test1) {
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 20/24] selftests/bpf: Add tracing multi cookies test
Quoted 97 lines · Jiri Olsa
Adding tests for using cookies on tracing multi link.
Signed-off-by Jiri Olsa <[email protected]>--- .../selftests/bpf/prog_tests/tracing_multi.c | 23 +++++++++++++++++-- .../selftests/bpf/progs/tracing_multi_check.c | 15 +++++++++++- 2 files changed, 35 insertions(+), 3 deletions(-)tools/testing/selftests/bpf/prog_tests/tracing_multi.c +21
-2@@ -9,6 +9,19 @@#include "tracing_multi_intersect.skel.h" #include "trace_helpers.h" +static __u64 bpf_fentry_test_cookies[] = { +8 ,/* bpf_fentry_test1 */ +9 ,/* bpf_fentry_test2 */ +7 ,/* bpf_fentry_test3 */ +5 ,/* bpf_fentry_test4 */ +4 ,/* bpf_fentry_test5 */ +2 ,/* bpf_fentry_test6 */ +3 ,/* bpf_fentry_test7 */ +1 ,/* bpf_fentry_test8 */ +10 ,/* bpf_fentry_test9 */ +6 ,/* bpf_fentry_test10 */ +}; +static const char *const bpf_fentry_test[] = {"bpf_fentry_test1" ,"bpf_fentry_test2" ,@@ -204,7 +217,7 @@ static void test_link_api_pattern(void)tracing_multi__destroy (skel); } -static void test_link_api_ids (void ) +static void test_link_api_ids (bool test_cookies) {LIBBPF_OPTS (bpf_tracing_multi_opts, opts);struct tracing_multi *skel;@@ -216,6 +229,7 @@ static void test_link_api_ids(void)return ; skel->bss->pid =getpid (); + skel->bss->test_cookies = test_cookies; ids =get_ids (bpf_fentry_test, cnt,NULL );if (!ASSERT_OK_PTR (ids,"get_ids" ))@@ -224,6 +238,9 @@ static void test_link_api_ids(void) opts.ids = ids; opts.cnt = cnt; +if (test_cookies) + opts.cookies = bpf_fentry_test_cookies; + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry,NULL , &opts);if (!ASSERT_OK_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" ))@@ -437,7 +454,7 @@ void test_tracing_multi_test(void)if (test__start_subtest ("link_api_pattern" ))test_link_api_pattern ();if (test__start_subtest ("link_api_ids" )) -test_link_api_ids (); +test_link_api_ids (false);if (test__start_subtest ("module_skel_api" ))test_module_skel_api ();if (test__start_subtest ("module_link_api_pattern" ))@@ -446,4 +463,6 @@ void test_tracing_multi_test(void)test_module_link_api_ids ();if (test__start_subtest ("intersect" ))test_intersect (); +if (test__start_subtest ("cookies" )) +test_link_api_ids (true); }tools/testing/selftests/bpf/progs/tracing_multi_check.c +2
-1@@ -7,6 +7,7 @@ char _license[] SEC("license") = "GPL";int pid =0 ; +bool test_cookies = false; extern const void bpf_fentry_test1 __ksym; extern const void bpf_fentry_test2 __ksym;@@ -28,7 +29,7 @@ extern const void bpf_testmod_fentry_test11 __ksym;void tracing_multi_arg_check (__u64 *ctx,__u64 *test_result,bool is_return) {void *ip = (void *)bpf_get_func_ip (ctx); -__u64 value =0 , ret =0 ; +__u64 value =0 , ret =0 , cookie =0 ;long err =0 ;if (bpf_get_current_pid_tgid () >>32 != pid)
tools/testing/selftests/bpf/progs/tracing_multi_check.c void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return) · line 41
Quoted 5 lines
tools/testing/selftests/bpf/progs/tracing_multi_check.c +2
-0@@ -36,6 +37,8 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return)if (is_return) err |=bpf_get_func_ret (ctx, &ret); +if (test_cookies) + cookie = test_cookies ?bpf_get_attach_cookie (ctx) :0 ;
^ dup test_cookies check ? Can drop this one.
Thanks,
Leon
[...]
Re: [PATCHv3 bpf-next 20/24] selftests/bpf: Add tracing multi cookies test
On Tue, Mar 17, 2026 at 11:06:25AM +0800, Leon Hwang wrote:
SNIP
Quoted 20 lines
Quoted 20 lines
tools/testing/selftests/bpf/progs/tracing_multi_check.c +2
-1@@ -7,6 +7,7 @@ char _license[] SEC("license") = "GPL";int pid =0 ; +bool test_cookies = false; extern const void bpf_fentry_test1 __ksym; extern const void bpf_fentry_test2 __ksym;@@ -28,7 +29,7 @@ extern const void bpf_testmod_fentry_test11 __ksym;void tracing_multi_arg_check (__u64 *ctx,__u64 *test_result,bool is_return) {void *ip = (void *)bpf_get_func_ip (ctx); -__u64 value =0 , ret =0 ; +__u64 value =0 , ret =0 , cookie =0 ;long err =0 ;
Quoted 8 lines
tools/testing/selftests/bpf/progs/tracing_multi_check.c void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return) · line 41
Quoted 7 lines
tools/testing/selftests/bpf/progs/tracing_multi_check.c +2
-0if (bpf_get_current_pid_tgid () >>32 != pid)@@ -36,6 +37,8 @@ void tracing_multi_arg_check(__u64 *ctx, __u64 *test_result, bool is_return)if (is_return) err |=bpf_get_func_ret (ctx, &ret); +if (test_cookies) + cookie = test_cookies ?bpf_get_attach_cookie (ctx) :0 ;^ dup
test_cookiescheck ? Can drop this one.
heh nice, yea, thanks
jirka
Jiri Olsa
reviewerPATCH v3 21/24 selftests/bpf: Add tracing multi session test
In reply to Jiri OlsaAdding tests for tracing multi link session.
--- tools/testing/selftests/bpf/Makefile | 4 +- .../selftests/bpf/prog_tests/tracing_multi.c | 40 +++++++++++++++++ .../bpf/progs/tracing_multi_session_attach.c | 43 +++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_session_attach.c
tools/testing/selftests/bpf/Makefile +3 -1
@@ -487,7 +487,8 @@ LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \ test_subskeleton.skel.h test_subskeleton_lib.skel.h \ test_usdt.skel.h tracing_multi.skel.h \ tracing_multi_module.skel.h \ - tracing_multi_intersect.skel.h + tracing_multi_intersect.skel.h \ + tracing_multi_session.skel.h LSKELS := fexit_sleep.c trace_printk.c trace_vprintk.c map_ptr_kern.c \ core_kern.c core_kern_overflow.c test_ringbuf.c \
@@ -516,6 +517,7 @@ xdp_features.skel.h-deps := xdp_features.bpf.o tracing_multi.skel.h-deps := tracing_multi_attach.bpf.o tracing_multi_check.bpf.o tracing_multi_module.skel.h-deps := tracing_multi_attach_module.bpf.o tracing_multi_check.bpf.o tracing_multi_intersect.skel.h-deps := tracing_multi_intersect_attach.bpf.o tracing_multi_check.bpf.o +tracing_multi_session.skel.h-deps := tracing_multi_session_attach.bpf.o tracing_multi_check.bpf.o LINKED_BPF_OBJS := $(foreach skel,$(LINKED_SKELS),$($(skel)-deps)) LINKED_BPF_SRCS := $(patsubst %.bpf.o,%.c,$(LINKED_BPF_OBJS))
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +40 -0
@@ -7,6 +7,7 @@#include "tracing_multi.skel.h" #include "tracing_multi_module.skel.h" #include "tracing_multi_intersect.skel.h" +#include "tracing_multi_session.skel.h" #include "trace_helpers.h" static __u64 bpf_fentry_test_cookies[] = {
@@ -442,6 +443,43 @@ static void test_intersect(void)tracing_multi_intersect__destroy (skel); } +static void test_session (void ) +{ +LIBBPF_OPTS (bpf_test_run_opts, topts); +struct tracing_multi_session *skel; +int err, prog_fd; + + skel =tracing_multi_session__open_and_load (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_session__open_and_load" )) +return ; + + skel->bss->pid =getpid (); + + err =tracing_multi_session__attach (skel); +if (!ASSERT_OK (err,"tracing_multi_session__attach" )) + goto cleanup; + +/* execute kernel session */ + prog_fd =bpf_program__fd (skel->progs.test_session_1); + err =bpf_prog_test_run_opts (prog_fd, &topts); +ASSERT_OK (err,"test_run" ); + +ASSERT_EQ (skel->bss->test_result_fentry,10 ,"test_result_fentry" ); +/* extra count (+1 for each fexit execution) for test_result_fexit cookie */ +ASSERT_EQ (skel->bss->test_result_fexit,20 ,"test_result_fexit" ); + +/* execute bpf_testmo.ko session */ +ASSERT_OK (trigger_module_test_read (1 ),"trigger_read" ); + +ASSERT_EQ (skel->bss->test_result_fentry,15 ,"test_result_fentry" ); +/* extra count (+1 for each fexit execution) for test_result_fexit cookie */ +ASSERT_EQ (skel->bss->test_result_fexit,30 ,"test_result_fexit" ); + + +cleanup: +tracing_multi_session__destroy (skel); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__
@@ -465,4 +503,6 @@ void test_tracing_multi_test(void)test_intersect ();if (test__start_subtest ("cookies" ))test_link_api_ids (true); +if (test__start_subtest ("session" )) +test_session (); }
tools/testing/selftests/bpf/progs/tracing_multi_session_attach.c new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 22/24 selftests/bpf: Add tracing multi attach fails test
In reply to Jiri OlsaAdding tests for attach fails on tracing multi link.
--- .../selftests/bpf/prog_tests/tracing_multi.c | 74 +++++++++++++++++++ .../selftests/bpf/progs/tracing_multi_fail.c | 19 +++++ 2 files changed, 93 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_fail.c
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +74 -0
@@ -8,6 +8,7 @@#include "tracing_multi_module.skel.h" #include "tracing_multi_intersect.skel.h" #include "tracing_multi_session.skel.h" +#include "tracing_multi_fail.skel.h" #include "trace_helpers.h" static __u64 bpf_fentry_test_cookies[] = {
@@ -480,6 +481,77 @@ static void test_session(void)tracing_multi_session__destroy (skel); } +static void test_attach_api_fails (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +static const char *const func[] = { +"bpf_fentry_test2" , + }; +struct tracing_multi_fail *skel =NULL ; +__u32 ids[2 ], *ids2; +__u64 cookies[2 ]; + + skel =tracing_multi_fail__open_and_load (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_fail__open_and_load" )) +return ; + +/* fail#1 pattern and opts NULL */ + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL ,NULL ); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#2 pattern and ids */ + opts.ids = ids; + opts.cnt =2 ; + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +"bpf_fentry_test*" , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#3 pattern and cookies */ + opts.ids =NULL ; + opts.cnt =2 ; + opts.cookies = cookies; + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +"bpf_fentry_test*" , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#4 bogus pattern */ + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +"bpf_not_really_a_function*" ,NULL ); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#5 abnormal cnt */ + opts.ids = ids; + opts.cnt =INT_MAX ; + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#6 attach sleepable program to not-allowed function */ + ids2 =get_ids (func,1 ,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" )) + goto cleanup; + + opts.ids = ids2; + opts.cnt =1 ; + + skel->links.test_fentry_s =bpf_program__attach_tracing_multi (skel->progs.test_fentry_s, +NULL , &opts); +ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" ); +free (ids2); + +cleanup: +tracing_multi_fail__destroy (skel); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__
@@ -505,4 +577,6 @@ void test_tracing_multi_test(void)test_link_api_ids (true);if (test__start_subtest ("session" ))test_session (); +if (test__start_subtest ("attach_api_fails" )) +test_attach_api_fails (); }
tools/testing/selftests/bpf/progs/tracing_multi_fail.c new file +19 -0
@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +SEC("fentry.multi") +int BPF_PROG (test_fentry ) +{ +return 0 ; +} + +SEC("fentry.multi.s") +int BPF_PROG (test_fentry_s ) +{ +return 0 ; +}
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 22/24] selftests/bpf: Add tracing multi attach fails test
Quoted 72 lines · Jiri Olsa
Adding tests for attach fails on tracing multi link.
Signed-off-by Jiri Olsa <[email protected]>--- .../selftests/bpf/prog_tests/tracing_multi.c | 74 +++++++++++++++++++ .../selftests/bpf/progs/tracing_multi_fail.c | 19 +++++ 2 files changed, 93 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_fail.ctools/testing/selftests/bpf/prog_tests/tracing_multi.c +48
-0@@ -8,6 +8,7 @@#include "tracing_multi_module.skel.h" #include "tracing_multi_intersect.skel.h" #include "tracing_multi_session.skel.h" +#include "tracing_multi_fail.skel.h" #include "trace_helpers.h" static __u64 bpf_fentry_test_cookies[] = {@@ -480,6 +481,77 @@ static void test_session(void)tracing_multi_session__destroy (skel); } +static void test_attach_api_fails (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +static const char *const func[] = { +"bpf_fentry_test2" , + }; +struct tracing_multi_fail *skel =NULL ; +__u32 ids[2 ], *ids2; +__u64 cookies[2 ]; + + skel =tracing_multi_fail__open_and_load (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_fail__open_and_load" )) +return ; + +/* fail#1 pattern and opts NULL */ + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL ,NULL ); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#2 pattern and ids */ + opts.ids = ids; + opts.cnt =2 ; + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +"bpf_fentry_test*" , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#3 pattern and cookies */ + opts.ids =NULL ; + opts.cnt =2 ; + opts.cookies = cookies; + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +"bpf_fentry_test*" , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#4 bogus pattern */ + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +"bpf_not_really_a_function*" ,NULL ); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#5 abnormal cnt */ + opts.ids = ids;
tools/testing/selftests/bpf/prog_tests/tracing_multi.c static void test_session(void) · line 540
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +10
-0+ opts.cnt =INT_MAX ; + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#6 attach sleepable program to not-allowed function */ + ids2 =get_ids (func,1 ,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" ))
^ ids2 ?
tools/testing/selftests/bpf/prog_tests/tracing_multi.c static void test_session(void) · line 548
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +8
-0+ goto cleanup; + + opts.ids = ids2; + opts.cnt =1 ; + + skel->links.test_fentry_s =bpf_program__attach_tracing_multi (skel->progs.test_fentry_s, +NULL , &opts); +ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" );
^ test_fentry_s ?
Thanks,
Leon
Quoted 41 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +8
-0+free (ids2); + +cleanup: +tracing_multi_fail__destroy (skel); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__@@ -505,4 +577,6 @@ void test_tracing_multi_test(void)test_link_api_ids (true);if (test__start_subtest ("session" ))test_session (); +if (test__start_subtest ("attach_api_fails" )) +test_attach_api_fails (); }tools/testing/selftests/bpf/progs/tracing_multi_fail.c new file +19
-0@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +SEC("fentry.multi") +int BPF_PROG (test_fentry ) +{ +return 0 ; +} + +SEC("fentry.multi.s") +int BPF_PROG (test_fentry_s ) +{ +return 0 ; +}
Re: [PATCHv3 bpf-next 22/24] selftests/bpf: Add tracing multi attach fails test
On Tue, Mar 17, 2026 at 11:06:58AM +0800, Leon Hwang wrote:
SNIP
Quoted 21 lines
Quoted 21 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +21
-0+/* fail#3 pattern and cookies */ + opts.ids =NULL ; + opts.cnt =2 ; + opts.cookies = cookies; + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +"bpf_fentry_test*" , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#4 bogus pattern */ + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +"bpf_not_really_a_function*" ,NULL ); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#5 abnormal cnt */ + opts.ids = ids; + opts.cnt =INT_MAX ; + + skel->links.test_fentry = bpf_program__attach_tracing_multi(skel->progs.test_fentry,
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c static void test_session(void) · line 540
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +7
-0+ NULL, &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* fail#6 attach sleepable program to not-allowed function */ + ids2 =get_ids (func,1 ,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" ))^ ids2 ?
yes
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c static void test_session(void) · line 548
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +8
-0+ goto cleanup; + + opts.ids = ids2; + opts.cnt =1 ; + + skel->links.test_fentry_s =bpf_program__attach_tracing_multi (skel->progs.test_fentry_s, +NULL , &opts); +ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" );^
test_fentry_s?
yes, will fix, thnx
jirka
Jiri Olsa
reviewerPATCH v3 23/24 selftests/bpf: Add tracing multi attach benchmark test
In reply to Jiri OlsaAdding benchmark test that attaches to (almost) all allowed tracing functions and display attach/detach times.
# ./test_progs -t tracing_multi_bench_attach -v bpf_testmod.ko is already unloaded. Loading bpf_testmod.ko... Successfully loaded bpf_testmod.ko. serial_test_tracing_multi_bench_attach:PASS:btf__load_vmlinux_btf 0 nsec serial_test_tracing_multi_bench_attach:PASS:tracing_multi_bench__open_and_load 0 nsec serial_test_tracing_multi_bench_attach:PASS:get_syms 0 nsec serial_test_tracing_multi_bench_attach:PASS:bpf_program__attach_tracing_multi 0 nsec serial_test_tracing_multi_bench_attach: found 51186 functions serial_test_tracing_multi_bench_attach: attached in 1.295s serial_test_tracing_multi_bench_attach: detached in 0.243s #507 tracing_multi_bench_attach:OK Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED Successfully unloaded bpf_testmod.ko.
Exporting skip_entry as is_unsafe_function and usign it in the test.
--- .../selftests/bpf/prog_tests/tracing_multi.c | 97 +++++++++++++++++++ .../selftests/bpf/progs/tracing_multi_bench.c | 13 +++ tools/testing/selftests/bpf/trace_helpers.c | 6 +- tools/testing/selftests/bpf/trace_helpers.h | 1 + 4 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_bench.c
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +97 -0
@@ -9,6 +9,7 @@#include "tracing_multi_intersect.skel.h" #include "tracing_multi_session.skel.h" #include "tracing_multi_fail.skel.h" +#include "tracing_multi_bench.skel.h" #include "trace_helpers.h" static __u64 bpf_fentry_test_cookies[] = {
@@ -552,6 +553,102 @@ static void test_attach_api_fails(void)tracing_multi_fail__destroy (skel); } +void serial_test_tracing_multi_bench_attach (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tracing_multi_bench *skel =NULL ; +long attach_start_ns, attach_end_ns; +long detach_start_ns, detach_end_ns; +double attach_delta, detach_delta; +struct bpf_link *link =NULL ; +size_t i, cap =0 , cnt =0 ; +struct ksyms *ksyms =NULL ; +void *root =NULL ; +__u32 *ids =NULL ; +__u32 nr, type_id; +struct btf *btf; +int err; + +#ifndef __x86_64__ +test__skip (); +return ; +#endif + + btf =btf__load_vmlinux_btf (); +if (!ASSERT_OK_PTR (btf,"btf__load_vmlinux_btf" )) +return ; + + skel =tracing_multi_bench__open_and_load (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_bench__open_and_load" )) + goto cleanup; + +if (!ASSERT_OK (bpf_get_ksyms (&ksyms, true),"get_syms" )) + goto cleanup; + +/* Get all ftrace 'safe' symbols.. */ +for (i =0 ; i < ksyms->filtered_cnt; i++) { +if (is_unsafe_function (ksyms->filtered_syms[i])) +continue ; +tsearch (&ksyms->filtered_syms[i], &root, compare); + } + +/* ..and filter them through BTF and btf_type_is_traceable_func. */ + nr =btf__type_cnt (btf); +for (type_id =1 ; type_id < nr; type_id++) { +const struct btf_type *type; +const char *str; + + type =btf__type_by_id (btf, type_id); +if (!type) +break ; + +if (BTF_INFO_KIND (type->info) !=BTF_KIND_FUNC ) +continue ; + + str =btf__name_by_offset (btf, type->name_off); +if (!str) +break ; + +if (!tfind (&str, &root, compare)) +continue ; + +if (!btf_type_is_traceable_func (btf, type)) +continue ; + + err =libbpf_ensure_mem ((void **) &ids, &cap,sizeof (*ids), cnt +1 ); +if (err) + goto cleanup; + + ids[cnt++] = type_id; + } + + opts.ids = ids; + opts.cnt = cnt; + + attach_start_ns =get_time_ns (); + link =bpf_program__attach_tracing_multi (skel->progs.bench,NULL , &opts); + attach_end_ns =get_time_ns (); + +if (!ASSERT_OK_PTR (link,"bpf_program__attach_tracing_multi" )) + goto cleanup; + + detach_start_ns =get_time_ns (); +bpf_link__destroy (link); + detach_end_ns =get_time_ns (); + + attach_delta = (attach_end_ns - attach_start_ns) /1000000000.0 ; + detach_delta = (detach_end_ns - detach_start_ns) /1000000000.0 ; + +printf ("%s: found %lu functions\n" , __func__, cnt); +printf ("%s: attached in %7.3lfs\n" , __func__, attach_delta); +printf ("%s: detached in %7.3lfs\n" , __func__, detach_delta); + +cleanup: +tracing_multi_bench__destroy (skel); +free_kallsyms_local (ksyms); +free (ids); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__
tools/testing/selftests/bpf/progs/tracing_multi_bench.c new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +SEC("fentry.multi") +int BPF_PROG (bench ) +{ +return 0 ; +}
tools/testing/selftests/bpf/trace_helpers.c +3 -3
@@ -548,7 +548,7 @@ static const char * const trace_blacklist[] = { "bpf_get_numa_node_id", }; -static bool skip_entry (char *name) +bool is_unsafe_function (char *name) {int i;
@@ -651,7 +651,7 @@ int bpf_get_ksyms(struct ksyms **ksymsp, bool kernel)free (name);if (sscanf (buf,"%ms$*[^\n]\n" , &name) !=1 )continue ; -if (skip_entry (name)) +if (is_unsafe_function (name))continue ; ks =search_kallsyms_custom_local (ksyms, name, search_kallsyms_compare);
@@ -728,7 +728,7 @@ int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel)free (name);if (sscanf (buf,"%p %ms$*[^\n]\n" , &addr, &name) !=2 )continue ; -if (skip_entry (name)) +if (is_unsafe_function (name))continue ;if (cnt == max_cnt) {
tools/testing/selftests/bpf/trace_helpers.h +1 -0
@@ -63,4 +63,5 @@ int read_build_id(const char *path, char *build_id, size_t size);int bpf_get_ksyms (struct ksyms **ksymsp,bool kernel);int bpf_get_addrs (unsigned long **addrsp,size_t *cntp,bool kernel); +bool is_unsafe_function (char *name);#endif
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 23/24] selftests/bpf: Add tracing multi attach benchmark test
Quoted 18 lines · Jiri Olsa
Adding benchmark test that attaches to (almost) all allowed tracing functions and display attach/detach times.
# ./test_progs -t tracing_multi_bench_attach -v bpf_testmod.ko is already unloaded. Loading bpf_testmod.ko... Successfully loaded bpf_testmod.ko. serial_test_tracing_multi_bench_attach:PASS:btf__load_vmlinux_btf 0 nsec serial_test_tracing_multi_bench_attach:PASS:tracing_multi_bench__open_and_load 0 nsec serial_test_tracing_multi_bench_attach:PASS:get_syms 0 nsec serial_test_tracing_multi_bench_attach:PASS:bpf_program__attach_tracing_multi 0 nsec serial_test_tracing_multi_bench_attach: found 51186 functions serial_test_tracing_multi_bench_attach: attached in 1.295s serial_test_tracing_multi_bench_attach: detached in 0.243s #507 tracing_multi_bench_attach:OK Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED Successfully unloaded bpf_testmod.ko.
Quoted 1 line
Exporting
skip_entryasis_unsafe_functionand usign it in the test.
^ using
Quoted 53 lines
Signed-off-by Jiri Olsa <[email protected]>--- .../selftests/bpf/prog_tests/tracing_multi.c | 97 +++++++++++++++++++ .../selftests/bpf/progs/tracing_multi_bench.c | 13 +++ tools/testing/selftests/bpf/trace_helpers.c | 6 +- tools/testing/selftests/bpf/trace_helpers.h | 1 + 4 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_bench.ctools/testing/selftests/bpf/prog_tests/tracing_multi.c +28
-0@@ -9,6 +9,7 @@#include "tracing_multi_intersect.skel.h" #include "tracing_multi_session.skel.h" #include "tracing_multi_fail.skel.h" +#include "tracing_multi_bench.skel.h" #include "trace_helpers.h" static __u64 bpf_fentry_test_cookies[] = {@@ -552,6 +553,102 @@ static void test_attach_api_fails(void)tracing_multi_fail__destroy (skel); } +void serial_test_tracing_multi_bench_attach (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tracing_multi_bench *skel =NULL ; +long attach_start_ns, attach_end_ns; +long detach_start_ns, detach_end_ns; +double attach_delta, detach_delta; +struct bpf_link *link =NULL ; +size_t i, cap =0 , cnt =0 ; +struct ksyms *ksyms =NULL ; +void *root =NULL ; +__u32 *ids =NULL ; +__u32 nr, type_id; +struct btf *btf; +int err; + +#ifndef __x86_64__ +test__skip (); +return ; +#endif + + btf =btf__load_vmlinux_btf (); +if (!ASSERT_OK_PTR (btf,"btf__load_vmlinux_btf" )) +return ; + + skel =tracing_multi_bench__open_and_load (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_bench__open_and_load" ))
tools/testing/selftests/bpf/prog_tests/tracing_multi.c static void test_attach_api_fails(void) · line 592
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +10
-0+ goto cleanup; + +if (!ASSERT_OK (bpf_get_ksyms (&ksyms, true),"get_syms" )) + goto cleanup; + +/* Get all ftrace 'safe' symbols.. */ +for (i =0 ; i < ksyms->filtered_cnt; i++) { +if (is_unsafe_function (ksyms->filtered_syms[i])) +continue ; +tsearch (&ksyms->filtered_syms[i], &root, compare);
^ missing tdestroy() to free tree nodes?
Quoted 86 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +59
-0+ } + +/* ..and filter them through BTF and btf_type_is_traceable_func. */ + nr =btf__type_cnt (btf); +for (type_id =1 ; type_id < nr; type_id++) { +const struct btf_type *type; +const char *str; + + type =btf__type_by_id (btf, type_id); +if (!type) +break ; + +if (BTF_INFO_KIND (type->info) !=BTF_KIND_FUNC ) +continue ; + + str =btf__name_by_offset (btf, type->name_off); +if (!str) +break ; + +if (!tfind (&str, &root, compare)) +continue ; + +if (!btf_type_is_traceable_func (btf, type)) +continue ; + + err =libbpf_ensure_mem ((void **) &ids, &cap,sizeof (*ids), cnt +1 ); +if (err) + goto cleanup; + + ids[cnt++] = type_id; + } + + opts.ids = ids; + opts.cnt = cnt; + + attach_start_ns =get_time_ns (); + link =bpf_program__attach_tracing_multi (skel->progs.bench,NULL , &opts); + attach_end_ns =get_time_ns (); + +if (!ASSERT_OK_PTR (link,"bpf_program__attach_tracing_multi" )) + goto cleanup; + + detach_start_ns =get_time_ns (); +bpf_link__destroy (link); + detach_end_ns =get_time_ns (); + + attach_delta = (attach_end_ns - attach_start_ns) /1000000000.0 ; + detach_delta = (detach_end_ns - detach_start_ns) /1000000000.0 ; + +printf ("%s: found %lu functions\n" , __func__, cnt); +printf ("%s: attached in %7.3lfs\n" , __func__, attach_delta); +printf ("%s: detached in %7.3lfs\n" , __func__, detach_delta); + +cleanup: +tracing_multi_bench__destroy (skel); +free_kallsyms_local (ksyms); +free (ids); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__tools/testing/selftests/bpf/progs/tracing_multi_bench.c new file +13
-0@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +SEC("fentry.multi") +int BPF_PROG (bench ) +{ +return 0 ; +}tools/testing/selftests/bpf/trace_helpers.c +0
-0
tools/testing/selftests/bpf/trace_helpers.c static const char * const trace_blacklist[] = { · line 551
Quoted 5 lines
tools/testing/selftests/bpf/trace_helpers.c +1
-1@@ -548,7 +548,7 @@ static const char * const trace_blacklist[] = { "bpf_get_numa_node_id", }; -static bool skip_entry (char *name) +bool is_unsafe_function (char *name)
NIT: ^ should const char * ?
Thanks,
Leon
Quoted 31 lines
tools/testing/selftests/bpf/trace_helpers.c +2
-2{int i;@@ -651,7 +651,7 @@ int bpf_get_ksyms(struct ksyms **ksymsp, bool kernel)free (name);if (sscanf (buf,"%ms$*[^\n]\n" , &name) !=1 )continue ; -if (skip_entry (name)) +if (is_unsafe_function (name))continue ; ks =search_kallsyms_custom_local (ksyms, name, search_kallsyms_compare);@@ -728,7 +728,7 @@ int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel)free (name);if (sscanf (buf,"%p %ms$*[^\n]\n" , &addr, &name) !=2 )continue ; -if (skip_entry (name)) +if (is_unsafe_function (name))continue ;if (cnt == max_cnt) {tools/testing/selftests/bpf/trace_helpers.h +1
-0@@ -63,4 +63,5 @@ int read_build_id(const char *path, char *build_id, size_t size);int bpf_get_ksyms (struct ksyms **ksymsp,bool kernel);int bpf_get_addrs (unsigned long **addrsp,size_t *cntp,bool kernel); +bool is_unsafe_function (char *name);#endif
Re: [PATCHv3 bpf-next 23/24] selftests/bpf: Add tracing multi attach benchmark test
Quoted 19 lines · Leon Hwang
Quoted 18 lines · Jiri Olsa
Adding benchmark test that attaches to (almost) all allowed tracing functions and display attach/detach times.
# ./test_progs -t tracing_multi_bench_attach -v bpf_testmod.ko is already unloaded. Loading bpf_testmod.ko... Successfully loaded bpf_testmod.ko. serial_test_tracing_multi_bench_attach:PASS:btf__load_vmlinux_btf 0 nsec serial_test_tracing_multi_bench_attach:PASS:tracing_multi_bench__open_and_load 0 nsec serial_test_tracing_multi_bench_attach:PASS:get_syms 0 nsec serial_test_tracing_multi_bench_attach:PASS:bpf_program__attach_tracing_multi 0 nsec serial_test_tracing_multi_bench_attach: found 51186 functions serial_test_tracing_multi_bench_attach: attached in 1.295s serial_test_tracing_multi_bench_attach: detached in 0.243s #507 tracing_multi_bench_attach:OK Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED Successfully unloaded bpf_testmod.ko.
Quoted 2 lines
Quoted 1 line
Exporting
skip_entryasis_unsafe_functionand usign it in the test.^ using
yes
SNIP
Quoted 30 lines
Quoted 30 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +30
-0+void serial_test_tracing_multi_bench_attach (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tracing_multi_bench *skel =NULL ; +long attach_start_ns, attach_end_ns; +long detach_start_ns, detach_end_ns; +double attach_delta, detach_delta; +struct bpf_link *link =NULL ; +size_t i, cap =0 , cnt =0 ; +struct ksyms *ksyms =NULL ; +void *root =NULL ; +__u32 *ids =NULL ; +__u32 nr, type_id; +struct btf *btf; +int err; + +#ifndef __x86_64__ +test__skip (); +return ; +#endif + + btf =btf__load_vmlinux_btf (); +if (!ASSERT_OK_PTR (btf,"btf__load_vmlinux_btf" )) +return ; + + skel =tracing_multi_bench__open_and_load (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_bench__open_and_load" )) + goto cleanup; + +if (!ASSERT_OK (bpf_get_ksyms (&ksyms, true),"get_syms" ))
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c static void test_attach_api_fails(void) · line 592
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +7
-0+ goto cleanup; + +/* Get all ftrace 'safe' symbols.. */ +for (i =0 ; i < ksyms->filtered_cnt; i++) { +if (is_unsafe_function (ksyms->filtered_syms[i])) +continue ; +tsearch (&ksyms->filtered_syms[i], &root, compare);^ missing
tdestroy()to free tree nodes?
right, will add
SNIP
Quoted 30 lines
Quoted 30 lines
void
test_tracing_multi_test(void)
{
#ifndef__x86_64__tools/testing/selftests/bpf/progs/tracing_multi_bench.c new file +13
-0@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +SEC("fentry.multi") +int BPF_PROG (bench ) +{ +return 0 ; +}tools/testing/selftests/bpf/trace_helpers.c +0
-0@@ -548,7 +548,7 @@ static const char * const trace_blacklist[] = { "bpf_get_numa_node_id", };
Quoted 3 lines
tools/testing/selftests/bpf/trace_helpers.c static const char * const trace_blacklist[] = { · line 551
Quoted 2 lines
tools/testing/selftests/bpf/trace_helpers.c +1
-1-static bool skip_entry (char *name) +bool is_unsafe_function (char *name)NIT: ^ should const char * ?
sure, will change, thanks
jirka
Jiri Olsa
reviewerPATCH v3 24/24 selftests/bpf: Add tracing multi attach rollback tests
In reply to Jiri OlsaAdding tests for the rollback code when the tracing_multi link won't get attached, covering 2 reasons:
- wrong btf id passed by user, where all previously allocated trampolines will be released
- trampoline for requested function is fully attached (has already maximum programs attached) and the link fails, the rollback code needs to release all previously link-ed trampolines and release them
We need the bpf_fentry_test* unattached for the tests to pass, so the rollback tests are serial.
--- .../selftests/bpf/prog_tests/tracing_multi.c | 181 ++++++++++++++++++ .../bpf/progs/tracing_multi_rollback.c | 38 ++++ 2 files changed, 219 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_rollback.c
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +181 -0
@@ -10,6 +10,7 @@#include "tracing_multi_session.skel.h" #include "tracing_multi_fail.skel.h" #include "tracing_multi_bench.skel.h" +#include "tracing_multi_rollback.skel.h" #include "trace_helpers.h" static __u64 bpf_fentry_test_cookies[] = {
@@ -649,6 +650,186 @@ void serial_test_tracing_multi_bench_attach(void)free (ids); } +static void tracing_multi_rollback_run (struct tracing_multi_rollback *skel) +{ +LIBBPF_OPTS (bpf_test_run_opts, topts); +int err, prog_fd; + + prog_fd =bpf_program__fd (skel->progs.test_fentry); + err =bpf_prog_test_run_opts (prog_fd, &topts); +ASSERT_OK (err,"test_run" ); + +/* make sure the rollback code did not leave any program attached */ +ASSERT_EQ (skel->bss->test_result_fentry,0 ,"test_result_fentry" ); +ASSERT_EQ (skel->bss->test_result_fexit,0 ,"test_result_fexit" ); +} + +static void test_rollback_put (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tracing_multi_rollback *skel =NULL ; +size_t cnt =FUNCS_CNT ; +__u32 *ids =NULL ; +int err; + + skel =tracing_multi_rollback__open (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_rollback__open" )) +return ; + +bpf_program__set_autoload (skel->progs.test_fentry, true); +bpf_program__set_autoload (skel->progs.test_fexit, true); + + err =tracing_multi_rollback__load (skel); +if (!ASSERT_OK (err,"tracing_multi_rollback__load" )) + goto cleanup; + + ids =get_ids (bpf_fentry_test, cnt,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" )) + goto cleanup; + +/* +* Mangle last id to trigger rollback, which needs to do put +* on get-ed trampolines. +*/ + ids[9 ] =0 ; + + opts.ids = ids; + opts.cnt = cnt; + + skel->bss->pid =getpid (); + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + + skel->links.test_fexit =bpf_program__attach_tracing_multi (skel->progs.test_fexit, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fexit,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* We don't really attach any program, but let's make sure. */ +tracing_multi_rollback_run (skel); + +cleanup: +tracing_multi_rollback__destroy (skel); +free (ids); +} + + +static void fillers_cleanup (struct tracing_multi_rollback **skels,int cnt) +{ +int i; + +for (i =0 ; i < cnt; i++) +tracing_multi_rollback__destroy (skels[i]); + +free (skels); +} + +static struct tracing_multi_rollback **fillers_load_and_link (int max) +{ +struct tracing_multi_rollback **skels, *skel; +int i, err; + + skels =calloc (max +1 ,sizeof (*skels)); +if (!ASSERT_OK_PTR (skels,"calloc" )) +return NULL ; + +for (i =0 ; i < max; i++) { + skel = skels[i] =tracing_multi_rollback__open (); +if (!ASSERT_OK_PTR (skels[i],"tracing_multi_rollback__open" )) + goto cleanup; + +bpf_program__set_autoload (skel->progs.filler, true); + + err =tracing_multi_rollback__load (skel); +if (!ASSERT_OK (err,"tracing_multi_rollback__load" )) + goto cleanup; + + skel->links.filler =bpf_program__attach_trace (skel->progs.filler); +if (!ASSERT_OK_PTR (skels[i]->links.filler,"bpf_program__attach_trace" )) + goto cleanup; + } + +return skels; + +cleanup: +fillers_cleanup (skels, i); +return NULL ; +} + +static void test_rollback_unlink (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tracing_multi_rollback **fillers; +struct tracing_multi_rollback *skel; +size_t cnt =FUNCS_CNT ; +__u32 *ids =NULL ; +int err, max; + + max =get_bpf_max_tramp_links (); +if (!ASSERT_GE (max,1 ,"bpf_max_tramp_links" )) +return ; + +/* Attach maximum allowed programs to bpf_fentry_test10 */ + fillers =fillers_load_and_link (max); +if (!ASSERT_OK_PTR (fillers,"fillers_load_and_link" )) +return ; + + skel =tracing_multi_rollback__open (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_rollback__open" )) + goto cleanup; + +bpf_program__set_autoload (skel->progs.test_fentry, true); +bpf_program__set_autoload (skel->progs.test_fexit, true); + +/* +* Attach tracing_multi link on bpf_fentry_test1-10, which will +* fail on bpf_fentry_test10 function, because it already has +* maximum allowed programs attached. +* +* The rollback needs to unlink already link-ed trampolines and +* put all of them. +*/ + err =tracing_multi_rollback__load (skel); +if (!ASSERT_OK (err,"tracing_multi_rollback__load" )) + goto cleanup; + + ids =get_ids (bpf_fentry_test, cnt,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" )) + goto cleanup; + + opts.ids = ids; + opts.cnt = cnt; + + skel->bss->pid =getpid (); + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + + skel->links.test_fexit =bpf_program__attach_tracing_multi (skel->progs.test_fexit, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fexit,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +tracing_multi_rollback_run (skel); + +cleanup: +fillers_cleanup (fillers, max); +free (ids); +} + +void serial_test_tracing_multi_attach_rollback (void ) +{ +if (test__start_subtest ("put" )) +test_rollback_put (); +if (test__start_subtest ("unlink" )) +test_rollback_unlink (); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__
tools/testing/selftests/bpf/progs/tracing_multi_rollback.c new file +38 -0
@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +int pid =0 ; + +__u64 test_result_fentry =0 ; +__u64 test_result_fexit =0 ; + +SEC("?fentry.multi") +int BPF_PROG (test_fentry ) +{ +if (bpf_get_current_pid_tgid () >>32 != pid) +return 0 ; + + test_result_fentry++; +return 0 ; +} + +SEC("?fexit.multi") +int BPF_PROG (test_fexit ) +{ +if (bpf_get_current_pid_tgid () >>32 != pid) +return 0 ; + + test_result_fexit++; +return 0 ; +} + +SEC("?fentry/bpf_fentry_test10") +int BPF_PROG (filler ) +{ +return 0 ; +}
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 24/24] selftests/bpf: Add tracing multi attach rollback tests
Quoted 194 lines · Jiri Olsa
Adding tests for the rollback code when the
tracing_multilink won't get attached, covering 2 reasons:- wrong btf id passed by user, where all previously allocated trampolines will be released
- trampoline for requested function is fully attached (has already maximum programs attached) and the link fails, the rollback code needs to release all previously link-ed trampolines and release themWe need the bpf_fentry_test* unattached for the tests to pass, so the rollback tests are serial.
Signed-off-by Jiri Olsa <[email protected]>--- .../selftests/bpf/prog_tests/tracing_multi.c | 181 ++++++++++++++++++ .../bpf/progs/tracing_multi_rollback.c | 38 ++++ 2 files changed, 219 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_rollback.ctools/testing/selftests/bpf/prog_tests/tracing_multi.c +159
-0@@ -10,6 +10,7 @@#include "tracing_multi_session.skel.h" #include "tracing_multi_fail.skel.h" #include "tracing_multi_bench.skel.h" +#include "tracing_multi_rollback.skel.h" #include "trace_helpers.h" static __u64 bpf_fentry_test_cookies[] = {@@ -649,6 +650,186 @@ void serial_test_tracing_multi_bench_attach(void)free (ids); } +static void tracing_multi_rollback_run (struct tracing_multi_rollback *skel) +{ +LIBBPF_OPTS (bpf_test_run_opts, topts); +int err, prog_fd; + + prog_fd =bpf_program__fd (skel->progs.test_fentry); + err =bpf_prog_test_run_opts (prog_fd, &topts); +ASSERT_OK (err,"test_run" ); + +/* make sure the rollback code did not leave any program attached */ +ASSERT_EQ (skel->bss->test_result_fentry,0 ,"test_result_fentry" ); +ASSERT_EQ (skel->bss->test_result_fexit,0 ,"test_result_fexit" ); +} + +static void test_rollback_put (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tracing_multi_rollback *skel =NULL ; +size_t cnt =FUNCS_CNT ; +__u32 *ids =NULL ; +int err; + + skel =tracing_multi_rollback__open (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_rollback__open" )) +return ; + +bpf_program__set_autoload (skel->progs.test_fentry, true); +bpf_program__set_autoload (skel->progs.test_fexit, true); + + err =tracing_multi_rollback__load (skel); +if (!ASSERT_OK (err,"tracing_multi_rollback__load" )) + goto cleanup; + + ids =get_ids (bpf_fentry_test, cnt,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" )) + goto cleanup; + +/* +* Mangle last id to trigger rollback, which needs to do put +* on get-ed trampolines. +*/ + ids[9 ] =0 ; + + opts.ids = ids; + opts.cnt = cnt; + + skel->bss->pid =getpid (); + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + + skel->links.test_fexit =bpf_program__attach_tracing_multi (skel->progs.test_fexit, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fexit,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +/* We don't really attach any program, but let's make sure. */ +tracing_multi_rollback_run (skel); + +cleanup: +tracing_multi_rollback__destroy (skel); +free (ids); +} + + +static void fillers_cleanup (struct tracing_multi_rollback **skels,int cnt) +{ +int i; + +for (i =0 ; i < cnt; i++) +tracing_multi_rollback__destroy (skels[i]); + +free (skels); +} + +static struct tracing_multi_rollback **fillers_load_and_link (int max) +{ +struct tracing_multi_rollback **skels, *skel; +int i, err; + + skels =calloc (max +1 ,sizeof (*skels)); +if (!ASSERT_OK_PTR (skels,"calloc" )) +return NULL ; + +for (i =0 ; i < max; i++) { + skel = skels[i] =tracing_multi_rollback__open (); +if (!ASSERT_OK_PTR (skels[i],"tracing_multi_rollback__open" )) + goto cleanup; + +bpf_program__set_autoload (skel->progs.filler, true); + + err =tracing_multi_rollback__load (skel); +if (!ASSERT_OK (err,"tracing_multi_rollback__load" )) + goto cleanup; + + skel->links.filler =bpf_program__attach_trace (skel->progs.filler); +if (!ASSERT_OK_PTR (skels[i]->links.filler,"bpf_program__attach_trace" )) + goto cleanup; + } + +return skels; + +cleanup: +fillers_cleanup (skels, i); +return NULL ; +} + +static void test_rollback_unlink (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tracing_multi_rollback **fillers; +struct tracing_multi_rollback *skel; +size_t cnt =FUNCS_CNT ; +__u32 *ids =NULL ; +int err, max; + + max =get_bpf_max_tramp_links (); +if (!ASSERT_GE (max,1 ,"bpf_max_tramp_links" )) +return ; + +/* Attach maximum allowed programs to bpf_fentry_test10 */ + fillers =fillers_load_and_link (max); +if (!ASSERT_OK_PTR (fillers,"fillers_load_and_link" )) +return ; + + skel =tracing_multi_rollback__open (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_rollback__open" )) + goto cleanup; + +bpf_program__set_autoload (skel->progs.test_fentry, true); +bpf_program__set_autoload (skel->progs.test_fexit, true); + +/* +* Attach tracing_multi link on bpf_fentry_test1-10, which will +* fail on bpf_fentry_test10 function, because it already has +* maximum allowed programs attached. +* +* The rollback needs to unlink already link-ed trampolines and +* put all of them. +*/ + err =tracing_multi_rollback__load (skel); +if (!ASSERT_OK (err,"tracing_multi_rollback__load" )) + goto cleanup; + + ids =get_ids (bpf_fentry_test, cnt,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" )) + goto cleanup; + + opts.ids = ids; + opts.cnt = cnt; + + skel->bss->pid =getpid (); + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" ))
tools/testing/selftests/bpf/prog_tests/tracing_multi.c void serial_test_tracing_multi_bench_attach(void) · line 820
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +10
-0+ goto cleanup; + + skel->links.test_fexit =bpf_program__attach_tracing_multi (skel->progs.test_fexit, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fexit,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +tracing_multi_rollback_run (skel); + +cleanup:
tracing_multi_rollback__destroy(skel); is missed to destroy skel?
Thanks,
Leon
Quoted 59 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +12
-0+fillers_cleanup (fillers, max); +free (ids); +} + +void serial_test_tracing_multi_attach_rollback (void ) +{ +if (test__start_subtest ("put" )) +test_rollback_put (); +if (test__start_subtest ("unlink" )) +test_rollback_unlink (); +} +void test_tracing_multi_test (void ) {#ifndef __x86_64__tools/testing/selftests/bpf/progs/tracing_multi_rollback.c new file +38
-0@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <stdbool.h> +#include <linux/bpf.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> + +char _license[] SEC("license") = "GPL"; + +int pid =0 ; + +__u64 test_result_fentry =0 ; +__u64 test_result_fexit =0 ; + +SEC("?fentry.multi") +int BPF_PROG (test_fentry ) +{ +if (bpf_get_current_pid_tgid () >>32 != pid) +return 0 ; + + test_result_fentry++; +return 0 ; +} + +SEC("?fexit.multi") +int BPF_PROG (test_fexit ) +{ +if (bpf_get_current_pid_tgid () >>32 != pid) +return 0 ; + + test_result_fexit++; +return 0 ; +} + +SEC("?fentry/bpf_fentry_test10") +int BPF_PROG (filler ) +{ +return 0 ; +}
Re: [PATCHv3 bpf-next 24/24] selftests/bpf: Add tracing multi attach rollback tests
On Tue, Mar 17, 2026 at 11:20:59AM +0800, Leon Hwang wrote:
SNIP
Quoted 52 lines
Quoted 52 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +52
-0+static void test_rollback_unlink (void ) +{ +LIBBPF_OPTS (bpf_tracing_multi_opts, opts); +struct tracing_multi_rollback **fillers; +struct tracing_multi_rollback *skel; +size_t cnt =FUNCS_CNT ; +__u32 *ids =NULL ; +int err, max; + + max =get_bpf_max_tramp_links (); +if (!ASSERT_GE (max,1 ,"bpf_max_tramp_links" )) +return ; + +/* Attach maximum allowed programs to bpf_fentry_test10 */ + fillers =fillers_load_and_link (max); +if (!ASSERT_OK_PTR (fillers,"fillers_load_and_link" )) +return ; + + skel =tracing_multi_rollback__open (); +if (!ASSERT_OK_PTR (skel,"tracing_multi_rollback__open" )) + goto cleanup; + +bpf_program__set_autoload (skel->progs.test_fentry, true); +bpf_program__set_autoload (skel->progs.test_fexit, true); + +/* +* Attach tracing_multi link on bpf_fentry_test1-10, which will +* fail on bpf_fentry_test10 function, because it already has +* maximum allowed programs attached. +* +* The rollback needs to unlink already link-ed trampolines and +* put all of them. +*/ + err =tracing_multi_rollback__load (skel); +if (!ASSERT_OK (err,"tracing_multi_rollback__load" )) + goto cleanup; + + ids =get_ids (bpf_fentry_test, cnt,NULL ); +if (!ASSERT_OK_PTR (ids,"get_ids" )) + goto cleanup; + + opts.ids = ids; + opts.cnt = cnt; + + skel->bss->pid =getpid (); + + skel->links.test_fentry =bpf_program__attach_tracing_multi (skel->progs.test_fentry, +NULL , &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fentry,"bpf_program__attach_tracing_multi" )) + goto cleanup; + + skel->links.test_fexit = bpf_program__attach_tracing_multi(skel->progs.test_fexit,
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c void serial_test_tracing_multi_bench_attach(void) · line 714
Quoted 7 lines
tools/testing/selftests/bpf/prog_tests/tracing_multi.c +7
-0+ NULL, &opts); +if (!ASSERT_ERR_PTR (skel->links.test_fexit,"bpf_program__attach_tracing_multi" )) + goto cleanup; + +tracing_multi_rollback_run (skel); + +cleanup:
tracing_multi_rollback__destroy(skel); is missed to destroy skel?
it is, will add, thanks
jirka