D27271.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D27271.diff
View Options

	Index: head/share/man/man4/ddb.4
	===================================================================
	--- head/share/man/man4/ddb.4
	+++ head/share/man/man4/ddb.4
	@@ -26,7 +26,7 @@
	.\"
	.\" $FreeBSD$
	.\"
	-.Dd October 17, 2019
	+.Dd November 19, 2020
	.Dt DDB 4
	.Os
	.Sh NAME
	@@ -87,6 +87,16 @@
	unless the
	.Dv KDB_UNATTENDED
	option is specified.
	+Similarly, if the
	+.Va debug.debugger_on_recursive_panic
	+variable is set to
	+.Dv 1 ,
	+then the debugger will be invoked on a recursive kernel panic.
	+This variable has a default value of
	+.Dv 0 ,
	+and has no effect if
	+.Va debug.debugger_on_panic
	+is already set non-zero.
	.Pp
	The current location is called
	.Va dot .
	Index: head/sys/kern/kern_shutdown.c
	===================================================================
	--- head/sys/kern/kern_shutdown.c
	+++ head/sys/kern/kern_shutdown.c
	@@ -127,6 +127,11 @@
	CTLFLAG_RWTUN \| CTLFLAG_SECURE,
	&debugger_on_panic, 0, "Run debugger on kernel panic");

	+static bool debugger_on_recursive_panic = false;
	+SYSCTL_BOOL(_debug, OID_AUTO, debugger_on_recursive_panic,
	+ CTLFLAG_RWTUN \| CTLFLAG_SECURE,
	+ &debugger_on_recursive_panic, 0, "Run debugger on recursive kernel panic");
	+
	int debugger_on_trap = 0;
	SYSCTL_INT(_debug, OID_AUTO, debugger_on_trap,
	CTLFLAG_RWTUN \| CTLFLAG_SECURE,
	@@ -899,6 +904,8 @@
	kdb_backtrace();
	if (debugger_on_panic)
	kdb_enter(KDB_WHY_PANIC, "panic");
	+ else if (!newpanic && debugger_on_recursive_panic)
	+ kdb_enter(KDB_WHY_PANIC, "re-panic");
	#endif
	/thread_lock(td); /
	td->td_flags \|= TDF_INPANIC;