Skip to contentSkip to conversation

powerpc/perf: Exclude pmc5/6 from the irrelevant PMU group constraints

PATCH Applied Athira Rajeev 4 participants 5 messages Sep 21, 2020 – Oct 7, 2020 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 powerpc/perf: Exclude pmc5/6 from the irrelevant PMU group constraints

PMU counter support functions enforces event constraints for group of events to check if all events in a group can be monitored. Incase of event codes using PMC5 and PMC6 ( 500fa and 600f4 respectively ), not all constraints are applicable, say the threshold or sample bits. But current code includes pmc5 and pmc6 in some group constraints (like IC_DC Qualifier bits) which is actually not applicable and hence results in those events not getting counted when scheduled along with group of other events. Patch fixes this by excluding PMC5/6 from constraints which are not relevant for it.

Fixes 7ffd948 ("powerpc/perf: factor out power8 pmu functions")

---
Changes in v2:
- Added a block comment in the fix path explaining why the change is needed.

 arch/powerpc/perf/isa207-common.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/powerpc/perf/isa207-common.c +10 -0
index 964437a..12153da 100644
@@ -288,6 +288,15 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)
 
 		mask  |= CNST_PMC_MASK(pmc);
 		value |= CNST_PMC_VAL(pmc);
+
+		/*
+		 * PMC5 and PMC6 are used to count cycles and instructions
+		 * and these doesnot support most of the constraint bits.
+		 * Add a check to exclude PMC5/6 from most of the constraints
+		 * except for ebb/bhrb.
+		 */
+		if (pmc >= 5)
+			goto ebb_bhrb;
 	}
 
 	if (pmc <= 4) {
@@ -357,6 +366,7 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)
 		}
 	}
 
+ebb_bhrb:
 	if (!pmc && ebb)
 		/* EBB events must specify the PMC */
 		return -1;
Signature · 1 line
1.8.3.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Athira Rajeev

PMU counter support functions enforces event constraints for group of events to check if all events in a group can be monitored. Incase of event codes using PMC5 and PMC6 ( 500fa and 600f4 respectively ), not all constraints are applicable, say the threshold or sample bits. But current code includes pmc5 and pmc6 in some group constraints (like IC_DC Qualifier bits) which is actually not applicable and hence results in those events not getting counted when scheduled along with group of other events. Patch fixes this by excluding PMC5/6 from constraints which are not relevant for it.

Changes looks fine to me.

we need to CC this in Stable too.

Quoted 38 lines
Fixes 7ffd948 ("powerpc/perf: factor out power8 pmu functions")

---
Changes in v2:
- Added a block comment in the fix path explaining why the change is needed.

  arch/powerpc/perf/isa207-common.c | 10 ++++++++++
  1 file changed, 10 insertions(+)
arch/powerpc/perf/isa207-common.c +10 -0
index 964437a..12153da 100644
@@ -288,6 +288,15 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)
 
  		mask  |= CNST_PMC_MASK(pmc);
  		value |= CNST_PMC_VAL(pmc);
+
+		/*
+		 * PMC5 and PMC6 are used to count cycles and instructions
+		 * and these doesnot support most of the constraint bits.
+		 * Add a check to exclude PMC5/6 from most of the constraints
+		 * except for ebb/bhrb.
+		 */
+		if (pmc >= 5)
+			goto ebb_bhrb;
  	}
 
  	if (pmc <= 4) {
@@ -357,6 +366,7 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)
  		}
  	}
 
+ebb_bhrb:
  	if (!pmc && ebb)
  		/* EBB events must specify the PMC */
  		return -1;
#2 lore raw
In reply to Athira Rajeev

Just one nit in a comment below...
(and this is not worthy of tags like "reviewed-by" ;-)

Quoted 19 lines · Athira Rajeev

PMU counter support functions enforces event constraints for group of events to check if all events in a group can be monitored. Incase of event codes using PMC5 and PMC6 ( 500fa and 600f4 respectively ), not all constraints are applicable, say the threshold or sample bits. But current code includes pmc5 and pmc6 in some group constraints (like IC_DC Qualifier bits) which is actually not applicable and hence results in those events not getting counted when scheduled along with group of other events. Patch fixes this by excluding PMC5/6 from constraints which are not relevant for it.

Fixes 7ffd948 ("powerpc/perf: factor out power8 pmu functions")

---

arch/powerpc/perf/isa207-common.c +0 -0
index 964437a..12153da 100644

arch/powerpc/perf/isa207-common.c int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp) · line 294

Quoted 7 lines
arch/powerpc/perf/isa207-common.c +4 -0
@@ -288,6 +288,15 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)
 
 		mask  |= CNST_PMC_MASK(pmc);
 		value |= CNST_PMC_VAL(pmc);
+
+		/*
+		 * PMC5 and PMC6 are used to count cycles and instructions
+		 * and these doesnot support most of the constraint bits.

s/doesnot/do not/

arch/powerpc/perf/isa207-common.c int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp) · line 299

Quoted 5 lines
arch/powerpc/perf/isa207-common.c +5 -0
+		 * Add a check to exclude PMC5/6 from most of the constraints
+		 * except for ebb/bhrb.
+		 */
+		if (pmc >= 5)
+			goto ebb_bhrb;

PC

#3 lore raw
Quoted 28 lines · Paul A. Clarke

Just one nit in a comment below...
(and this is not worthy of tags like "reviewed-by" ;-)

Quoted 20 lines · Athira Rajeev

PMU counter support functions enforces event constraints for group of events to check if all events in a group can be monitored. Incase of event codes using PMC5 and PMC6 ( 500fa and 600f4 respectively ), not all constraints are applicable, say the threshold or sample bits. But current code includes pmc5 and pmc6 in some group constraints (like IC_DC Qualifier bits) which is actually not applicable and hence results in those events not getting counted when scheduled along with group of other events. Patch fixes this by excluding PMC5/6 from constraints which are not relevant for it.

Fixes 7ffd948 ("powerpc/perf: factor out power8 pmu functions")

---

arch/powerpc/perf/isa207-common.c +0 -0
index 964437a..12153da 100644
@@ -288,6 +288,15 @@ int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp)
 
Quoted 8 lines

arch/powerpc/perf/isa207-common.c int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp) · line 294

Quoted 6 lines
arch/powerpc/perf/isa207-common.c +4 -0
 		mask  |= CNST_PMC_MASK(pmc);
 		value |= CNST_PMC_VAL(pmc);
+
+		/*
+		 * PMC5 and PMC6 are used to count cycles and instructions
+		 * and these doesnot support most of the constraint bits.

s/doesnot/do not/

Hi Paul,

Thanks for checking the patch and sharing the comment.

Athira

Quoted 8 lines

arch/powerpc/perf/isa207-common.c int isa207_get_constraint(u64 event, unsigned long *maskp, unsigned long *valp) · line 299

Quoted 6 lines
arch/powerpc/perf/isa207-common.c +5 -0
+		 * Add a check to exclude PMC5/6 from most of the constraints
+		 * except for ebb/bhrb.
+		 */
+		if (pmc >= 5)
+			goto ebb_bhrb;

PC

#4 lore raw
In reply to Athira Rajeev
Quoted 9 lines · Athira Rajeev

PMU counter support functions enforces event constraints for group of events to check if all events in a group can be monitored. Incase of event codes using PMC5 and PMC6 ( 500fa and 600f4 respectively ), not all constraints are applicable, say the threshold or sample bits. But current code includes pmc5 and pmc6 in some group constraints (like IC_DC Qualifier bits) which is actually not applicable and hence results in those events not getting counted when scheduled along with group of other events. Patch fixes this by excluding PMC5/6 from constraints which are not relevant for it.

Applied to powerpc/next.

[1/1] powerpc/perf: Exclude pmc5/6 from the irrelevant PMU group constraints

      https://git.kernel.org/powerpc/c/3b6c3adbb2fa42749c3d38cfc4d4d0b7e096bb7b

cheers