[tip: perf/urgent] perf/x86/amd/core: Avoid register reset when CPU is dead

From: tip-bot2 for Sandipan Das
Date: Wed Mar 13 2024 - 06:23:01 EST


The following commit has been merged into the perf/urgent branch of tip:

Commit-ID: ad8c91282c95f801c37812d59d2d9eba6899b384
Gitweb: https://git.kernel.org/tip/ad8c91282c95f801c37812d59d2d9eba6899b384
Author: Sandipan Das <sandipan.das@xxxxxxx>
AuthorDate: Mon, 29 Jan 2024 16:36:26 +05:30
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Wed, 13 Mar 2024 11:01:30 +01:00

perf/x86/amd/core: Avoid register reset when CPU is dead

When bringing a CPU online, some of the PMC and LBR related registers
are reset. The same is done when a CPU is taken offline although that
is unnecessary. This currently happens in the "cpu_dead" callback which
is also incorrect as the callback runs on a control CPU instead of the
one that is being taken offline. This also affects hibernation and
suspend to RAM on some platforms as reported in the link below.

Fixes: 21d59e3e2c40 ("perf/x86/amd/core: Detect PerfMonV2 support")
Reported-by: Mario Limonciello <mario.limonciello@xxxxxxx>
Signed-off-by: Sandipan Das <sandipan.das@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/550a026764342cf7e5812680e3e2b91fe662b5ac.1706526029.git.sandipan.das@xxxxxxx
---
arch/x86/events/amd/core.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c
index 69a3b02..aec16e5 100644
--- a/arch/x86/events/amd/core.c
+++ b/arch/x86/events/amd/core.c
@@ -604,7 +604,6 @@ 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;