The patch titled
Subject: kernel/watchdog_hld.c: fix spurious hard lockups
has been removed from the -mm tree. Its filename was
kernel-watchdog-fix-spurious-hard-lockups.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Kan Liang <Kan.liang@xxxxxxxxx>
Subject: kernel/watchdog_hld.c: fix spurious hard lockups
Some users reported spurious NMI watchdog timeouts.
We now have more and more systems where the Turbo range is wide enough
that the NMI watchdog expires faster than the soft watchdog timer that
updates the interrupt tick the NMI watchdog relies on.
This problem was originally added by 58687acba592 ("lockup_detector:
Combine nmi_watchdog and softlockup detector"). Previously the NMI
watchdog would always check jiffies, which were ticking fast enough. But
now the backing is quite slow so the expire time becomes more sensitive.
For mainline the right fix is to switch the NMI watchdog to reference
cycles, which tick always at the same rate independent of turbo mode. But
this is requires some complicated changes in perf, which are too difficult
to backport. Since we need a stable fix too just increase the NMI
watchdog rate here to avoid the spurious timeouts. This is not an ideal
fix because a 3x as large Turbo range could still fail, but for now that's
not likely.
The right fix for mainline can be found here.
perf/x86/intel: enable CPU ref_cycles for GP counter
perf/x86/intel, watchdog: Switch NMI watchdog to ref cycles on x86
https://patchwork.kernel.org/patch/9779087/
https://patchwork.kernel.org/patch/9779089/
Link: http://lkml.kernel.org/r/20170620213309.30051-1-kan.liang@xxxxxxxxx
Fixes: 58687acba592 ("lockup_detector: Combine nmi_watchdog and softlockup detector")
Signed-off-by: Kan Liang <Kan.liang@xxxxxxxxx>
Cc: Don Zickus <dzickus@xxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Babu Moger <babu.moger@xxxxxxxxxx>
Cc: Aaron Tomlin <atomlin@xxxxxxxxxx>
Cc: Prarit Bhargava <prarit@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Stephane Eranian <eranian@xxxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/watchdog_hld.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN kernel/watchdog_hld.c~kernel-watchdog-fix-spurious-hard-lockups kernel/watchdog_hld.c
--- a/kernel/watchdog_hld.c~kernel-watchdog-fix-spurious-hard-lockups
+++ a/kernel/watchdog_hld.c
@@ -164,7 +164,7 @@ int watchdog_nmi_enable(unsigned int cpu
firstcpu = 1;
wd_attr = &wd_hw_attr;
- wd_attr->sample_period = hw_nmi_get_sample_period(watchdog_thresh);
+ wd_attr->sample_period = 3 * hw_nmi_get_sample_period(watchdog_thresh);
/* Try to register using hardware perf events */
event = perf_event_create_kernel_counter(wd_attr, cpu, NULL, watchdog_overflow_callback, NULL);
_
Patches currently in -mm which might be from Kan.liang@xxxxxxxxx are