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@linux.ibm.com>
Closes: https://lore.kernel.org/all/339e2b3e-c7ee-418f-a84c-9c6360dc570b@linux.ibm.com
Signed-off-by: Nysal Jan K.A. <nysal@linux.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

On 02/05/25 4:41 pm, Nysal Jan K.A. wrote:
> 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@linux.ibm.com>
> Closes: https://lore.kernel.org/all/339e2b3e-c7ee-418f-a84c-9c6360dc570b@linux.ibm.com
> Signed-off-by: Nysal Jan K.A. <nysal@linux.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();


Tested this patch, and with this, build is successful. Hence,


Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com>


Regards,

Venkat.