perf/x86/intel: Update KBL Package C-state events
Subsystems (3)
PATCH 1/1 perf/x86/intel: Update KBL Package C-state events
Kaby Lake (and Coffee Lake) has PC8/PC9/PC10 residency counters.
This patch updates the list of PMU event counters that allows user space tool to profile them through perf interface.
Signed-off-by Harry Pan <[email protected]>
---
arch/x86/events/intel/cstate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/events/intel/cstate.c +5 -5
@@ -76,15 +76,15 @@* Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 -* Available model: HSW ULT,CNL +* Available model: HSW ULT,KBL,CNL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 -* Available model: HSW ULT,CNL +* Available model: HSW ULT,KBL,CNL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 -* Available model: HSW ULT,GLM,CNL +* Available model: HSW ULT,KBL,GLM,CNL * Scope: Package (physical package) * */
@@ -572,8 +572,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_DESKTOP , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_DESKTOP , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_DESKTOP , hswult_cstates), X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_MOBILE, cnl_cstates),
Signature · 1 line
2.20.1
tip-bot for Harry Pan
merge bot[tip:perf/urgent] perf/x86/intel: Update KBL Package C-state events to also include PC8/PC9/PC10 counters
perf/x86/intel: Update KBL Package C-state events to also include PC8/PC9/PC10 counters
Commit-ID: 82c99f7a81f28f8c1be5f701c8377d14c4075b10 Gitweb: https://git.kernel.org/tip/82c99f7a81f28f8c1be5f701c8377d14c4075b10 Author: Harry Pan <[email protected]> AuthorDate: Wed, 24 Apr 2019 22:50:33 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 25 Apr 2019 08:59:31 +0200
perf/x86/intel: Update KBL Package C-state events to also include PC8/PC9/PC10 counters
Kaby Lake (and Coffee Lake) has PC8/PC9/PC10 residency counters.
This patch updates the list of Kaby/Coffee Lake PMU event counters from the snb_cstates[] list of events to the hswult_cstates[] list of events, which keeps all previously supported events and also adds the PKG_C8, PKG_C9 and PKG_C10 residency counters.
This allows user space tools to profile them through the perf interface.
Signed-off-by Harry Pan <[email protected]>
Cc <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vince Weaver <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/events/intel/cstate.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/events/intel/cstate.c +5 -5
@@ -76,15 +76,15 @@* Scope: Package (physical package) * MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter. * perf code: 0x04 -* Available model: HSW ULT,CNL +* Available model: HSW ULT,KBL,CNL * Scope: Package (physical package) * MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter. * perf code: 0x05 -* Available model: HSW ULT,CNL +* Available model: HSW ULT,KBL,CNL * Scope: Package (physical package) * MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter. * perf code: 0x06 -* Available model: HSW ULT,GLM,CNL +* Available model: HSW ULT,KBL,GLM,CNL * Scope: Package (physical package) * */
@@ -566,8 +566,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_DESKTOP , snb_cstates),X86_CSTATES_MODEL (INTEL_FAM6_SKYLAKE_X , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , snb_cstates), -X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_DESKTOP , snb_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_MOBILE , hswult_cstates), +X86_CSTATES_MODEL (INTEL_FAM6_KABYLAKE_DESKTOP , hswult_cstates), X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_MOBILE, cnl_cstates),