Skip to contentSkip to conversation

perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

PATCH Superseded Zhenyu Wang 5 participants 8 messages May 6, 2024 – Jul 29, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest. So add it support in srf_cstates.

Cc Rui Zhang <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Wendy Wang <[email protected]>
Fixes 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
---
 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/events/intel/cstate.c +3 -2
index 08bba679678c..cdf44500783e 100644
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL
+ *						RPL,SPR,MTL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -689,7 +689,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };
Signature · 1 line
2.43.0
#1 lore raw

PATCH RESEND 1/1 perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest. So add it support in srf_cstates.

Cc Rui Zhang <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Wendy Wang <[email protected]>
Fixes 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
---
 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/events/intel/cstate.c +3 -2
index e64eaa8dda5a..4cd36848cfff 100644
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL
+ *						RPL,SPR,MTL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -683,7 +683,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };
Signature · 1 line
2.43.0
Tested-by on v1 1/1
#2 lore raw

Verified on SRF-SP, the Perf PC2 counter is updated:

[root@p-srf07 ~]# perf stat --per-socket -e cstate_pkg/c2-residency/ sleep 20

Performance counter stats for 'system wide':

S0        1      9,589,297,024      cstate_pkg/c2-residency/
S1        1     10,204,349,952      cstate_pkg/c2-residency/
      20.003533150 seconds time elapsed

[root@p-srf07 ~]# perf stat --per-socket -e cstate_pkg/c2-residency/ sleep 20

Performance counter stats for 'system wide':

S0        1      9,309,806,784      cstate_pkg/c2-residency/
S1        1     10,897,684,928      cstate_pkg/c2-residency/
      20.004747926 seconds time elapsed

-----Original Message-----
From: Zhenyu Wang <[email protected]>
Sent: Wednesday, May 15, 2024 11:22 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Zhang, Rui <[email protected]>; Bityutskiy, Artem <[email protected]>; Wang, Wendy <[email protected]>
Subject: [PATCH RESEND] perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest. So add it support in srf_cstates.

Cc Rui Zhang <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Wendy Wang <[email protected]>
Fixes 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
---
 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/events/intel/cstate.c +3 -2
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL
+ *						RPL,SPR,MTL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -683,7 +683,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };

--
2.43.0

#3 lore raw

PATCH RESEND 1/1 perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

In reply to Zhenyu Wang

Package C2 residency counter is also available on Sierra Forest. So add it support in srf_cstates.

Cc Rui Zhang <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Wendy Wang <[email protected]>
Fixes 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
---
 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/events/intel/cstate.c +3 -2
index 9d6e8f13d13a..b1a822af25d0 100644
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL
+ *						RPL,SPR,MTL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -684,7 +684,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };
Signature · 1 line
2.45.1
#4 lore raw

PATCH 1/1 perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest. So add it support in srf_cstates.

Cc Rui Zhang <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Wendy Wang <[email protected]>
Fixes 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")

---

Hi, Peter

This refresh resolved conflicts in comment against current tip tree. Please help to apply.

Thanks!

 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/events/intel/cstate.c +3 -2
index be58cfb012dd..9f116dfc4728 100644
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL,ARL,LNL
+ *						RPL,SPR,MTL,ARL,LNL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -693,7 +693,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };
Signature · 1 line
2.45.2
Reviewed-by on v1 1/1
#5 lore raw
Quoted 9 lines · Zhenyu Wang

Package C2 residency counter is also available on Sierra Forest. So add it support in srf_cstates.

Cc Rui Zhang <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Wendy Wang <[email protected]>
Fixes 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")

Thanks,
Kan

Quoted 35 lines

---

Hi, Peter

This refresh resolved conflicts in comment against current tip tree. Please help to apply.

Thanks!

 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/events/intel/cstate.c +3 -2
index be58cfb012dd..9f116dfc4728 100644
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL,ARL,LNL
+ *						RPL,SPR,MTL,ARL,LNL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -693,7 +693,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };
maintainer
#6 lore raw
In reply to Zhenyu Wang
Quoted 9 lines · Zhenyu Wang

Package C2 residency counter is also available on Sierra Forest. So add it support in srf_cstates.

Cc Rui Zhang <[email protected]>
Cc Artem Bityutskiy <[email protected]>
Cc Wendy Wang <[email protected]>
Fixes 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
Quoted 6 lines

---

Hi, Peter

This refresh resolved conflicts in comment against current tip tree. Please help to apply.

Ok, I have it now. I'll try and stick it into perf/urgent once -rc1 rolls around.

Quoted 30 lines
 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/events/intel/cstate.c +3 -2
index be58cfb012dd..9f116dfc4728 100644
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL,ARL,LNL
+ *						RPL,SPR,MTL,ARL,LNL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -693,7 +693,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };
Signature · 1 line
2.45.2
merge bot Applied
#7 lore raw
In reply to Zhenyu Wang
The following commit has been merged into the perf/core branch of tip:

The following commit has been merged into the perf/core branch of tip:

Commit-ID:     b1d0e15c8725d21a73c22c099418a63940261041
Gitweb:        https://git.kernel.org/tip/b1d0e15c8725d21a73c22c099418a63940261041
Author:        Zhenyu Wang <[email protected]>
AuthorDate:    Wed, 17 Jul 2024 11:16:09 +08:00
Committer:     Peter Zijlstra <[email protected]>
CommitterDate: Mon, 29 Jul 2024 12:16:22 +02:00

perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest. So add it support in srf_cstates.

Fixes 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
---
 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/events/intel/cstate.c +3 -2
index be58cfb..9f116df 100644
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL,ARL,LNL
+ *						RPL,SPR,MTL,ARL,LNL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -693,7 +693,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };