[openwrt/openwrt] build: Replace KERNEL_LOCKUP_DETECTOR with KERNEL_SOFTLOCKUP_DETECTOR

LEDE Commits lede-commits at lists.infradead.org
Wed Sep 15 06:17:33 PDT 2021


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/f11cdd30065b241e51283a205dfc951d677e183b

commit f11cdd30065b241e51283a205dfc951d677e183b
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Sun Sep 12 12:56:48 2021 +0200

    build: Replace KERNEL_LOCKUP_DETECTOR with KERNEL_SOFTLOCKUP_DETECTOR
    
    The LOCKUP_DETECTOR configuration option split into the
    SOFTLOCKUP_DETECTOR and HARDLOCKUP_DETECTOR configuration option some
    time ago. The HARDLOCKUP_DETECTOR option is only working on some
    architectures, but SOFTLOCKUP_DETECTOR should work everywhere. Replace
    KERNEL_LOCKUP_DETECTOR with KERNEL_SOFTLOCKUP_DETECTOR.
    
    LOCKUP_DETECTOR will be selected by SOFTLOCKUP_DETECTOR automatically.
    
    Fixes: b951f53fbae3 ("build: Add additional kernel debug options")
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    (cherry picked from commit d27f6e2c5d2a2315cc8fe684d117c80aa9984ca8)
---
 config/Config-kernel.in | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index f71114b5da..d4648a5064 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -436,34 +436,22 @@ config KERNEL_PROVE_LOCKING
 	select KERNEL_DEBUG_KERNEL
 	default n
 
-config KERNEL_LOCKUP_DETECTOR
-	bool "Compile the kernel with detect Hard and Soft Lockups"
+config KERNEL_SOFTLOCKUP_DETECTOR
+	bool "Compile the kernel with detect Soft Lockups"
 	depends on KERNEL_DEBUG_KERNEL
 	help
 	  Say Y here to enable the kernel to act as a watchdog to detect
-	  hard and soft lockups.
+	  soft lockups.
 
 	  Softlockups are bugs that cause the kernel to loop in kernel
 	  mode for more than 20 seconds, without giving other tasks a
 	  chance to run.  The current stack trace is displayed upon
 	  detection and the system will stay locked up.
 
-	  Hardlockups are bugs that cause the CPU to loop in kernel mode
-	  for more than 10 seconds, without letting other interrupts have a
-	  chance to run.  The current stack trace is displayed upon detection
-	  and the system will stay locked up.
-
-	  The overhead should be minimal.  A periodic hrtimer runs to
-	  generate interrupts and kick the watchdog task every 4 seconds.
-	  An NMI is generated every 10 seconds or so to check for hardlockups.
-
-	  The frequency of hrtimer and NMI events and the soft and hard lockup
-	  thresholds can be controlled through the sysctl watchdog_thresh.
-
 config KERNEL_DETECT_HUNG_TASK
 	bool "Compile the kernel with detect Hung Tasks"
 	depends on KERNEL_DEBUG_KERNEL
-	default KERNEL_LOCKUP_DETECTOR
+	default KERNEL_SOFTLOCKUP_DETECTOR
 	help
 	  Say Y here to enable the kernel to detect "hung tasks",
 	  which are bugs that cause the task to be stuck in



More information about the lede-commits mailing list