From nobody Fri Dec 19 07:49:54 2025 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 768F228A1DE; Thu, 24 Apr 2025 16:24:37 +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=1745511877; cv=none; b=rxvKg72UxHV0TF8mIie1rccWSIMQWu/SFUUWy0OskjsQlEEUh4Q0fYIvkQ3DGgk6kR4eKTcUlhuFMVgpuQbtM5jW9GgpEsiLd/6DHRUDJEny1+uB+2L2jpRrO8+ZdcXvnK8xWsx/QmjgFGLmt2yv/R3dZaX2VesjRF5DREbx5ik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745511877; c=relaxed/simple; bh=H36ztlQaYKsQiXecV8mwSlUa1FqCJ0LjS/qF/d8TdbE=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=VjyBtXc36ZNPm5QLWF9uum+rivnAWjan6D4+mb/g75A8mjiiJXvlDkb+nzNiIpeXIPc16eEf+XdzTuuFyU+QBEl/BXP5dT4JWCFc4QZN9+t6vL10XzpTgcG3yVe0erzppH31AKzXylpJSd34BdXQNBFGJWfzBSLSD2poV0A6ndA= 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 3A94EC116C6; Thu, 24 Apr 2025 16:24:37 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.98) (envelope-from ) id 1u7zPF-0000000Gyae-0ojQ; Thu, 24 Apr 2025 12:26:33 -0400 Message-ID: <20250424162633.048002581@goodmis.org> User-Agent: quilt/0.68 Date: Thu, 24 Apr 2025 12:25:40 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Josh Poimboeuf , x86@kernel.org, Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Indu Bhagat , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, Mark Brown , linux-toolchains@vger.kernel.org, Jordan Rome , Sam James , Andrii Nakryiko , Jens Remus , Florian Weimer , Andy Lutomirski , Weinan Liu , Blake Jones , Beau Belgrave , "Jose E. Marchesi" Subject: [PATCH v5 11/17] perf: Simplify get_perf_callchain() user logic References: <20250424162529.686762589@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 | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index abf258913ab6..bba7f8540ade 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -246,22 +246,20 @@ get_perf_callchain(struct pt_regs *regs, bool kernel,= bool user, =20 if (user) { if (!user_mode(regs)) { - if (current->mm) - regs =3D task_pt_regs(current); - else - regs =3D NULL; + if (!current->mm) + 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