* [merged mm-nonmm-stable] watchdog-if-panicking-and-we-dumped-everything-dont-re-enable-dumping.patch removed from -mm tree
@ 2023-12-29 20:23 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2023-12-29 20:23 UTC (permalink / raw)
To: mm-commits, pmladek, lizhe.67, lecopzer.chen, kernelfans,
john.ogness, dianders, akpm
The quilt patch titled
Subject: watchdog: if panicking and we dumped everything, don't re-enable dumping
has been removed from the -mm tree. Its filename was
watchdog-if-panicking-and-we-dumped-everything-dont-re-enable-dumping.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Douglas Anderson <dianders@chromium.org>
Subject: watchdog: if panicking and we dumped everything, don't re-enable dumping
Date: Wed, 20 Dec 2023 13:15:37 -0800
If, as part of handling a hardlockup or softlockup, we've already dumped
all CPUs and we're just about to panic, don't reenable dumping and give
some other CPU a chance to hop in there and add some confusing logs right
as the panic is happening.
Link: https://lkml.kernel.org/r/20231220131534.4.Id3a9c7ec2d7d83e4080da6f8662ba2226b40543f@changeid
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Cc: John Ogness <john.ogness@linutronix.de>
Cc: Lecopzer Chen <lecopzer.chen@mediatek.com>
Cc: Li Zhe <lizhe.67@bytedance.com>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Pingfan Liu <kernelfans@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
kernel/watchdog.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/kernel/watchdog.c~watchdog-if-panicking-and-we-dumped-everything-dont-re-enable-dumping
+++ a/kernel/watchdog.c
@@ -192,7 +192,8 @@ void watchdog_hardlockup_check(unsigned
if (sysctl_hardlockup_all_cpu_backtrace) {
trigger_allbutcpu_cpu_backtrace(cpu);
- clear_bit_unlock(0, &hard_lockup_nmi_warn);
+ if (!hardlockup_panic)
+ clear_bit_unlock(0, &hard_lockup_nmi_warn);
}
if (hardlockup_panic)
@@ -548,7 +549,8 @@ static enum hrtimer_restart watchdog_tim
if (softlockup_all_cpu_backtrace) {
trigger_allbutcpu_cpu_backtrace(smp_processor_id());
- clear_bit_unlock(0, &soft_lockup_nmi_warn);
+ if (!softlockup_panic)
+ clear_bit_unlock(0, &soft_lockup_nmi_warn);
}
add_taint(TAINT_SOFTLOCKUP, LOCKDEP_STILL_OK);
_
Patches currently in -mm which might be from dianders@chromium.org are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-12-29 20:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-29 20:23 [merged mm-nonmm-stable] watchdog-if-panicking-and-we-dumped-everything-dont-re-enable-dumping.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.