Commit ac1f5912 authored by Don Zickus's avatar Don Zickus Committed by Linus Torvalds
Browse files

kernel/watchdog.c: add sysctl knob hardlockup_panic 



The only way to enable a hardlockup to panic the machine is to set
'nmi_watchdog=panic' on the kernel command line.

This makes it awkward for end users and folks who want to run automate
tests (like myself).

Mimic the softlockup_panic knob and create a /proc/sys/kernel/hardlockup_panic
knob.

Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
Cc: Ulrich Obergfell <uobergfe@redhat.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Reviewed-by: default avatarAaron Tomlin <atomlin@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 55537871

Documentation/lockup-watchdogs.txt

+3 −2
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ kernel mode for more than 10 seconds (see "Implementation" below for 
details), without letting other interrupts have a chance to run.

Similarly to the softlockup case, the current stack trace is displayed

upon detection and the system will stay locked up unless the default

behavior is changed, which can be done through a compile time knob,

"BOOTPARAM_HARDLOCKUP_PANIC", and a kernel parameter, "nmi_watchdog"

behavior is changed, which can be done through a sysctl,

'hardlockup_panic', a compile time knob, "BOOTPARAM_HARDLOCKUP_PANIC",

and a kernel parameter, "nmi_watchdog"

(see "Documentation/kernel-parameters.txt" for details).



The panic option can be used in combination with panic_timeout (this

include/linux/sched.h

+1 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ extern int proc_dowatchdog_thresh(struct ctl_table *table, int write, 
				  void __user *buffer,

				  size_t *lenp, loff_t *ppos);

extern unsigned int  softlockup_panic;

extern unsigned int  hardlockup_panic;

void lockup_detector_init(void);

#else

static inline void touch_softlockup_watchdog(void)

kernel/sysctl.c

+11 −0
Original line number Diff line number Diff line
@@ -888,6 +888,17 @@ static struct ctl_table kern_table[] = { 
		.extra1		= &zero,

		.extra2		= &one,

	},

#ifdef CONFIG_HARDLOCKUP_DETECTOR

	{

		.procname	= "hardlockup_panic",

		.data		= &hardlockup_panic,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= &zero,

		.extra2		= &one,

	},

#endif

#ifdef CONFIG_SMP

	{

		.procname	= "softlockup_all_cpu_backtrace",

kernel/watchdog.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static unsigned long soft_lockup_nmi_warn; 
 * Should we panic when a soft-lockup or hard-lockup occurs:

 */

#ifdef CONFIG_HARDLOCKUP_DETECTOR

static int hardlockup_panic =

unsigned int __read_mostly hardlockup_panic =

			CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE;

static unsigned long hardlockup_allcpu_dumped;

/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE