diff options
| author | Josh Poimboeuf <jpoimboe@kernel.org> | 2025-08-20 14:03:40 -0400 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2025-08-26 09:51:12 +0200 |
| commit | 153f9e74dec230f2e070e16fa061bc7adfd2c450 (patch) | |
| tree | 985c9b38f7e69eef77496c63ca9dc1d09f13f61a /kernel | |
| parent | perf: Remove get_perf_callchain() init_nr argument (diff) | |
| download | linux-153f9e74dec230f2e070e16fa061bc7adfd2c450.tar.gz linux-153f9e74dec230f2e070e16fa061bc7adfd2c450.zip | |
perf: Have get_perf_callchain() return NULL if crosstask and user are set
get_perf_callchain() doesn't support cross-task unwinding for user space
stacks, have it return NULL if both the crosstask and user arguments are
set.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250820180428.426423415@kernel.org
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/callchain.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index b0f5bd228cd8..cd0e3fc7ed05 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -224,6 +224,10 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, struct perf_callchain_entry_ctx ctx; int rctx, start_entry_idx; + /* crosstask is not supported for user stacks */ + if (crosstask && user && !kernel) + return NULL; + entry = get_callchain_entry(&rctx); if (!entry) return NULL; @@ -240,7 +244,7 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, perf_callchain_kernel(&ctx, regs); } - if (user) { + if (user && !crosstask) { if (!user_mode(regs)) { if (current->mm) regs = task_pt_regs(current); @@ -249,9 +253,6 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, } if (regs) { - if (crosstask) - goto exit_put; - if (add_mark) perf_callchain_store_context(&ctx, PERF_CONTEXT_USER); @@ -261,7 +262,6 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, bool user, } } -exit_put: put_callchain_entry(rctx); return entry; |