From: "tip-bot2 for Josh Poimboeuf" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Josh Poimboeuf <jpoimboe@kernel.org>,
"Steven Rostedt (Google)" <rostedt@goodmis.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Namhyung Kim <namhyung@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: perf/core] perf: Simplify get_perf_callchain() user logic
Date: Wed, 27 Aug 2025 06:45:19 -0000 [thread overview]
Message-ID: <175627711939.1920.2206772956007488525.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250820180428.760066227@kernel.org>
The following commit has been merged into the perf/core branch of tip:
Commit-ID: d77e3319e31098a6cb97b7ce4e71ba676e327fd7
Gitweb: https://git.kernel.org/tip/d77e3319e31098a6cb97b7ce4e71ba676e327fd7
Author: Josh Poimboeuf <jpoimboe@kernel.org>
AuthorDate: Wed, 20 Aug 2025 14:03:42 -04:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Tue, 26 Aug 2025 09:51:13 +02:00
perf: Simplify get_perf_callchain() user logic
Simplify the get_perf_callchain() user logic a bit. task_pt_regs()
should never be NULL.
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>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20250820180428.760066227@kernel.org
---
kernel/events/callchain.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 5982d18..808c0d7 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -247,21 +247,19 @@ get_perf_callchain(struct pt_regs *regs, bool kernel, bool user,
if (user && !crosstask) {
if (!user_mode(regs)) {
if (current->flags & (PF_KTHREAD | PF_USER_WORKER))
- regs = NULL;
- else
- regs = task_pt_regs(current);
+ goto exit_put;
+ regs = task_pt_regs(current);
}
- if (regs) {
- if (add_mark)
- perf_callchain_store_context(&ctx, PERF_CONTEXT_USER);
+ if (add_mark)
+ perf_callchain_store_context(&ctx, PERF_CONTEXT_USER);
- start_entry_idx = entry->nr;
- perf_callchain_user(&ctx, regs);
- fixup_uretprobe_trampoline_entries(entry, start_entry_idx);
- }
+ start_entry_idx = entry->nr;
+ perf_callchain_user(&ctx, regs);
+ fixup_uretprobe_trampoline_entries(entry, start_entry_idx);
}
+exit_put:
put_callchain_entry(rctx);
return entry;
next prev parent reply other threads:[~2025-08-27 6:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-20 18:03 [RESEND][PATCH 0/5] perf: Clean ups and simplifications Steven Rostedt
2025-08-20 18:03 ` [RESEND][PATCH 1/5] perf: Remove get_perf_callchain() init_nr argument Steven Rostedt
2025-08-27 6:45 ` [tip: perf/core] " tip-bot2 for Josh Poimboeuf
2025-08-20 18:03 ` [RESEND][PATCH 2/5] perf: Have get_perf_callchain() return NULL if crosstask and user are set Steven Rostedt
2025-08-27 6:45 ` [tip: perf/core] " tip-bot2 for Josh Poimboeuf
2025-08-20 18:03 ` [RESEND][PATCH 3/5] perf: Use current->flags & PF_KTHREAD|PF_USER_WORKER instead of current->mm == NULL Steven Rostedt
2025-08-27 6:45 ` [tip: perf/core] " tip-bot2 for Steven Rostedt
2025-11-13 3:11 ` [RESEND][PATCH 3/5] " Guenter Roeck
2026-01-26 16:50 ` Steven Rostedt
2026-01-26 17:05 ` Steven Rostedt
2026-01-26 17:18 ` Steven Rostedt
2026-01-26 17:29 ` Guenter Roeck
2026-01-27 1:32 ` Guenter Roeck
2026-01-27 15:22 ` Steven Rostedt
2026-01-27 19:07 ` Guenter Roeck
2026-01-27 21:36 ` Steven Rostedt
2026-01-27 20:31 ` Guenter Roeck
2025-08-20 18:03 ` [RESEND][PATCH 4/5] perf: Simplify get_perf_callchain() user logic Steven Rostedt
2025-08-27 6:45 ` tip-bot2 for Josh Poimboeuf [this message]
2025-08-20 18:03 ` [RESEND][PATCH 5/5] perf: Skip user unwind if the task is a kernel thread Steven Rostedt
2025-08-27 6:45 ` [tip: perf/core] " tip-bot2 for Josh Poimboeuf
2025-08-25 11:12 ` [RESEND][PATCH 0/5] perf: Clean ups and simplifications Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=175627711939.1920.2206772956007488525.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®