| Message ID | 20230531040428.501523-4-anshuman.khandual@arm.com |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2629608vqr;
Tue, 30 May 2023 21:24:13 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ4BhI8tgHBPxe3rgt3Be3NhI1eFWRR5NOgSoFh7P1ONJJM0sL5yMX92RJYObu7OlI3dfkH0
X-Received: by 2002:a81:4857:0:b0:559:fad8:322f with SMTP id
v84-20020a814857000000b00559fad8322fmr5184262ywa.24.1685507053418;
Tue, 30 May 2023 21:24:13 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1685507053; cv=none;
d=google.com; s=arc-20160816;
b=AU/SkjipWHL76U+86cDOboJr99UkF5MllqWtKE0AGis5UcFocVeGaTAIAGZsRXKgzz
Cj00bPSjTbADJDRMoXcgsfIC88eIc7qsC3qSjpOKqoJDCS/jld+T2nEPAWVdyRGrmR9K
Te2HpmnHbIyV/oTV67595akakj6OnCe7r2Fv+rrdMh0eLMyGY3gE5bODJ85Q759eVZkq
grp84sNB9yv771YgKY+BxC6fXcCAwx0IKtFMxMcM2bLC2+u1VfkQhpDW/BcyXf2TTsf8
LkJvRTDTkqqRQwEuwJ+66x5oFCGtr4pC30pZ17XZ2kQxX+vYEqeGvdZzpzi4alPNpxqo
f5TQ==
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;
bh=l0HnQnNZwsWsfI4gRo2iE+eSfqSupzLQCthMtHdjT8A=;
b=OoNJYDJaV01aWGuEAIkBFv9N7+rj1IePoGmsNpdKRcgSaJj8XI7tcsbBWmKDE/4v9q
6v1wxeGVPcrC14nXQx5I2sSqHkc92b4NmcV5tHz91toYCX8X7tYuvaRP0yJK5WoDfgh3
9G41mqLpAR92dBioJdrWdyT4gwiQQST7ta5Fuo3p93TODe0tFf6knIkadUSa1YJOo+DR
cnho2Wkul16xaedngTIrBQf7aWwC4xl5e6ePWK6x00vp6alrtJHKVCq2gH31FJnyn37Q
/nq+kzEPZdSU358+d1VG0Ya/JoG+tjeH1JB410/xo+FCSE6ogLU8pxDfCVytZlajs19M
47cw==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
h13-20020a056a00000d00b0064d5c5d72c5si2837204pfk.330.2023.05.30.21.24.01;
Tue, 30 May 2023 21:24:13 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S234238AbjEaEFj (ORCPT <rfc822;callmefire3@gmail.com>
+ 99 others); Wed, 31 May 2023 00:05:39 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54796 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S234040AbjEaEFY (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 31 May 2023 00:05:24 -0400
Received: from foss.arm.com (foss.arm.com [217.140.110.172])
by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6D436198;
Tue, 30 May 2023 21:05:14 -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 83F4515BF;
Tue, 30 May 2023 21:05:59 -0700 (PDT)
Received: from a077893.arm.com (unknown [10.163.73.163])
by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id
B60A63F6C4;
Tue, 30 May 2023 21:05:08 -0700 (PDT)
From: Anshuman Khandual <anshuman.khandual@arm.com>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com
Cc: Anshuman Khandual <anshuman.khandual@arm.com>,
Mark Brown <broonie@kernel.org>,
James Clark <james.clark@arm.com>,
Rob Herring <robh@kernel.org>, Marc Zyngier <maz@kernel.org>,
Suzuki Poulose <suzuki.poulose@arm.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-perf-users@vger.kernel.org
Subject: [PATCH V11 03/10] arm64/perf: Add branch stack support in struct
arm_pmu
Date: Wed, 31 May 2023 09:34:21 +0530
Message-Id: <20230531040428.501523-4-anshuman.khandual@arm.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20230531040428.501523-1-anshuman.khandual@arm.com>
References: <20230531040428.501523-1-anshuman.khandual@arm.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED,
SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1767382243680758804?=
X-GMAIL-MSGID: =?utf-8?q?1767382243680758804?=
|
| Series |
arm64/perf: Enable branch stack sampling
|
|
Commit Message
Anshuman Khandual
May 31, 2023, 4:04 a.m. UTC
This updates 'struct arm_pmu' for branch stack sampling support later. This adds a new 'features' element in the structure to track supported features, and another 'private' element to encapsulate implementation attributes on a given 'struct arm_pmu'. These updates here will help in tracking any branch stack sampling support, which is being added later. This also adds a helper arm_pmu_branch_stack_supported(). This also enables perf branch stack sampling event on all 'struct arm pmu', supporting the feature but after removing the current gate that blocks such events unconditionally in armpmu_event_init(). Instead a quick probe can be initiated via arm_pmu_branch_stack_supported() to ascertain the support. Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Tested-by: James Clark <james.clark@arm.com> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> --- drivers/perf/arm_pmu.c | 3 +-- include/linux/perf/arm_pmu.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-)
Comments
On Wed, May 31, 2023 at 09:34:21AM +0530, Anshuman Khandual wrote: > This updates 'struct arm_pmu' for branch stack sampling support later. This > adds a new 'features' element in the structure to track supported features, > and another 'private' element to encapsulate implementation attributes on a > given 'struct arm_pmu'. These updates here will help in tracking any branch > stack sampling support, which is being added later. This also adds a helper > arm_pmu_branch_stack_supported(). > > This also enables perf branch stack sampling event on all 'struct arm pmu', > supporting the feature but after removing the current gate that blocks such > events unconditionally in armpmu_event_init(). Instead a quick probe can be > initiated via arm_pmu_branch_stack_supported() to ascertain the support. > > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Tested-by: James Clark <james.clark@arm.com> > Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> > --- > drivers/perf/arm_pmu.c | 3 +-- > include/linux/perf/arm_pmu.h | 12 +++++++++++- > 2 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c > index aada47e3b126..d4a4f2bd89a5 100644 > --- a/drivers/perf/arm_pmu.c > +++ b/drivers/perf/arm_pmu.c > @@ -510,8 +510,7 @@ static int armpmu_event_init(struct perf_event *event) > !cpumask_test_cpu(event->cpu, &armpmu->supported_cpus)) > return -ENOENT; > > - /* does not support taken branch sampling */ > - if (has_branch_stack(event)) > + if (has_branch_stack(event) && !arm_pmu_branch_stack_supported(armpmu)) > return -EOPNOTSUPP; > > return __hw_perf_event_init(event); > diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h > index f7fbd162ca4c..0da745eaf426 100644 > --- a/include/linux/perf/arm_pmu.h > +++ b/include/linux/perf/arm_pmu.h > @@ -102,7 +102,9 @@ struct arm_pmu { > int (*map_event)(struct perf_event *event); > void (*sched_task)(struct perf_event_pmu_context *pmu_ctx, bool sched_in); > int num_events; > - bool secure_access; /* 32-bit ARM only */ > + unsigned int secure_access : 1, /* 32-bit ARM only */ > + has_branch_stack: 1, /* 64-bit ARM only */ > + reserved : 30; > #define ARMV8_PMUV3_MAX_COMMON_EVENTS 0x40 > DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS); > #define ARMV8_PMUV3_EXT_COMMON_EVENT_BASE 0x4000 > @@ -118,8 +120,16 @@ struct arm_pmu { > > /* Only to be used by ACPI probing code */ > unsigned long acpi_cpuid; > + > + /* Implementation specific attributes */ > + void *private; > }; > > +static inline bool arm_pmu_branch_stack_supported(struct arm_pmu *armpmu) > +{ > + return armpmu->has_branch_stack; > +} Since this is a trivial test, and we already access the 'secure_access' field directly, I'd prefer we removed this helper and directly accessesed arm_pmu::has_branch_stack, e.g. with the logic in armpmu_event_init() being: if (has_branch_stack(event) && !armpmu->has_branch_stack) return -EOPNOTSUPP; With that: Acked-by: Mark Rutland <mark.rutland@arm.com> Mark.
On 6/5/23 13:28, Mark Rutland wrote: > On Wed, May 31, 2023 at 09:34:21AM +0530, Anshuman Khandual wrote: >> This updates 'struct arm_pmu' for branch stack sampling support later. This >> adds a new 'features' element in the structure to track supported features, >> and another 'private' element to encapsulate implementation attributes on a >> given 'struct arm_pmu'. These updates here will help in tracking any branch >> stack sampling support, which is being added later. This also adds a helper >> arm_pmu_branch_stack_supported(). >> >> This also enables perf branch stack sampling event on all 'struct arm pmu', >> supporting the feature but after removing the current gate that blocks such >> events unconditionally in armpmu_event_init(). Instead a quick probe can be >> initiated via arm_pmu_branch_stack_supported() to ascertain the support. >> >> Cc: Catalin Marinas <catalin.marinas@arm.com> >> Cc: Will Deacon <will@kernel.org> >> Cc: Mark Rutland <mark.rutland@arm.com> >> Cc: linux-arm-kernel@lists.infradead.org >> Cc: linux-kernel@vger.kernel.org >> Tested-by: James Clark <james.clark@arm.com> >> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com> >> --- >> drivers/perf/arm_pmu.c | 3 +-- >> include/linux/perf/arm_pmu.h | 12 +++++++++++- >> 2 files changed, 12 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c >> index aada47e3b126..d4a4f2bd89a5 100644 >> --- a/drivers/perf/arm_pmu.c >> +++ b/drivers/perf/arm_pmu.c >> @@ -510,8 +510,7 @@ static int armpmu_event_init(struct perf_event *event) >> !cpumask_test_cpu(event->cpu, &armpmu->supported_cpus)) >> return -ENOENT; >> >> - /* does not support taken branch sampling */ >> - if (has_branch_stack(event)) >> + if (has_branch_stack(event) && !arm_pmu_branch_stack_supported(armpmu)) >> return -EOPNOTSUPP; >> >> return __hw_perf_event_init(event); >> diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h >> index f7fbd162ca4c..0da745eaf426 100644 >> --- a/include/linux/perf/arm_pmu.h >> +++ b/include/linux/perf/arm_pmu.h >> @@ -102,7 +102,9 @@ struct arm_pmu { >> int (*map_event)(struct perf_event *event); >> void (*sched_task)(struct perf_event_pmu_context *pmu_ctx, bool sched_in); >> int num_events; >> - bool secure_access; /* 32-bit ARM only */ >> + unsigned int secure_access : 1, /* 32-bit ARM only */ >> + has_branch_stack: 1, /* 64-bit ARM only */ >> + reserved : 30; >> #define ARMV8_PMUV3_MAX_COMMON_EVENTS 0x40 >> DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS); >> #define ARMV8_PMUV3_EXT_COMMON_EVENT_BASE 0x4000 >> @@ -118,8 +120,16 @@ struct arm_pmu { >> >> /* Only to be used by ACPI probing code */ >> unsigned long acpi_cpuid; >> + >> + /* Implementation specific attributes */ >> + void *private; >> }; >> >> +static inline bool arm_pmu_branch_stack_supported(struct arm_pmu *armpmu) >> +{ >> + return armpmu->has_branch_stack; >> +} > > Since this is a trivial test, and we already access the 'secure_access' field > directly, I'd prefer we removed this helper and directly accessesed > arm_pmu::has_branch_stack, e.g. with the logic in armpmu_event_init() being: > > if (has_branch_stack(event) && !armpmu->has_branch_stack) > return -EOPNOTSUPP; Sure, will drop the helper and change as suggested in all the call sites. > > With that: > > Acked-by: Mark Rutland <mark.rutland@arm.com> > > Mark.
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index aada47e3b126..d4a4f2bd89a5 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -510,8 +510,7 @@ static int armpmu_event_init(struct perf_event *event) !cpumask_test_cpu(event->cpu, &armpmu->supported_cpus)) return -ENOENT; - /* does not support taken branch sampling */ - if (has_branch_stack(event)) + if (has_branch_stack(event) && !arm_pmu_branch_stack_supported(armpmu)) return -EOPNOTSUPP; return __hw_perf_event_init(event); diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index f7fbd162ca4c..0da745eaf426 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -102,7 +102,9 @@ struct arm_pmu { int (*map_event)(struct perf_event *event); void (*sched_task)(struct perf_event_pmu_context *pmu_ctx, bool sched_in); int num_events; - bool secure_access; /* 32-bit ARM only */ + unsigned int secure_access : 1, /* 32-bit ARM only */ + has_branch_stack: 1, /* 64-bit ARM only */ + reserved : 30; #define ARMV8_PMUV3_MAX_COMMON_EVENTS 0x40 DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS); #define ARMV8_PMUV3_EXT_COMMON_EVENT_BASE 0x4000 @@ -118,8 +120,16 @@ struct arm_pmu { /* Only to be used by ACPI probing code */ unsigned long acpi_cpuid; + + /* Implementation specific attributes */ + void *private; }; +static inline bool arm_pmu_branch_stack_supported(struct arm_pmu *armpmu) +{ + return armpmu->has_branch_stack; +} + #define to_arm_pmu(p) (container_of(p, struct arm_pmu, pmu)) u64 armpmu_event_update(struct perf_event *event);