aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/amd64/conf/GENERIC-NODEBUG1
-rw-r--r--sys/conf/NOTES12
-rw-r--r--sys/conf/options6
4 files changed, 18 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 6842e48b53b4..64e35c379d8e 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -96,6 +96,7 @@ 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 QUEUE_MACRO_DEBUG_TRASH # Trash queue(2) internal pointers on invalidation
options WITNESS # Enable checks to detect deadlocks and cycles
options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed
options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones
diff --git a/sys/amd64/conf/GENERIC-NODEBUG b/sys/amd64/conf/GENERIC-NODEBUG
index 968b9b56f1bc..1f17382b3214 100644
--- a/sys/amd64/conf/GENERIC-NODEBUG
+++ b/sys/amd64/conf/GENERIC-NODEBUG
@@ -40,3 +40,4 @@ nooptions FULL_BUF_TRACKING
nooptions COVERAGE
nooptions KCOV
nooptions MALLOC_DEBUG_MAXZONES
+nooptions QUEUE_MACRO_DEBUG_TRASH
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 459f7a8d21b7..93b63bd2180f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -414,6 +414,18 @@ options DDB_NUMSYM
options GDB
#
+# Trashes list pointers when they become invalid (i.e., the element is
+# removed from a list). Relatively inexpensive to enable.
+#
+options QUEUE_MACRO_DEBUG_TRASH
+
+#
+# Stores information about the last caller to modify the list object
+# in the list object. Requires additional memory overhead.
+#
+options QUEUE_MACRO_DEBUG_TRACE
+
+#
# SYSCTL_DEBUG enables a 'sysctl' debug tree that can be used to dump the
# contents of the registered sysctl nodes on the console. It is disabled by
# default because it generates excessively verbose console output that can
diff --git a/sys/conf/options b/sys/conf/options
index 8ed17ab994d3..245f4bc6cb54 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -55,17 +55,19 @@ DDB_CAPTURE_DEFAULTBUFSIZE opt_ddb.h
DDB_CAPTURE_MAXBUFSIZE opt_ddb.h
DDB_CTF opt_ddb.h
DDB_NUMSYM opt_ddb.h
+EARLY_PRINTF opt_global.h
FULL_BUF_TRACKING opt_global.h
GDB
KDB opt_global.h
KDB_TRACE opt_kdb.h
KDB_UNATTENDED opt_kdb.h
KLD_DEBUG opt_kld.h
+NUM_CORE_FILES opt_global.h
+QUEUE_MACRO_DEBUG_TRACE opt_global.h
+QUEUE_MACRO_DEBUG_TRASH opt_global.h
SYSCTL_DEBUG opt_sysctl.h
-EARLY_PRINTF opt_global.h
TEXTDUMP_PREFERRED opt_ddb.h
TEXTDUMP_VERBOSE opt_ddb.h
-NUM_CORE_FILES opt_global.h
TSLOG opt_global.h
TSLOGSIZE opt_global.h