Skip to contentSkip to conversation

perf/smmuv3: Don't cast parameter in bit operations

PATCH Applied Andy Shevchenko 3 participants 3 messages Feb 9, 2022 – Feb 15, 2022 Arm PMU profiling and debugging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf/smmuv3: Don't cast parameter in bit operations

While in this particular case it would not be a (critical) issue, the pattern itself is bad and error prone in case somebody blindly copies to their code.

Don't cast parameter to unsigned long pointer in the bit operations. Instead copy to a local variable on stack of a proper type and use.

Note, new compilers might warn on this line for potential outbound access.

Fixes 7d839b4b9e00 ("perf/smmuv3: Add arm64 smmuv3 pmu driver")
---
 drivers/perf/arm_smmuv3_pmu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/perf/arm_smmuv3_pmu.c +3 -1
index c49108a72865..00d4c45a8017 100644
@@ -654,6 +654,7 @@ static int smmu_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)
 static irqreturn_t smmu_pmu_handle_irq(int irq_num, void *data)
 {
 	struct smmu_pmu *smmu_pmu = data;
+	DECLARE_BITMAP(ovs, BITS_PER_TYPE(u64));
 	u64 ovsr;
 	unsigned int idx;
 
@@ -663,7 +664,8 @@ static irqreturn_t smmu_pmu_handle_irq(int irq_num, void *data)
 
 	writeq(ovsr, smmu_pmu->reloc_base + SMMU_PMCG_OVSCLR0);
 
-	for_each_set_bit(idx, (unsigned long *)&ovsr, smmu_pmu->num_counters) {
+	bitmap_from_u64(ovs, ovsr);
+	for_each_set_bit(idx, ovs, smmu_pmu->num_counters) {
 		struct perf_event *event = smmu_pmu->events[idx];
 		struct hw_perf_event *hwc;
 
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Andy Shevchenko

While in this particular case it would not be a (critical) issue, the pattern itself is bad and error prone in case somebody blindly copies to their code.

Don't cast parameter to unsigned long pointer in the bit operations. Instead copy to a local variable on stack of a proper type and use.

Seems reasonable, in fact in my build it appears to save a spill and reload from the stack so the code actually gets a teeny bit better. Not sure a cleanup warrants a "Fixes" tag, but either way,

Quoted 30 lines

Note, new compilers might warn on this line for potential outbound access.

Fixes 7d839b4b9e00 ("perf/smmuv3: Add arm64 smmuv3 pmu driver")
---
  drivers/perf/arm_smmuv3_pmu.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
drivers/perf/arm_smmuv3_pmu.c +3 -1
index c49108a72865..00d4c45a8017 100644
@@ -654,6 +654,7 @@ static int smmu_pmu_offline_cpu(unsigned int cpu, struct hlist_node *node)
  static irqreturn_t smmu_pmu_handle_irq(int irq_num, void *data)
  {
  	struct smmu_pmu *smmu_pmu = data;
+	DECLARE_BITMAP(ovs, BITS_PER_TYPE(u64));
  	u64 ovsr;
  	unsigned int idx;
 
@@ -663,7 +664,8 @@ static irqreturn_t smmu_pmu_handle_irq(int irq_num, void *data)
 
  	writeq(ovsr, smmu_pmu->reloc_base + SMMU_PMCG_OVSCLR0);
 
-	for_each_set_bit(idx, (unsigned long *)&ovsr, smmu_pmu->num_counters) {
+	bitmap_from_u64(ovs, ovsr);
+	for_each_set_bit(idx, ovs, smmu_pmu->num_counters) {
  		struct perf_event *event = smmu_pmu->events[idx];
  		struct hw_perf_event *hwc;
 
maintainer Applied
#2 lore raw
In reply to Andy Shevchenko
Quoted 8 lines · Andy Shevchenko

While in this particular case it would not be a (critical) issue, the pattern itself is bad and error prone in case somebody blindly copies to their code.

Don't cast parameter to unsigned long pointer in the bit operations. Instead copy to a local variable on stack of a proper type and use.

[...]

Applied to will (for-joerg/arm-smmu/updates), thanks!

[1/1] perf/smmuv3: Don't cast parameter in bit operations

      https://git.kernel.org/will/c/8ddf4eff71e1

Cheers,

Signature · 5 lines
Will

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