From patchwork Thu Nov 9 00:41:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 163186 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp138418vqs; Wed, 8 Nov 2023 16:44:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IERUJxz5xO1cDRGrlwsq9UXXNB3LRRrGfdgYNoGMiuLTBT5RULA0pn4JYrnW01azJoZZt9o X-Received: by 2002:a05:6a20:1443:b0:183:e7db:4a57 with SMTP id a3-20020a056a20144300b00183e7db4a57mr4118449pzi.46.1699490648525; Wed, 08 Nov 2023 16:44:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699490648; cv=none; d=google.com; s=arc-20160816; b=l4svDn52e1v5uEBQCuvgtJPW2U5Mh562TIZuJGkbh9kHYQGGGKv0k6f7GKPRIFH9zh 5iw9GXmMgjRO/gzAoEvzfjXuCDyrxQzbebm06XDMu9FIRUtyOVPPZV8nAE2cyz6XjL9J PUTFtAuwF/XNU9iqkqRMrqEa3kXtTFNW4yoZTYvl18LNHjeN0lXIU8FXGqAj9yfzjCmW E6kXMpubZouKsM824B+qg/hTYNhETp/fPjtHNwcwQXOT9qcmQ1x0u+0RINH2BuFouiXu CEHE3g7m1ZoHFItML2fxvk+Bfvwro75xU9r5NtVP/VofxRA0mM8XWwpbfY0qN1r5ZSCo k+4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ftSUiRPT0bf97CXs1/GFFF29jbzgkOx1gj1GEBzZ5HY=; fh=3ahOA1+93SqEqAeT96I/cgRVlate7pzd5ZZzl/6KbbU=; b=VeClUYwkK3rkiXLSo6AMQAXcaG0U0+jPf/tAFVUjLz/NicPj6kTL/T4Yt5KGAroGtq +zJ0ORHaWNG2Xv6cqtIZpXCEzbz+qR57VHeH77FiCTmZzOYjjFH5PsHrc5oJZVbqNuQV 8wOadGXd/pETKUNYTbiXT/N0lA9aVqb+MaAJQSRWdhXcQfJo8PO411VW57SAY1FNPE9O 6gWwPLV0tHn6QPnVhdO3iNMr+0PoU8wmlEosRHggRm9gT1e3kehgFVdQ1RtndwQl9uLk CspzUERZIYhz8ZW7+oRHf2PoxYYBZCXlYiRUG7+Jhz4pU+1M2S6/gMUDqrssS5WrRUkz sslQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UkgQZtvQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id g21-20020a17090a579500b0027763f3e3c8si284000pji.186.2023.11.08.16.44.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 16:44:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UkgQZtvQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C1A1B822CB71; Wed, 8 Nov 2023 16:44:07 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232220AbjKIAnt (ORCPT + 32 others); 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 08 Nov 2023 16:44:07 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782045106202831516 X-GMAIL-MSGID: 1782045106202831516 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, if (user) { if (!user_mode(regs)) { - if (current->mm) - regs = task_pt_regs(current); - else - regs = NULL; + if (!current->mm) + 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); - perf_callchain_user(&ctx, regs); - } + perf_callchain_user(&ctx, regs); } +exit_put: put_callchain_entry(rctx); return entry;