* [PATCH 2/3] perf/x86/intel/cstate: Add Arrowlake support
2024-04-19 7:10 [PATCH 1/3] perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake Zhang Rui
@ 2024-04-19 7:10 ` Zhang Rui
2024-04-19 7:10 ` [PATCH 3/3] perf/x86/intel/cstate: Add Lunarlake support Zhang Rui
2024-04-19 13:57 ` [PATCH 1/3] perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake Liang, Kan
2 siblings, 0 replies; 4+ messages in thread
From: Zhang Rui @ 2024-04-19 7:10 UTC (permalink / raw)
To: peterz
Cc: mingo, tglx, bp, dave.hansen, x86, linux-perf-users, linux-kernel,
ak, kan.liang
Like Alderlake, Arrowlake supports CC1/CC6/CC7 and PC2/PC3/PC6/PC8/PC10.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
arch/x86/events/intel/cstate.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index b304430ba64a..22e8f2687349 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -41,7 +41,7 @@
* MSR_CORE_C1_RES: CORE C1 Residency Counter
* perf code: 0x00
* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL
- * MTL,SRF,GRR
+ * MTL,SRF,GRR,ARL
* Scope: Core (each processor core has a MSR)
* MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter
* perf code: 0x01
@@ -53,30 +53,31 @@
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
* TGL,TNT,RKL,ADL,RPL,SPR,MTL,SRF,
- * GRR
+ * GRR,ARL
* Scope: Core
* MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter
* perf code: 0x03
* Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML,
- * ICL,TGL,RKL,ADL,RPL,MTL
+ * ICL,TGL,RKL,ADL,RPL,MTL,ARL
* Scope: Core
* MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter.
* 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,ARL
* Scope: Package (physical package)
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
* perf code: 0x01
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL,
* GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL,
- * ADL,RPL,MTL
+ * ADL,RPL,MTL,ARL
* Scope: Package (physical package)
* MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter.
* perf code: 0x02
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
- * TGL,TNT,RKL,ADL,RPL,SPR,MTL,SRF
+ * TGL,TNT,RKL,ADL,RPL,SPR,MTL,SRF,
+ * ARL
* Scope: Package (physical package)
* MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.
* perf code: 0x03
@@ -86,7 +87,7 @@
* MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter.
* perf code: 0x04
* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL,
- * ADL,RPL,MTL
+ * ADL,RPL,MTL,ARL
* Scope: Package (physical package)
* MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter.
* perf code: 0x05
@@ -95,7 +96,7 @@
* MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
* perf code: 0x06
* Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL,
- * TNT,RKL,ADL,RPL,MTL
+ * TNT,RKL,ADL,RPL,MTL,ARL
* Scope: Package (physical package)
* MSR_MODULE_C6_RES_MS: Module C6 Residency Counter.
* perf code: 0x00
@@ -765,6 +766,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_cstates),
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &adl_cstates),
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &adl_cstates),
+ X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, &adl_cstates),
+ X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, &adl_cstates),
{ },
};
MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] perf/x86/intel/cstate: Add Lunarlake support
2024-04-19 7:10 [PATCH 1/3] perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake Zhang Rui
2024-04-19 7:10 ` [PATCH 2/3] perf/x86/intel/cstate: Add Arrowlake support Zhang Rui
@ 2024-04-19 7:10 ` Zhang Rui
2024-04-19 13:57 ` [PATCH 1/3] perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake Liang, Kan
2 siblings, 0 replies; 4+ messages in thread
From: Zhang Rui @ 2024-04-19 7:10 UTC (permalink / raw)
To: peterz
Cc: mingo, tglx, bp, dave.hansen, x86, linux-perf-users, linux-kernel,
ak, kan.liang
Compared with previous client platforms, PC8 is removed from Lunarlake.
It supports CC1/CC6/CC7 and PC2/PC3/PC6/PC10 residency counters.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
arch/x86/events/intel/cstate.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 22e8f2687349..2500a89fcb7c 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -41,7 +41,7 @@
* MSR_CORE_C1_RES: CORE C1 Residency Counter
* perf code: 0x00
* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL
- * MTL,SRF,GRR,ARL
+ * MTL,SRF,GRR,ARL,LNL
* Scope: Core (each processor core has a MSR)
* MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter
* perf code: 0x01
@@ -53,31 +53,31 @@
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
* TGL,TNT,RKL,ADL,RPL,SPR,MTL,SRF,
- * GRR,ARL
+ * GRR,ARL,LNL
* Scope: Core
* MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter
* perf code: 0x03
* Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML,
- * ICL,TGL,RKL,ADL,RPL,MTL,ARL
+ * ICL,TGL,RKL,ADL,RPL,MTL,ARL,LNL
* Scope: Core
* MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter.
* 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
+ * RPL,SPR,MTL,ARL,LNL
* Scope: Package (physical package)
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
* perf code: 0x01
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL,
* GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL,
- * ADL,RPL,MTL,ARL
+ * ADL,RPL,MTL,ARL,LNL
* Scope: Package (physical package)
* MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter.
* perf code: 0x02
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
* TGL,TNT,RKL,ADL,RPL,SPR,MTL,SRF,
- * ARL
+ * ARL,LNL
* Scope: Package (physical package)
* MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.
* perf code: 0x03
@@ -96,7 +96,7 @@
* MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
* perf code: 0x06
* Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL,
- * TNT,RKL,ADL,RPL,MTL,ARL
+ * TNT,RKL,ADL,RPL,MTL,ARL,LNL
* Scope: Package (physical package)
* MSR_MODULE_C6_RES_MS: Module C6 Residency Counter.
* perf code: 0x00
@@ -646,6 +646,17 @@ static const struct cstate_model adl_cstates __initconst = {
BIT(PERF_CSTATE_PKG_C10_RES),
};
+static const struct cstate_model lnl_cstates __initconst = {
+ .core_events = BIT(PERF_CSTATE_CORE_C1_RES) |
+ BIT(PERF_CSTATE_CORE_C6_RES) |
+ BIT(PERF_CSTATE_CORE_C7_RES),
+
+ .pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |
+ BIT(PERF_CSTATE_PKG_C3_RES) |
+ BIT(PERF_CSTATE_PKG_C6_RES) |
+ BIT(PERF_CSTATE_PKG_C10_RES),
+};
+
static const struct cstate_model slm_cstates __initconst = {
.core_events = BIT(PERF_CSTATE_CORE_C1_RES) |
BIT(PERF_CSTATE_CORE_C6_RES),
@@ -768,6 +779,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &adl_cstates),
X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE, &adl_cstates),
X86_MATCH_INTEL_FAM6_MODEL(ARROWLAKE_H, &adl_cstates),
+ X86_MATCH_INTEL_FAM6_MODEL(LUNARLAKE_M, &lnl_cstates),
{ },
};
MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake
2024-04-19 7:10 [PATCH 1/3] perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake Zhang Rui
2024-04-19 7:10 ` [PATCH 2/3] perf/x86/intel/cstate: Add Arrowlake support Zhang Rui
2024-04-19 7:10 ` [PATCH 3/3] perf/x86/intel/cstate: Add Lunarlake support Zhang Rui
@ 2024-04-19 13:57 ` Liang, Kan
2 siblings, 0 replies; 4+ messages in thread
From: Liang, Kan @ 2024-04-19 13:57 UTC (permalink / raw)
To: Zhang Rui, peterz
Cc: mingo, tglx, bp, dave.hansen, x86, linux-perf-users, linux-kernel,
ak
On 2024-04-19 3:10 a.m., Zhang Rui wrote:
> The spec changes after the patch submitted and PC7/PC9 are removed from
> Alderlake and later client platforms.
>
> Remove PC7/PC9 support in cstate PMU.
>
> Fixes: d0ca946bcf84 ("perf/x86/cstate: Add Alder Lake CPU support")
> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
The series looks good to me.
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Thanks,
Kan
> ---
> arch/x86/events/intel/cstate.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
> index 326c8cd5aa2d..b304430ba64a 100644
> --- a/arch/x86/events/intel/cstate.c
> +++ b/arch/x86/events/intel/cstate.c
> @@ -81,7 +81,7 @@
> * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.
> * perf code: 0x03
> * Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL,
> - * KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL
> + * KBL,CML,ICL,TGL,RKL
> * Scope: Package (physical package)
> * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter.
> * perf code: 0x04
> @@ -90,8 +90,7 @@
> * Scope: Package (physical package)
> * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter.
> * perf code: 0x05
> - * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL,
> - * ADL,RPL,MTL
> + * Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL
> * Scope: Package (physical package)
> * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
> * perf code: 0x06
> @@ -642,9 +641,7 @@ static const struct cstate_model adl_cstates __initconst = {
> .pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |
> BIT(PERF_CSTATE_PKG_C3_RES) |
> BIT(PERF_CSTATE_PKG_C6_RES) |
> - BIT(PERF_CSTATE_PKG_C7_RES) |
> BIT(PERF_CSTATE_PKG_C8_RES) |
> - BIT(PERF_CSTATE_PKG_C9_RES) |
> BIT(PERF_CSTATE_PKG_C10_RES),
> };
>
^ permalink raw reply [flat|nested] 4+ messages in thread