perf/x86/amd/core: Fix overflow reset on hotplug
Subsystems (3)
PATCH 1/1 perf/x86/amd/core: Fix overflow reset on hotplug
Kernels older than v5.19 do not support PerfMonV2 and the PMI handler does not clear the overflow bits of the PerfCntrGlobalStatus register. Because of this, loading a recent kernel using kexec from an older kernel can result in inconsistent register states on Zen 4 systems.
The PMI handler of the new kernel gets confused and shows a warning when an overflow occurs because some of the overflow bits are set even if the corresponding counters are inactive. These are remnants from overflows that were handled by the older kernel.
During CPU hotplug, the PerfCntrGlobalCtl and PerfCntrGlobalStatus registers should always be cleared for PerfMonV2-capable processors. However, a condition used for NB event constaints applicable only to older processors currently prevents this from happening. Move the reset sequence to an appropriate place and also clear the LBR Freeze bit.
--- arch/x86/events/amd/core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
arch/x86/events/amd/core.c +8 -6
@@ -534,8 +534,12 @@ static void amd_pmu_cpu_reset(int cpu)/* Clear enable bits i.e. PerfCntrGlobalCtl.PerfCntrEn */ wrmsrl (MSR_AMD64_PERF_CNTR_GLOBAL_CTL ,0 ); -/* Clear overflow bits i.e. PerfCntrGLobalStatus.PerfCntrOvfl */ -wrmsrl (MSR_AMD64_PERF_CNTR_GLOBAL_STATUS_CLR , amd_pmu_global_cntr_mask); +/* +* Clear freeze and overflow bits i.e. PerfCntrGLobalStatus.LbrFreeze +* and PerfCntrGLobalStatus.PerfCntrOvfl +*/ +wrmsrl (MSR_AMD64_PERF_CNTR_GLOBAL_STATUS_CLR , +GLOBAL_STATUS_LBRS_FROZEN | amd_pmu_global_cntr_mask); }static int amd_pmu_cpu_prepare (int cpu)
@@ -570,6 +574,7 @@ static void amd_pmu_cpu_starting(int cpu)int i, nb_id; cpuc->perf_ctr_virt_mask =AMD64_EVENTSEL_HOSTONLY ; +amd_pmu_cpu_reset (cpu);if (!x86_pmu.amd_nb_constraints)return ;
@@ -591,8 +596,6 @@ static void amd_pmu_cpu_starting(int cpu) cpuc->amd_nb->nb_id = nb_id; cpuc->amd_nb->refcnt++; - -amd_pmu_cpu_reset (cpu); }static void amd_pmu_cpu_dead (int cpu)
@@ -601,6 +604,7 @@ static void amd_pmu_cpu_dead(int cpu)kfree (cpuhw->lbr_sel); cpuhw->lbr_sel =NULL ; +amd_pmu_cpu_reset (cpu);if (!x86_pmu.amd_nb_constraints)return ;
@@ -613,8 +617,6 @@ static void amd_pmu_cpu_dead(int cpu) cpuhw->amd_nb =NULL ; } - -amd_pmu_cpu_reset (cpu); }static inline void amd_pmu_set_global_ctl (u64 ctl)
Signature · 1 line
2.34.1
kernel test robot
build botFYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Rule: 'Cc: [email protected]' or 'commit <sha1> upstream.'
Subject: [PATCH] perf/x86/amd/core: Fix overflow reset on hotplug
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki