From nobody Wed Dec 31 03:45:45 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E387C4332F for ; Thu, 9 Nov 2023 00:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232225AbjKIAnt (ORCPT ); Wed, 8 Nov 2023 19:43:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231660AbjKIAnn (ORCPT ); Wed, 8 Nov 2023 19:43:43 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B14D18E; Wed, 8 Nov 2023 16:43:41 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1ED83C433C7; Thu, 9 Nov 2023 00:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699490620; bh=hx3Djh/kYdFvuxP2oBZvphYZwmXCDf5Wl1myLGWOnwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UkgQZtvQExzTHY3D9/R+gZTaVgixkNq7It9ld+PdOzhlcIJywX31Vqfpwp5trYRh1 TMPQt3zCAaSNL+vrxVJ2CX8UJki9Okqz/7lcD+9X/mykWEDYdH8QUOOrJDHmSfFBj0 80gxfa0dhcCHmclYMfhki//DWESzs6TZL1ln5Rt4w+xCHdEICqOJ4uYmcsVx5YSA6/ rONHgpZNMdzJdvo+B4kOJmxCWpqfT50m35xO+gvZhLptDC3lZUSviD1p4PXhn0DiDx +XNXnevNVU/cgDgbrf/aZjDfnDAXF3s6S5luXuhEIiwdwH4l16qbfh7DjJDIpILzys wnHgkXJtYJYkg== From: Josh Poimboeuf To: Peter Zijlstra , Steven Rostedt , Ingo Molnar , Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, x86@kernel.org, Indu Bhagat , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , linux-perf-users@vger.kernel.org, Mark Brown , linux-toolchains@vger.kernel.org Subject: [PATCH RFC 03/10] perf: Simplify get_perf_callchain() user logic Date: Wed, 8 Nov 2023 16:41:08 -0800 Message-ID: <6456d4d523841fb97b639433731540b8783529a1.1699487758.git.jpoimboe@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Simplify the get_perf_callchain() user logic a bit. task_pt_regs() should never be NULL. Signed-off-by: Josh Poimboeuf Acked-by: Namhyung Kim --- kernel/events/callchain.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c index aa5f9d11c28d..2bee8b6fda0e 100644 --- a/kernel/events/callchain.c +++ b/kernel/events/callchain.c @@ -202,20 +202,18 @@ 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 - perf_callchain_user(&ctx, regs); - } + perf_callchain_user(&ctx, regs); } =20 +exit_put: put_callchain_entry(rctx); =20 return entry; --=20 2.41.0