Commit 2406e3b1 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

perf/x86/intel, watchdog/core: Sanitize PMU HT bug workaround

The lockup_detector_suspend/resume() interface is broken in several ways
especially as it results in recursive locking of the CPU hotplug lock.

Use the new stop/restart interface in the perf NMI watchdog to temporarily
disable and reenable the already active watchdog events. That's enough to
handle it.
Signed-off-by: default avatarPeter Zijlstra <>
Signed-off-by: default avatarThomas Gleixner <>
Reviewed-by: default avatarDon Zickus <>
Cc: Andrew Morton <>
Cc: Borislav Petkov <>
Cc: Chris Metcalf <>
Cc: Linus Torvalds <>
Cc: Nicholas Piggin <>
Cc: Sebastian Siewior <>
Cc: Ulrich Obergfell <>
Link: default avatarIngo Molnar <>
parent d0b6e0a8
......@@ -4409,10 +4409,9 @@ static __init int fixup_ht_bug(void)
return 0;
if (lockup_detector_suspend() != 0) {
pr_debug("failed to disable PMU erratum BJ122, BV98, HSD29 workaround\n");
return 0;
x86_pmu.flags &= ~(PMU_FL_EXCL_CNTRS | PMU_FL_EXCL_ENABLED);
......@@ -4420,9 +4419,7 @@ static __init int fixup_ht_bug(void)
x86_pmu.commit_scheduling = NULL;
x86_pmu.stop_scheduling = NULL;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment