Message ID | 83b65c432db89df0427c2d55e09c643264299f08.1685619571.git.robin.murphy@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 k13csp271846vqr; Thu, 1 Jun 2023 05:12:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Opx8n1O51g0qJIL62U404kiOwDgwDuDIz//dmg3rJuyhbqBWJGl89ny69uaka8z8V6GD/ X-Received: by 2002:a05:6a20:7295:b0:10c:4a13:a5cf with SMTP id o21-20020a056a20729500b0010c4a13a5cfmr1809773pzk.6.1685621548245; Thu, 01 Jun 2023 05:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685621548; cv=none; d=google.com; s=arc-20160816; b=DZ0Keth1+l2PSuk8fX8DKGVvbKqTrTudDGdY5Ba6ce6itEPMWBqM/w5/u3OkCuEn/K aDqBqA3W3CWjuNhpBZ7aeSvCboh8dmtBl7OFu6VNuxbfKfsgFmP8QVAfiXMtSnqi6XLB sXbMWb3xWDxVrQLr7ejC1+MAr/OHIVtX8viGmietC3cuRQczsIaFPr61ZGr+c6xAtIFs ImGR/VkMXPPrj/B3jGHaKnv0pAPMKHrI05L+kTF+jgdlF70iDOGcW9kOQN3Ch0kCYGU3 4REd4f7rxAANYu+I4ZOVc6ABiAvyjHDo4ap46UfsEOLcSC/Fz26SciyIP/4pu0Uue3Dg Jm2A== 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=JrKKJpeEXxrsm//wPXs9nIWlZIF1tvLcAvlFabNsPVQ=; b=ziQKehj3O8/7tw7R2qZNcSnOakAj7Ink6UCbL7Nv4riFFPyy3SfBH7AfSJGQJLhHrY jti+MYK2gR5t/LJ/ECQjbmoXWJ2yF2AHbtMDv8ebbIGb51i/5enwjAoZLqjbw9MdN45n HPGjo3qn5fiXaUTdqeVtIlA18SWg+yOglZ1/4KRhC7Ob1M40pMjUYq9LTLUBt1JqOGam /xgPD4OxloG6JvvyCYSETuXShDLJY7fXdWHbOfqAT+gow9hOxZslnHXzl/idV1HIt0jB A3CTijyL2Zk6M21t3N6cOrxUaLKCLpSJx3Pf7ReANzPzHGuhiyiC1YKuFadeFmOGonkQ p3DA== 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 g139-20020a625291000000b0064d72c9a2d8si5451066pfb.53.2023.06.01.05.12.15; Thu, 01 Jun 2023 05:12:28 -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 S233006AbjFAL7m (ORCPT <rfc822;limurcpp@gmail.com> + 99 others); Thu, 1 Jun 2023 07:59:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232874AbjFAL7k (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 1 Jun 2023 07:59:40 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E70BEFC for <linux-kernel@vger.kernel.org>; Thu, 1 Jun 2023 04:59:39 -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 19041169C; Thu, 1 Jun 2023 05:00:25 -0700 (PDT) Received: from e121345-lin.cambridge.arm.com (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A6E553F7D8; Thu, 1 Jun 2023 04:59:38 -0700 (PDT) From: Robin Murphy <robin.murphy@arm.com> To: will@kernel.org Cc: mark.rutland@arm.com, suzuki.poulose@arm.com, bwicaksono@nvidia.com, ilkka@os.amperecomputing.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] perf/arm_cspmu: Fix event attribute type Date: Thu, 1 Jun 2023 12:59:29 +0100 Message-Id: <83b65c432db89df0427c2d55e09c643264299f08.1685619571.git.robin.murphy@arm.com> X-Mailer: git-send-email 2.39.2.101.g768bb238c484.dirty In-Reply-To: <cover.1685619571.git.robin.murphy@arm.com> References: <cover.1685619571.git.robin.murphy@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?1767502300709276112?= X-GMAIL-MSGID: =?utf-8?q?1767502300709276112?= |
Series |
perf/arm_cspmu: Fixes and cleanups
|
|
Commit Message
Robin Murphy
June 1, 2023, 11:59 a.m. UTC
ARM_CSPMU_EVENT_ATTR() defines a struct perf_pmu_events_attr, so
arm_cspmu_sysfs_event_show() should not be interpreting it as struct
dev_ext_attribute.
Fixes: e37dfd65731d ("perf: arm_cspmu: Add support for ARM CoreSight PMU driver")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
---
drivers/perf/arm_cspmu/arm_cspmu.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Comments
On 01/06/2023 12:59, Robin Murphy wrote: > ARM_CSPMU_EVENT_ATTR() defines a struct perf_pmu_events_attr, so > arm_cspmu_sysfs_event_show() should not be interpreting it as struct > dev_ext_attribute. > > Fixes: e37dfd65731d ("perf: arm_cspmu: Add support for ARM CoreSight PMU driver") > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > drivers/perf/arm_cspmu/arm_cspmu.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c > index a3f1c410b417..72dc7a9e1ca8 100644 > --- a/drivers/perf/arm_cspmu/arm_cspmu.c > +++ b/drivers/perf/arm_cspmu/arm_cspmu.c > @@ -189,10 +189,10 @@ static inline bool use_64b_counter_reg(const struct arm_cspmu *cspmu) > ssize_t arm_cspmu_sysfs_event_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > - struct dev_ext_attribute *eattr = > - container_of(attr, struct dev_ext_attribute, attr); > - return sysfs_emit(buf, "event=0x%llx\n", > - (unsigned long long)eattr->var); > + struct perf_pmu_events_attr *pmu_attr; > + > + pmu_attr = container_of(attr, typeof(*pmu_attr), attr); > + return sysfs_emit(buf, "event=0x%llx\n", pmu_attr->id); > } Thanks for catching this ! The other option would be to, which was the original intention. diff --git a/drivers/perf/arm_cspmu/arm_cspmu.h b/drivers/perf/arm_cspmu/arm_cspmu.h index 51323b175a4a..b5e454be95b3 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.h +++ b/drivers/perf/arm_cspmu/arm_cspmu.h @@ -32,7 +32,7 @@ ARM_CSPMU_EXT_ATTR(_name, arm_cspmu_sysfs_format_show, (char *)_config) #define ARM_CSPMU_EVENT_ATTR(_name, _config) \ - PMU_EVENT_ATTR_ID(_name, arm_cspmu_sysfs_event_show, _config) + ARM_CSPMU_EXT_ATTR(_name, arm_cspmu_sysfs_event_show, (void*)(unsigned long)_config) /* Default event id mask */ Either way, Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
On Thu, 1 Jun 2023, Robin Murphy wrote: > ARM_CSPMU_EVENT_ATTR() defines a struct perf_pmu_events_attr, so > arm_cspmu_sysfs_event_show() should not be interpreting it as struct > dev_ext_attribute. > > Fixes: e37dfd65731d ("perf: arm_cspmu: Add support for ARM CoreSight PMU driver") > Signed-off-by: Robin Murphy <robin.murphy@arm.com> Reviewed-and-tested-by: Ilkka Koskinen <ilkka@os.amperecomputing.com> > --- > drivers/perf/arm_cspmu/arm_cspmu.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c > index a3f1c410b417..72dc7a9e1ca8 100644 > --- a/drivers/perf/arm_cspmu/arm_cspmu.c > +++ b/drivers/perf/arm_cspmu/arm_cspmu.c > @@ -189,10 +189,10 @@ static inline bool use_64b_counter_reg(const struct arm_cspmu *cspmu) > ssize_t arm_cspmu_sysfs_event_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > - struct dev_ext_attribute *eattr = > - container_of(attr, struct dev_ext_attribute, attr); > - return sysfs_emit(buf, "event=0x%llx\n", > - (unsigned long long)eattr->var); > + struct perf_pmu_events_attr *pmu_attr; > + > + pmu_attr = container_of(attr, typeof(*pmu_attr), attr); > + return sysfs_emit(buf, "event=0x%llx\n", pmu_attr->id); > } > EXPORT_SYMBOL_GPL(arm_cspmu_sysfs_event_show); > > -- > 2.39.2.101.g768bb238c484.dirty > >
diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c index a3f1c410b417..72dc7a9e1ca8 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -189,10 +189,10 @@ static inline bool use_64b_counter_reg(const struct arm_cspmu *cspmu) ssize_t arm_cspmu_sysfs_event_show(struct device *dev, struct device_attribute *attr, char *buf) { - struct dev_ext_attribute *eattr = - container_of(attr, struct dev_ext_attribute, attr); - return sysfs_emit(buf, "event=0x%llx\n", - (unsigned long long)eattr->var); + struct perf_pmu_events_attr *pmu_attr; + + pmu_attr = container_of(attr, typeof(*pmu_attr), attr); + return sysfs_emit(buf, "event=0x%llx\n", pmu_attr->id); } EXPORT_SYMBOL_GPL(arm_cspmu_sysfs_event_show);