p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'core-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull watchdog core update from Thomas Gleixner:
 "A single commit adding a command line parameter which allows to set
  the watchdog threshold on the kernel command-line, so kernels with
  massive debug facilities enabled won't trigger the watchdog during
  early boot and before the threshold can be changed via sysctl"

* 'core-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  watchdog/core: Add watchdog_thresh command line parameter
This commit is contained in:
Linus Torvalds 2019-03-10 13:46:08 -07:00
parent dbbdf54c72 1129505552
commit 077d3dafe6
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/admin-guide/kernel-parameters.txt
View File

@ -5078,6 +5078,14 @@
or other driver-specific files in the or other driver-specific files in the
Documentation/watchdog/ directory. Documentation/watchdog/ directory.
watchdog_thresh=
[KNL]
Set the hard lockup detector stall duration
threshold in seconds. The soft lockup detector
threshold is set to twice the value. A value of 0
disables both lockup detectors. Default is 10
seconds.
workqueue.watchdog_thresh= workqueue.watchdog_thresh=
If CONFIG_WQ_WATCHDOG is configured, workqueue can If CONFIG_WQ_WATCHDOG is configured, workqueue can
warn stall conditions and dump internal state to warn stall conditions and dump internal state to

7
kernel/watchdog.c
View File

@ -199,6 +199,13 @@ static int __init nosoftlockup_setup(char *str)
} }
__setup("nosoftlockup", nosoftlockup_setup); __setup("nosoftlockup", nosoftlockup_setup);
static int __init watchdog_thresh_setup(char *str)
{
get_option(&str, &watchdog_thresh);
return 1;
}
__setup("watchdog_thresh=", watchdog_thresh_setup);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
int __read_mostly sysctl_softlockup_all_cpu_backtrace; int __read_mostly sysctl_softlockup_all_cpu_backtrace;