Skip to contentSkip to conversation

watchdog-handle-the-enodev-failure-case-of-lockup_detector_delay_init-separately.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Sep 2, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: watchdog: handle the ENODEV failure case of lockup_detector_delay_init() separately
has been removed from the -mm tree. Its filename was
watchdog-handle-the-enodev-failure-case-of-lockup_detector_delay_init-separately.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: Waiman Long <[email protected]>
Subject: watchdog: handle the ENODEV failure case of lockup_detector_delay_init() separately
Date: Fri, 2 Aug 2024 11:16:21 -0400

When watchdog_hardlockup_probe() is being called by lockup_detector_delay_init(), an error return of -ENODEV will happen for the arm64 arch when arch_perf_nmi_is_available() returns false. This means that NMI is not usable by the hard lockup detector and so has to be disabled. This can be considered a deficiency in that particular arm64 chip, but there is nothing we can do about it. That also means the following error will always be reported when the kernel boot up.

watchdog: Delayed init of the lockup detector failed: -19

The word "failed" itself has a connotation that there is something wrong with the kernel which is not really the case here. Handle this special ENODEV case separately and explain the reason behind disabling hard lockup detector without causing anxiety for those users who read the above message and wonder about it.

---

 kernel/watchdog.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/watchdog.c renamed from kernel/watchdog.c~watchdog-handle-the-enodev-failure-case-of-lockup_detector_delay_init-separately +4 -1
@@ -1203,7 +1203,10 @@ static void __init lockup_detector_delay
 
 	ret = watchdog_hardlockup_probe();
 	if (ret) {
-		pr_info("Delayed init of the lockup detector failed: %d\n", ret);
+		if (ret == -ENODEV)
+			pr_info("NMI not fully supported\n");
+		else
+			pr_info("Delayed init of the lockup detector failed: %d\n", ret);
 		pr_info("Hard watchdog permanently disabled\n");
 		return;
 	}

_

Patches currently in -mm which might be from [email protected] are