linux-kernel - [PATCH] watchdog: Fix the SOFTLOCKUP

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250502111120.282690-1-nysal@linux.ibm.com>
Date: Fri,  2 May 2025 16:41:20 +0530
From: "Nysal Jan K.A." <nysal@...ux.ibm.com>
To: Andrew Morton <akpm@...ux-foundation.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Venkat Rao Bagalkote <venkat88@...ux.ibm.com>
Cc: luogengkun@...weicloud.com, dianders@...omium.org,
        joel.granados@...nel.org, song@...nel.org,
        Thomas Gleixner <tglx@...utronix.de>,
        Madhavan Srinivasan <maddy@...ux.ibm.com>,
        LKML <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        linuxppc-dev@...ts.ozlabs.org, "Nysal Jan K.A." <nysal@...ux.ibm.com>
Subject: [PATCH] watchdog: Fix the SOFTLOCKUP_DETECTOR=n case

Update watchdog_thresh when SOFTLOCKUP_DETECTOR=n.
Additionally fix a build failure in this case as well.

Fixes: 0bff3dababb07 ("watchdog: fix watchdog may detect false positive of softlockup")
Reported-by: Venkat Rao Bagalkote <venkat88@...ux.ibm.com>
Closes: https://lore.kernel.org/all/339e2b3e-c7ee-418f-a84c-9c6360dc570b@linux.ibm.com
Signed-off-by: Nysal Jan K.A. <nysal@...ux.ibm.com>
---
The "Fixes:" SHA1 points to the commit in mm-nonmm-unstable and will need updating

 kernel/watchdog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/watchdog.c b/kernel/watchdog.c
index 80d1a1dae27..2d283e92be5 100644
--- a/kernel/watchdog.c
+++ b/kernel/watchdog.c
@@ -923,10 +923,12 @@ static __init void lockup_detector_setup(void)
 }
 
 #else /* CONFIG_SOFTLOCKUP_DETECTOR */
-static void __lockup_detector_reconfigure(void)
+static void __lockup_detector_reconfigure(bool thresh_changed)
 {
 	cpus_read_lock();
 	watchdog_hardlockup_stop();
+	if (thresh_changed)
+		watchdog_thresh = READ_ONCE(watchdog_thresh_next);
 	lockup_detector_update_enable();
 	watchdog_hardlockup_start();
 	cpus_read_unlock();
-- 
2.47.0