watchdog-hardlockup-have_nmi_watchdog-must-implement-watchdog_hardlockup_probe.patch removed from -mm tree
The quilt patch titled
Subject: watchdog/hardlockup: HAVE_NMI_WATCHDOG must implement watchdog_hardlockup_probe()
has been removed from the -mm tree. Its filename was
watchdog-hardlockup-have_nmi_watchdog-must-implement-watchdog_hardlockup_probe.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 <[email protected]>
Subject: watchdog/hardlockup: HAVE_NMI_WATCHDOG must implement watchdog_hardlockup_probe()
Date: Fri, 26 May 2023 18:41:32 -0700
Right now there is one arch (sparc64) that selects HAVE_NMI_WATCHDOG without selecting HAVE_HARDLOCKUP_DETECTOR_ARCH. Because of that one architecture, we have some special case code in the watchdog core to handle the fact that watchdog_hardlockup_probe() isn't implemented.
Let's implement watchdog_hardlockup_probe() for sparc64 and get rid of the special case.
As a side effect of doing this, code inspection tells us that we could fix a minor bug where the system won't properly realize that NMI watchdogs are disabled. Specifically, on powerpc if CONFIG_PPC_WATCHDOG is turned off the arch might still select CONFIG_HAVE_HARDLOCKUP_DETECTOR_ARCH which selects CONFIG_HAVE_NMI_WATCHDOG. Since CONFIG_PPC_WATCHDOG was off then nothing will override the "weak" watchdog_hardlockup_probe() and we'll fallback to looking at CONFIG_HAVE_NMI_WATCHDOG.
---
arch/Kconfig | 3 ++- arch/sparc/kernel/nmi.c | 5 +++++ kernel/watchdog.c | 13 ------------- 3 files changed, 7 insertions(+), 14 deletions(-)
arch/Kconfig renamed from arch/Kconfig~watchdog-hardlockup-have_nmi_watchdog-must-implement-watchdog_hardlockup_probe +2 -1
@@ -405,7 +405,8 @@ config HAVE_NMI_WATCHDOG bool help The arch provides a low level NMI watchdog. It provides - asm/nmi.h, and defines its own arch_touch_nmi_watchdog(). + asm/nmi.h, and defines its own watchdog_hardlockup_probe() and + arch_touch_nmi_watchdog(). config HAVE_HARDLOCKUP_DETECTOR_ARCH bool
arch/sparc/kernel/nmi.c renamed from arch/sparc/kernel/nmi.c~watchdog-hardlockup-have_nmi_watchdog-must-implement-watchdog_hardlockup_probe +5 -0
@@ -65,6 +65,11 @@ void arch_touch_nmi_watchdog(void) }EXPORT_SYMBOL (arch_touch_nmi_watchdog); +int __init watchdog_hardlockup_probe (void ) +{ +return 0 ; +} +static void die_nmi (const char *str,struct pt_regs *regs,int do_panic) {int this_cpu =smp_processor_id ();
kernel/watchdog.c renamed from kernel/watchdog.c~watchdog-hardlockup-have_nmi_watchdog-must-implement-watchdog_hardlockup_probe +0 -13
@@ -217,19 +217,6 @@ void __weak watchdog_hardlockup_disable(*/ int __weak __init watchdog_hardlockup_probe (void ) { -/* -* If CONFIG_HAVE_NMI_WATCHDOG is defined then an architecture -* is assumed to have the hard watchdog available and we return 0. -*/ -if (IS_ENABLED (CONFIG_HAVE_NMI_WATCHDOG )) -return 0 ; - -/* -* Hardlockup detectors other than those using CONFIG_HAVE_NMI_WATCHDOG -* are required to implement a non-weak version of this probe function -* to tell whether they are available. If they don't override then -* we'll return -ENODEV. -*/ return -ENODEV ; }
_
Patches currently in -mm which might be from [email protected] are