Re: [PATCH] drivers/perf: Simplify the SMMUv3 PMU event attributes

[Will Deacon]

On Mon, 8 Feb 2021 21:04:58 +0800, Qi Liu wrote:
> For each PMU event, there is a SMMU_EVENT_ATTR(xx, XX) and
> _event_attr_xx.attr.attr. Let's redefine the SMMU_EVENT_ATTR
> to simplify the smmu_pmu_events.

Applied to will (for-next/perf), thanks!

[1/1] drivers/perf: Simplify the SMMUv3 PMU event attributes
  https://git.kernel.org/will/c/174744136dcb

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

[PATCH] drivers/perf: Simplify the SMMUv3 PMU event attributes

[Qi Liu]

For each PMU event, there is a SMMU_EVENT_ATTR(xx, XX) and
_event_attr_xx.attr.attr. Let's redefine the SMMU_EVENT_ATTR
to simplify the smmu_pmu_events.

Signed-off-by: Qi Liu 
---
 drivers/perf/arm_smmuv3_pmu.c | 32 +---
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
index 8ff7a67..4c8cb1b 100644
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -509,27 +509,21 @@ static ssize_t smmu_pmu_event_show(struct device *dev,
return sprintf(page, "event=0x%02llx\n", pmu_attr->id);
 }

-#define SMMU_EVENT_ATTR(name, config) \
-   PMU_EVENT_ATTR(name, smmu_event_attr_##name, \
-  config, smmu_pmu_event_show)
-SMMU_EVENT_ATTR(cycles, 0);
-SMMU_EVENT_ATTR(transaction, 1);
-SMMU_EVENT_ATTR(tlb_miss, 2);
-SMMU_EVENT_ATTR(config_cache_miss, 3);
-SMMU_EVENT_ATTR(trans_table_walk_access, 4);
-SMMU_EVENT_ATTR(config_struct_access, 5);
-SMMU_EVENT_ATTR(pcie_ats_trans_rq, 6);
-SMMU_EVENT_ATTR(pcie_ats_trans_passed, 7);
+#define SMMU_EVENT_ATTR(name, config)  \
+   (&((struct perf_pmu_events_attr) {  \
+   .attr = __ATTR(name, 0444, smmu_pmu_event_show, NULL),  \
+   .id = config,   \
+   }).attr.attr)

 static struct attribute *smmu_pmu_events[] = {
-   _event_attr_cycles.attr.attr,
-   _event_attr_transaction.attr.attr,
-   _event_attr_tlb_miss.attr.attr,
-   _event_attr_config_cache_miss.attr.attr,
-   _event_attr_trans_table_walk_access.attr.attr,
-   _event_attr_config_struct_access.attr.attr,
-   _event_attr_pcie_ats_trans_rq.attr.attr,
-   _event_attr_pcie_ats_trans_passed.attr.attr,
+   SMMU_EVENT_ATTR(cycles, 0),
+   SMMU_EVENT_ATTR(transaction, 1),
+   SMMU_EVENT_ATTR(tlb_miss, 2),
+   SMMU_EVENT_ATTR(config_cache_miss, 3),
+   SMMU_EVENT_ATTR(trans_table_walk_access, 4),
+   SMMU_EVENT_ATTR(config_struct_access, 5),
+   SMMU_EVENT_ATTR(pcie_ats_trans_rq, 6),
+   SMMU_EVENT_ATTR(pcie_ats_trans_passed, 7),
NULL
 };

--
2.8.1