perf/x86/rapl: Fix Haswell and Broadwell server RAPL event
Subsystems (2)
PATCH 1/1 perf/x86/rapl: Fix Haswell and Broadwell server RAPL event
From: Kan Liang <[email protected]>
Perf-fuzzer triggers non-existent MSR access in RAPL driver on Haswell-EX.
Haswell/Broadwell server and client have differnt RAPL events. Since 'commit 7f2236d0bf9a ("perf/x86/rapl: Use Intel family macros for RAPL")', it accidentally assign RAPL client events to server.
Signed-off-by Kan Liang <[email protected]>
--- arch/x86/events/intel/rapl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/events/intel/rapl.c +2 -2
@@ -755,14 +755,14 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {X86_RAPL_MODEL_MATCH (INTEL_FAM6_IVYBRIDGE_X , snbep_rapl_init),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_CORE , hsw_rapl_init), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , hsw_rapl_init), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_X , hsx_rapl_init),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_ULT , hsw_rapl_init),X86_RAPL_MODEL_MATCH (INTEL_FAM6_HASWELL_GT3E , hsw_rapl_init),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_CORE , hsw_rapl_init),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_GT3E , hsw_rapl_init),X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_X , hsx_rapl_init), -X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , hsw_rapl_init), +X86_RAPL_MODEL_MATCH (INTEL_FAM6_BROADWELL_XEON_D , hsx_rapl_init),X86_RAPL_MODEL_MATCH (INTEL_FAM6_XEON_PHI_KNL , knl_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_XEON_PHI_KNM, knl_rapl_init),
Signature · 1 line
2.7.4
Peter Zijlstra
maintainerQuoted 8 lines · On Thu, Jan 11, 2018 at 11:15:43AM -0800, [email protected] wrote:
From: Kan Liang <[email protected]>
Perf-fuzzer triggers non-existent MSR access in RAPL driver on Haswell-EX.
Haswell/Broadwell server and client have differnt RAPL events. Since 'commit
7f2236d0bf9a("perf/x86/rapl: Use Intel family macros for RAPL")', it accidentally assign RAPL client events to server.
Thanks!