perf/x86/intel: Use rdmsrl_safe when initializing RAPL PMU.
Subsystems (2)
PATCH 1/1 perf/x86/intel: Use rdmsrl_safe when initializing RAPL PMU.
CPUs which should support the RAPL counters according to Family/Model/Stepping may still issue #GP when attempting to access the RAPL MSRs. This may happen when Linux is running under KVM and we are passing-through host F/M/S data, for example. Use rdmsrl_safe to first access the RAPL_POWER_UNIT MSR; if this fails, do not attempt to use this PMU.
Signed-off-by Venkatesh Srinivas <[email protected]>
--- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/x86/kernel/cpu/perf_event_intel_rapl.c +9 -3
@@ -511,6 +511,7 @@ static int rapl_cpu_prepare(int cpu)struct rapl_pmu *pmu =per_cpu (rapl_pmu, cpu);int phys_id =topology_physical_package_id (cpu);u64 ms; +u64 msr_rapl_power_unit_bits;if (pmu)return 0 ;
@@ -518,6 +519,9 @@ static int rapl_cpu_prepare(int cpu)if (phys_id <0 )return -1 ; +if (!rdmsrl_safe (MSR_RAPL_POWER_UNIT , &msr_rapl_power_unit_bits)) +return -1 ; + pmu =kzalloc_node (sizeof (*pmu),GFP_KERNEL ,cpu_to_node (cpu));if (!pmu)return -1 ;
@@ -531,8 +535,7 @@ static int rapl_cpu_prepare(int cpu)* * we cache in local PMU instance */ -rdmsrl (MSR_RAPL_POWER_UNIT , pmu->hw_unit); - pmu->hw_unit = (pmu->hw_unit >>8 ) &0x1FULL ; + pmu->hw_unit = (msr_rapl_power_unit_bits >>8 ) &0x1FULL ; pmu->pmu = &rapl_pmu_class;/*
@@ -649,7 +652,9 @@ static int __init rapl_pmu_init(void)get_online_cpus ();for_each_online_cpu (cpu) { -rapl_cpu_prepare (cpu); + ret =rapl_cpu_prepare (cpu); +if (ret) + goto out;rapl_cpu_init (cpu); }
@@ -672,6 +677,7 @@ static int __init rapl_pmu_init(void)hweight32 (rapl_cntr_mask), ktime_to_ms(pmu->timer_interval)); +out:put_online_cpus ();return 0 ;
Signature · 1 line
1.9.0.279.gdc9e3eb