perf/x86/cstate: Add ICELAKE_X and ICELAKE_D support
Subsystems (2)
PATCH RESEND 1/1 perf/x86/cstate: Add ICELAKE_X and ICELAKE_D support
Introduce icx_cstates for ICELAKE_X and ICELAKE_D, and also update the comments.
On ICELAKE_X and ICELAKE_D, Core C1, Core C6, Package C2 and Package C6 Residency MSRs are supported.
This patch has been tested on real hardware.
Signed-off-by Zhang Rui <[email protected]>
Acked-by Artem Bityutskiy <[email protected]>
Reviewed-by Kan Liang <[email protected]>
--- arch/x86/events/intel/cstate.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
arch/x86/events/intel/cstate.c +17 -6
@@ -40,7 +40,7 @@* Model specific counters: * MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 -* Available model: SLM,AMT,GLM,CNL,TNT,ADL +* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01
@@ -50,8 +50,8 @@* MSR_CORE_C6_RESIDENCY: CORE C6 Residency Counter * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, -* SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL, -* TNT,RKL,ADL +* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, +* TGL,TNT,RKL,ADL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03
@@ -61,7 +61,7 @@* MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, -* KBL,CML,ICL,TGL,TNT,RKL,ADL +* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01
@@ -72,8 +72,8 @@* 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,TGL, -* TNT,RKL,ADL +* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, +* TGL,TNT,RKL,ADL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03
@@ -566,6 +566,14 @@ static const struct cstate_model icl_cstates __initconst = { BIT(PERF_CSTATE_PKG_C10_RES), }; +static const struct cstate_model icx_cstates__initconst = { + .core_events =BIT (PERF_CSTATE_CORE_C1_RES ) | +BIT (PERF_CSTATE_CORE_C6_RES ), + + .pkg_events =BIT (PERF_CSTATE_PKG_C2_RES ) | +BIT (PERF_CSTATE_PKG_C6_RES ), +}; +static const struct cstate_model adl_cstates__initconst = { .core_events =BIT (PERF_CSTATE_CORE_C1_RES ) | BIT(PERF_CSTATE_CORE_C6_RES) |
@@ -664,6 +672,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_L , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ICELAKE , &icl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_X , &icx_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_D , &icx_cstates), +X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE_L , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE , &icl_cstates), X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &icl_cstates),
Signature · 1 line
2.17.1
The following commit has been merged into the perf/urgent branch of tip:
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 87bf399f86ecf36cc84fbeb7027a2995af649d6e Gitweb: https://git.kernel.org/tip/87bf399f86ecf36cc84fbeb7027a2995af649d6e Author: Zhang Rui <[email protected]> AuthorDate: Fri, 25 Jun 2021 21:32:47 +08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Fri, 02 Jul 2021 15:58:33 +02:00
perf/x86/cstate: Add ICELAKE_X and ICELAKE_D support
Introduce icx_cstates for ICELAKE_X and ICELAKE_D, and also update the comments.
On ICELAKE_X and ICELAKE_D, Core C1, Core C6, Package C2 and Package C6 Residency MSRs are supported.
This patch has been tested on real hardware.
Signed-off-by Zhang Rui <[email protected]>
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Reviewed-by Kan Liang <[email protected]>
Acked-by Artem Bityutskiy <[email protected]>
--- arch/x86/events/intel/cstate.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-)
arch/x86/events/intel/cstate.c +17 -6
@@ -40,7 +40,7 @@* Model specific counters: * MSR_CORE_C1_RES: CORE C1 Residency Counter * perf code: 0x00 -* Available model: SLM,AMT,GLM,CNL,TNT,ADL +* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL * Scope: Core (each processor core has a MSR) * MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter * perf code: 0x01
@@ -50,8 +50,8 @@* MSR_CORE_C6_RESIDENCY: CORE C6 Residency Counter * perf code: 0x02 * Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW, -* SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL, -* TNT,RKL,ADL +* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, +* TGL,TNT,RKL,ADL * Scope: Core * MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter * perf code: 0x03
@@ -61,7 +61,7 @@* MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter. * perf code: 0x00 * Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL, -* KBL,CML,ICL,TGL,TNT,RKL,ADL +* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL * Scope: Package (physical package) * MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter. * perf code: 0x01
@@ -72,8 +72,8 @@* 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,TGL, -* TNT,RKL,ADL +* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX, +* TGL,TNT,RKL,ADL * Scope: Package (physical package) * MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter. * perf code: 0x03
@@ -566,6 +566,14 @@ static const struct cstate_model icl_cstates __initconst = { BIT(PERF_CSTATE_PKG_C10_RES), }; +static const struct cstate_model icx_cstates__initconst = { + .core_events =BIT (PERF_CSTATE_CORE_C1_RES ) | +BIT (PERF_CSTATE_CORE_C6_RES ), + + .pkg_events =BIT (PERF_CSTATE_PKG_C2_RES ) | +BIT (PERF_CSTATE_PKG_C6_RES ), +}; +static const struct cstate_model adl_cstates__initconst = { .core_events =BIT (PERF_CSTATE_CORE_C1_RES ) | BIT(PERF_CSTATE_CORE_C6_RES) |
@@ -664,6 +672,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_L , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (ICELAKE , &icl_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_X , &icx_cstates), +X86_MATCH_INTEL_FAM6_MODEL (ICELAKE_D , &icx_cstates), +X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE_L , &icl_cstates),X86_MATCH_INTEL_FAM6_MODEL (TIGERLAKE , &icl_cstates), X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &icl_cstates),