From mboxrd@z Thu Jan 1 00:00:00 1970 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 57B96C433EF for ; Tue, 12 Jul 2022 07:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232438AbiGLHtd (ORCPT ); Tue, 12 Jul 2022 03:49:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232431AbiGLHtb (ORCPT ); Tue, 12 Jul 2022 03:49:31 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 839ED9B562 for ; Tue, 12 Jul 2022 00:49:29 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B30A21516; Tue, 12 Jul 2022 00:49:29 -0700 (PDT) Received: from [10.1.29.134] (e127744.cambridge.arm.com [10.1.29.134]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 885A93F73D; Tue, 12 Jul 2022 00:49:27 -0700 (PDT) Subject: Re: [PATCH] drivers/perf: arm_spe: Fix consistency of SYS_PMSCR_EL1.CX To: Anshuman Khandual , linux-arm-kernel@lists.infradead.org Cc: james.clark@arm.com, suzuki.poulose@arm.com, Will Deacon , Mark Rutland , linux-kernel@vger.kernel.org, Leo Yan References: <20220712051404.2546851-1-anshuman.khandual@arm.com> From: German Gomez Message-ID: <42caa18b-6287-0cfe-90c6-e47ec1709154@arm.com> Date: Tue, 12 Jul 2022 08:49:07 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20220712051404.2546851-1-anshuman.khandual@arm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks for reworking the patch, Anshuman, On 12/07/2022 06:14, Anshuman Khandual wrote: > The arm_spe_pmu driver will enable SYS_PMSCR_EL1.CX in order to add CONTEXT > packets into the traces, if the owner of the perf event runs with required > capabilities i.e CAP_PERFMON or CAP_SYS_ADMIN via perfmon_capable() helper. > > The value of this bit is computed in the arm_spe_event_to_pmscr() function > but the check for capabilities happens in the pmu event init callback i.e > arm_spe_pmu_event_init(). This suggests that the value of the CX bit should > remain consistent for the duration of the perf session. > > However, the function arm_spe_event_to_pmscr() may be called later during > the event start callback i.e arm_spe_pmu_start() when the "current" process > is not the owner of the perf session, hence the CX bit setting is currently > not consistent. > > One way to fix this, is by caching the required value of the CX bit during > the initialization of the PMU event, so that it remains consistent for the > duration of the session. It uses currently unused 'event->hw.flags' element > to cache perfmon_capable() value, which can be referred during event start > callback to compute SYS_PMSCR_EL1.CX. This ensures consistent availability > of context packets in the trace as per event owner capabilities. > > Cc: Will Deacon > Cc: Mark Rutland > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual I'll add the Fixes tag, which I forgot to add in the prev version (I think it's the right one :) Fixed: cea7d0d4a59b ("drivers/perf: Open access for CAP_PERFMON privileged process") > --- > This applies on v5.19-rc6 and built on an earlier version posted by German > https://lore.kernel.org/all/20220117124432.3119132-1-german.gomez@arm.com/ > > drivers/perf/arm_spe_pmu.c | 25 +++++++++++++++++++++++-- > 1 file changed, 23 insertions(+), 2 deletions(-) > > diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c > index db670b265897..011e98428233 100644 > --- a/drivers/perf/arm_spe_pmu.c > +++ b/drivers/perf/arm_spe_pmu.c > @@ -39,6 +39,26 @@ > #include > #include > > +/* > + * event.hw.flags remain unused for events created for this > + * PMU driver. A single bit there i.e BIT(0), could be used > + * to remember initiating process's perfmon_capable() value > + * which can be subsequently used to enable SYS_PMSCR_EL.CX > + * thus enabling context information in the trace. > + */ > +#define SPE_PMU_HW_FLAGS_CX BIT(0) > + > +static void event_hw_flags_set_cx(struct perf_event *event) > +{ > + if (perfmon_capable()) > + event->hw.flags |= SPE_PMU_HW_FLAGS_CX; > +} > + > +static bool event_hw_flags_has_cx(struct perf_event *event) > +{ > + return !!(event->hw.flags & SPE_PMU_HW_FLAGS_CX); > +} > + > #define ARM_SPE_BUF_PAD_BYTE 0 > > struct arm_spe_pmu_buf { > @@ -272,7 +292,7 @@ static u64 arm_spe_event_to_pmscr(struct perf_event *event) > if (!attr->exclude_kernel) > reg |= BIT(SYS_PMSCR_EL1_E1SPE_SHIFT); > > - if (IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR) && perfmon_capable()) > + if (IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR) && event_hw_flags_has_cx(event)) > reg |= BIT(SYS_PMSCR_EL1_CX_SHIFT); > > return reg; > @@ -710,7 +730,8 @@ static int arm_spe_pmu_event_init(struct perf_event *event) > return -EOPNOTSUPP; > > reg = arm_spe_event_to_pmscr(event); > - if (!perfmon_capable() && > + event_hw_flags_set_cx(event); > + if (!event_hw_flags_has_cx(event) && > (reg & (BIT(SYS_PMSCR_EL1_PA_SHIFT) | > BIT(SYS_PMSCR_EL1_CX_SHIFT) | > BIT(SYS_PMSCR_EL1_PCT_SHIFT)))) From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 139ABC433EF for ; Tue, 12 Jul 2022 07:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:From:References:Cc:To:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=L3LNcNP9Ah5NSfIewPa3LbrPdszVelG8SOmeTz61UIU=; b=ACfoCzIGUeEYSADh7YcExbqhCo C9M3kqjXUNDP4GQPWF35tebYgIvZGTbk8F8lR1sai0bw64SYHsjnG42k2yKKSx6IeM8QtihMd/wf9 8Xi95Kq2xQsoodON6p2qC8kmhxV3AQsv9AsCE0NgAod64NW4Zh5ZWcHVmvJmivyKEmVF40amBfp2w Ntn5W7YooHtm/r74VeHizehX373TTp38ZjKG4b8HslPmSdl0AFymsOEwFR1gDFfWcpXfDiz/f4yFX iiDGYN7eSIwMnOOS89ys35HzJuOTpc2SBAsrcg3n2UVucr9AYo6VypLx/pCfLvr3JDhHLiZcc6Bqg rANaDy1w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBAeK-008TEG-8J; Tue, 12 Jul 2022 07:49:40 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBAeF-008T9u-5Z for linux-arm-kernel@lists.infradead.org; Tue, 12 Jul 2022 07:49:37 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B30A21516; Tue, 12 Jul 2022 00:49:29 -0700 (PDT) Received: from [10.1.29.134] (e127744.cambridge.arm.com [10.1.29.134]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 885A93F73D; Tue, 12 Jul 2022 00:49:27 -0700 (PDT) Subject: Re: [PATCH] drivers/perf: arm_spe: Fix consistency of SYS_PMSCR_EL1.CX To: Anshuman Khandual , linux-arm-kernel@lists.infradead.org Cc: james.clark@arm.com, suzuki.poulose@arm.com, Will Deacon , Mark Rutland , linux-kernel@vger.kernel.org, Leo Yan References: <20220712051404.2546851-1-anshuman.khandual@arm.com> From: German Gomez Message-ID: <42caa18b-6287-0cfe-90c6-e47ec1709154@arm.com> Date: Tue, 12 Jul 2022 08:49:07 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 MIME-Version: 1.0 In-Reply-To: <20220712051404.2546851-1-anshuman.khandual@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220712_004935_368650_8E46A9BF X-CRM114-Status: GOOD ( 30.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Thanks for reworking the patch, Anshuman, On 12/07/2022 06:14, Anshuman Khandual wrote: > The arm_spe_pmu driver will enable SYS_PMSCR_EL1.CX in order to add CONTEXT > packets into the traces, if the owner of the perf event runs with required > capabilities i.e CAP_PERFMON or CAP_SYS_ADMIN via perfmon_capable() helper. > > The value of this bit is computed in the arm_spe_event_to_pmscr() function > but the check for capabilities happens in the pmu event init callback i.e > arm_spe_pmu_event_init(). This suggests that the value of the CX bit should > remain consistent for the duration of the perf session. > > However, the function arm_spe_event_to_pmscr() may be called later during > the event start callback i.e arm_spe_pmu_start() when the "current" process > is not the owner of the perf session, hence the CX bit setting is currently > not consistent. > > One way to fix this, is by caching the required value of the CX bit during > the initialization of the PMU event, so that it remains consistent for the > duration of the session. It uses currently unused 'event->hw.flags' element > to cache perfmon_capable() value, which can be referred during event start > callback to compute SYS_PMSCR_EL1.CX. This ensures consistent availability > of context packets in the trace as per event owner capabilities. > > Cc: Will Deacon > Cc: Mark Rutland > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Anshuman Khandual I'll add the Fixes tag, which I forgot to add in the prev version (I think it's the right one :) Fixed: cea7d0d4a59b ("drivers/perf: Open access for CAP_PERFMON privileged process") > --- > This applies on v5.19-rc6 and built on an earlier version posted by German > https://lore.kernel.org/all/20220117124432.3119132-1-german.gomez@arm.com/ > > drivers/perf/arm_spe_pmu.c | 25 +++++++++++++++++++++++-- > 1 file changed, 23 insertions(+), 2 deletions(-) > > diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c > index db670b265897..011e98428233 100644 > --- a/drivers/perf/arm_spe_pmu.c > +++ b/drivers/perf/arm_spe_pmu.c > @@ -39,6 +39,26 @@ > #include > #include > > +/* > + * event.hw.flags remain unused for events created for this > + * PMU driver. A single bit there i.e BIT(0), could be used > + * to remember initiating process's perfmon_capable() value > + * which can be subsequently used to enable SYS_PMSCR_EL.CX > + * thus enabling context information in the trace. > + */ > +#define SPE_PMU_HW_FLAGS_CX BIT(0) > + > +static void event_hw_flags_set_cx(struct perf_event *event) > +{ > + if (perfmon_capable()) > + event->hw.flags |= SPE_PMU_HW_FLAGS_CX; > +} > + > +static bool event_hw_flags_has_cx(struct perf_event *event) > +{ > + return !!(event->hw.flags & SPE_PMU_HW_FLAGS_CX); > +} > + > #define ARM_SPE_BUF_PAD_BYTE 0 > > struct arm_spe_pmu_buf { > @@ -272,7 +292,7 @@ static u64 arm_spe_event_to_pmscr(struct perf_event *event) > if (!attr->exclude_kernel) > reg |= BIT(SYS_PMSCR_EL1_E1SPE_SHIFT); > > - if (IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR) && perfmon_capable()) > + if (IS_ENABLED(CONFIG_PID_IN_CONTEXTIDR) && event_hw_flags_has_cx(event)) > reg |= BIT(SYS_PMSCR_EL1_CX_SHIFT); > > return reg; > @@ -710,7 +730,8 @@ static int arm_spe_pmu_event_init(struct perf_event *event) > return -EOPNOTSUPP; > > reg = arm_spe_event_to_pmscr(event); > - if (!perfmon_capable() && > + event_hw_flags_set_cx(event); > + if (!event_hw_flags_has_cx(event) && > (reg & (BIT(SYS_PMSCR_EL1_PA_SHIFT) | > BIT(SYS_PMSCR_EL1_CX_SHIFT) | > BIT(SYS_PMSCR_EL1_PCT_SHIFT)))) _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel