Add the options DEADLKRES (introducing the deadlock resolver thread) in

the 'debugging' section of any HEAD kernel and enable for the mainstream ones, excluding the embedded architectures. It may, of course, enabled on a case-by-case basis. Sponsored by: Sandvine Incorporated Requested by: emaste Discussed with: kib
svn path=/head/; revision=203758
2010-02-10 16:30:04 +00:00 · 2010-02-10 16:30:04 +00:00 · 88cbfa852e · 2020-12-20 02:59:44 +00:00
commit 88cbfa852e
parent 24e2959e41
38 changed files with 38 additions and 0 deletions
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@ -72,6 +72,7 @@ options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 options 	KDB			# Enable kernel debugger support.
 options 	DDB			# Support DDB.
 options 	GDB			# Support remote GDB.
+options		DEADLKRES		# Enable the deadlock resolver
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
--- a/sys/amd64/conf/XENHVM
+++ b/sys/amd64/conf/XENHVM
@ -70,6 +70,7 @@ options 	NO_ADAPTIVE_RWLOCKS
 options 	KDB			# Enable kernel debugger support.
 options 	DDB			# Support DDB.
 options 	GDB			# Support remote GDB.
+options		DEADLKRES		# Enable the deadlock resolver
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@ -39,6 +39,7 @@ options 	DEVICE_POLLING
 options 	KDB
 #options 	GDB
 options 	DDB			#Enable the kernel debugger
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@ -79,6 +79,7 @@ device		mii
 device		rlswitch

 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/CAMBRIA
+++ b/sys/arm/conf/CAMBRIA
@ -39,6 +39,7 @@ options 	DEVICE_POLLING
 options 	KDB
 #options 	GDB
 options 	DDB			#Enable the kernel debugger
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/CNS11XXNAS
+++ b/sys/arm/conf/CNS11XXNAS
@ -39,6 +39,7 @@ options 	DEVICE_POLLING
 options 	KDB
 #options 	GDB
 options 	DDB			#Enable the kernel debugger
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS		#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@ -93,6 +93,7 @@ device		pty
 # Debugging for use in -current
 options 	KDB
 options 	DDB			#Enable the kernel debugger
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@ -39,6 +39,7 @@ options 	NO_SWAPPING
 # Debugging
 options 	ALT_BREAK_TO_DEBUGGER
 options 	DDB
+#options 	DEADLKRES		#Enable the deadlock resolver
 options 	DIAGNOSTIC
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@ -39,6 +39,7 @@ options 	NO_SWAPPING
 # Debugging
 options 	ALT_BREAK_TO_DEBUGGER
 options 	DDB
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	DIAGNOSTIC
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@ -39,6 +39,7 @@ options 	NO_SWAPPING
 # Debugging
 options 	ALT_BREAK_TO_DEBUGGER
 options 	DDB
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	DIAGNOSTIC
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@ -89,6 +89,7 @@ device		dma			# I80321 DMA Controller
 # Debugging for use in -current
 options 	KDB
 options 	DDB			#Enable the kernel debugger
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/GUMSTIX
+++ b/sys/arm/conf/GUMSTIX
@ -80,6 +80,7 @@ device		pty
 # Debugging for use in -current
 options 	KDB
 options 	DDB			#Enable the kernel debugger
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@ -74,6 +74,7 @@ device		mii
 device		lxtphy

 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@ -94,6 +94,7 @@ device		"iq31244_7seg"		# IQ31244 7 seg
 # Debugging for use in -current
 options 	KDB
 options 	DDB			#Enable the kernel debugger
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@ -75,6 +75,7 @@ device		mii
 device		lxtphy

 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@ -44,6 +44,7 @@ options 	DEVICE_POLLING
 options 	KDB
 #options 	GDB
 options 	DDB			#Enable the kernel debugger
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/SIMICS
+++ b/sys/arm/conf/SIMICS
@ -61,6 +61,7 @@ device		rl
 device		uart

 # Debugging for use in -current
+#options 	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/arm/conf/SKYEYE
+++ b/sys/arm/conf/SKYEYE
@ -68,6 +68,7 @@ device		uart
 					# output.  Adds ~215k to driver.

 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@ -72,6 +72,7 @@ options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 options 	KDB			# Enable kernel debugger support.
 options 	DDB			# Support DDB.
 options 	GDB			# Support remote GDB.
+options		DEADLKRES		# Enable the deadlock resolver
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
--- a/sys/i386/conf/XEN
+++ b/sys/i386/conf/XEN
@ -49,6 +49,7 @@ options 	AUDIT			# Security event auditing
 options 	KDB			# Enable kernel debugger support.
 options 	DDB			# Support DDB.
 options 	GDB			# Support remote GDB.
+options		DEADLKRES		# Enable the deadlock resolver
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@ -31,6 +31,7 @@ options 	COMPAT_43TTY	# BSD 4.3 TTY compat (sgtty)
 options 	COMPAT_FREEBSD6	# Compatible with FreeBSD6
 options 	COMPAT_FREEBSD7	# Compatible with FreeBSD7
 options 	DDB		# Support DDB
+options		DEADLKRES	# Enable the deadlock resolver
 options 	FFS		# Berkeley Fast Filesystem
 options 	GDB		# Support remote GDB
 options 	GEOM_LABEL	# Provides labelization
--- a/sys/mips/conf/ADM5120
+++ b/sys/mips/conf/ADM5120
@ -55,6 +55,7 @@ options 	BOOTP_COMPAT
 options 	ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\"

 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/mips/conf/ALCHEMY
+++ b/sys/mips/conf/ALCHEMY
@ -55,6 +55,7 @@ options		ROOTDEVNAME=\"nfs:10.0.0.1:/mnt/bsd\"


 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 options		INVARIANTS		#Enable calls of extra sanity checking
 options		INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options		WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/mips/conf/AR71XX
+++ b/sys/mips/conf/AR71XX
@ -29,6 +29,7 @@ options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions

 # options		NFS_LEGACYRPC
 # Debugging for use in -current
+# options		DEADLKRES
 # options		INVARIANTS
 # options		INVARIANT_SUPPORT
 # options		WITNESS
--- a/sys/mips/conf/IDT
+++ b/sys/mips/conf/IDT
@ -27,6 +27,7 @@ options 	BOOTP_WIRED_TO=kr0
 options 	BOOTP_COMPAT

 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS

--- a/sys/mips/conf/MALTA
+++ b/sys/mips/conf/MALTA
@ -58,6 +58,7 @@ options 	ROOTDEVNAME=\"ufs:ad0s1a\"


 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/mips/conf/MALTA64
+++ b/sys/mips/conf/MALTA64
@ -59,6 +59,7 @@ options 	ROOTDEVNAME=\"ufs:ad0s1a\"


 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@ -67,6 +67,7 @@ options         UFS_DIRHASH             #Improve performance on big directories


 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 options		INVARIANTS		#Enable calls of extra sanity checking
 options		INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options		WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/mips/conf/OCTEON1-32
+++ b/sys/mips/conf/OCTEON1-32
@ -56,6 +56,7 @@ options         UFS_DIRHASH             #Improve performance on big directories


 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 options		INVARIANTS		#Enable calls of extra sanity checking
 options		INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options		WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/mips/conf/QEMU
+++ b/sys/mips/conf/QEMU
@ -43,6 +43,7 @@ options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions

 # Debugging for use in -current
+#options	DEADLKRES		#Enable the deadlock resolver
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/mips/conf/SENTRY5
+++ b/sys/mips/conf/SENTRY5
@ -56,6 +56,7 @@ options		PSEUDOFS		#Pseudo-filesystem framework
 options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions

 # Debugging for use in -current
+#options	DEADLKRES
 options		INVARIANTS
 options		INVARIANT_SUPPORT

--- a/sys/mips/conf/SWARM
+++ b/sys/mips/conf/SWARM
@ -50,6 +50,7 @@ options		PSEUDOFS		#Pseudo-filesystem framework
 options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions

 # Debugging for use in -current
+#options	DEADLKRES
 options		INVARIANTS
 options		INVARIANT_SUPPORT
 options		WITNESS
--- a/sys/mips/conf/XLR
+++ b/sys/mips/conf/XLR
@ -96,6 +96,7 @@ options 	DDB
 options 	KDB
 options 	GDB
 options 	ALT_BREAK_TO_DEBUGGER
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@ -72,6 +72,7 @@ options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 options 	KDB			# Enable kernel debugger support.
 options 	DDB			# Support DDB.
 options 	GDB			# Support remote GDB.
+options		DEADLKRES		# Enable the deadlock resolver
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@ -68,6 +68,7 @@ options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 # Debugging for use in -current
 options 	KDB			#Enable the kernel debugger
 options 	DDB			#Support DDB
+#options	DEADLKRES		#Enable the deadlock resolver
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
--- a/sys/powerpc/conf/MPC85XX
+++ b/sys/powerpc/conf/MPC85XX
@ -22,6 +22,7 @@ options 	BOOTP_WIRED_TO=tsec0
 options 	CD9660
 options 	COMPAT_43
 options 	DDB
+#options	DEADLKRES
 options 	DEVICE_POLLING
 options 	HZ=1000
 #options 	DIAGNOSTIC
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@ -69,6 +69,7 @@ options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 options 	KDB			# Enable kernel debugger support.
 options 	DDB			# Support DDB.
 options 	GDB			# Support remote GDB.
+options		DEADLKRES		# Enable the deadlock resolver
 options 	INVARIANTS		# Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
--- a/sys/sun4v/conf/GENERIC
+++ b/sys/sun4v/conf/GENERIC
@ -75,6 +75,7 @@ options 	DDB			# Support DDB.
 #options 	TRAP_TRACING		# Enable trap tracing.
 #options 	TRAP_TRACE_ENTRIES=256	# Trap trace buffer entries.
 #options 	GDB			# Support remote GDB.
+#options	DEADLKRES		# Enable the deadlock resolver
 #options 	INVARIANTS		# Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			# Enable checks to detect deadlocks and cycles