From nobody Mon Feb 9 11:26:56 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7601269D15; Fri, 2 May 2025 16:50:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746204611; cv=none; b=gM30ni/nacltVtPKb23PzSUuB6IQ0in5O3ZBDdOZahETiSZeFke6FTAg6qJWv/nhbrKLqqLPmevMUcwTujyBuOfsjJKGnT+9lDYlsBJXDTLO7ZMmWXN4ib0461cMPNNZtU2MV9Or4oFdyUbL/z6I3rvd+jchHYVS6xAZu3Qsf7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746204611; c=relaxed/simple; bh=mggx5smXanCvg7n8gnR/FploZ9NPITBU1NWvDKMpMos=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Wk9vOMwZZadNoYystV5iJ3jYFyPqpAT7ywTcHVEEQYYS393LPkZMRZGXL47YoDPB/YJC/zk+NiYqQnYc7FLmY6gYwzd5cYtB9yx+mBQaT030s23jg2XCiUNIoF57rUvTYou2Dk/E1MOmilnVAnGAl/pN+COqu+EiLbiboah9QPo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3971C4CEF7; Fri, 2 May 2025 16:50:10 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98.2) (envelope-from ) id 1uAtaU-0000000037H-0xSk; Fri, 02 May 2025 12:50:10 -0400 Message-ID: <20250502165010.082067388@goodmis.org> User-Agent: quilt/0.68 Date: Fri, 02 May 2025 12:48:02 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mathieu Desnoyers , Josh Poimboeuf , Peter Zijlstra , x86@kernel.org, Jiri Olsa , Namhyung Kim Subject: [PATCH v7 16/17] perf: Simplify get_perf_callchain() user logic References: <20250502164746.178864972@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Josh Poimboeuf Simplify the get_perf_callchain() user logic a bit. task_pt_regs() should never be NULL. Acked-by: Namhyung Kim Signed-off-by: Josh Poimboeuf Signed-off-by: Steven Rostedt (Google) --- 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 cda145dc11bd..2798c0c9f782 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) { if (!user_mode(regs)) { if (current->flags & PF_KTHREAD) - regs =3D NULL; - else - regs =3D task_pt_regs(current); + goto exit_put; + regs =3D task_pt_regs(current); } =20 - if (regs) { - if (add_mark) - perf_callchain_store_context(&ctx, PERF_CONTEXT_USER); + if (add_mark) + perf_callchain_store_context(&ctx, PERF_CONTEXT_USER); =20 - start_entry_idx =3D entry->nr; - perf_callchain_user(&ctx, regs); - fixup_uretprobe_trampoline_entries(entry, start_entry_idx); - } + start_entry_idx =3D entry->nr; + perf_callchain_user(&ctx, regs); + fixup_uretprobe_trampoline_entries(entry, start_entry_idx); } =20 +exit_put: put_callchain_entry(rctx); =20 return entry; --=20 2.47.2