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

diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 5982d18f169bd299e96a286a7bd7d919350f768b..808c0d7a31faf097550d9418e3e3f6e7afe62b6f 100644 (file)
--- 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;