Rework the witness code to work with sx locks as well as mutexes.

- Introduce lock classes and lock objects.  Each lock class specifies a
  name and set of flags (or properties) shared by all locks of a given
  type.  Currently there are three lock classes: spin mutexes, sleep
  mutexes, and sx locks.  A lock object specifies properties of an
  additional lock along with a lock name and all of the extra stuff needed
  to make witness work with a given lock.  This abstract lock stuff is
  defined in sys/lock.h.  The lockmgr constants, types, and prototypes have
  been moved to sys/lockmgr.h.  For temporary backwards compatability,
  sys/lock.h includes sys/lockmgr.h.
- Replace proc->p_spinlocks with a per-CPU list, PCPU(spinlocks), of spin
  locks held.  By making this per-cpu, we do not have to jump through
  magic hoops to deal with sched_lock changing ownership during context
  switches.
- Replace proc->p_heldmtx, formerly a list of held sleep mutexes, with
  proc->p_sleeplocks, which is a list of held sleep locks including sleep
  mutexes and sx locks.
- Add helper macros for logging lock events via the KTR_LOCK KTR logging
  level so that the log messages are consistent.
- Add some new flags that can be passed to mtx_init():
  - MTX_NOWITNESS - specifies that this lock should be ignored by witness.
    This is used for the mutex that blocks a sx lock for example.
  - MTX_QUIET - this is not new, but you can pass this to mtx_init() now
    and no events will be logged for this lock, so that one doesn't have
    to change all the individual mtx_lock/unlock() operations.
- All lock objects maintain an initialized flag.  Use this flag to export
  a mtx_initialized() macro that can be safely called from drivers.  Also,
  we on longer walk the all_mtx list if MUTEX_DEBUG is defined as witness
  performs the corresponding checks using the initialized flag.
- The lock order reversal messages have been improved to output slightly
  more accurate file and line numbers.

6 files changed, 7 insertions, 1 deletions

diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index 6ca7c7e1b2c8..dbdc61a834c0 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -59,6 +59,7 @@
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/linker.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
@@ -1895,8 +1896,8 @@ init386(first)
 
 	/* setup curproc so that mutexes work */
 	PCPU_SET(curproc, &proc0);
+	PCPU_SET(spinlocks, NULL);
 
-	LIST_INIT(&proc0.p_heldmtx);
 	LIST_INIT(&proc0.p_contested);
 
 	mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE);
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 97979054bb19..47903d06fefb 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -2268,6 +2268,7 @@ ap_init(void)
 	 * something unique to lock with.
 	 */
 	PCPU_SET(curproc, PCPU_GET(idleproc));
+	PCPU_SET(spinlocks, NULL);
 
 	/* lock against other AP's that are waking up */
 	mtx_lock_spin(&ap_boot_mtx);
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 97979054bb19..47903d06fefb 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -2268,6 +2268,7 @@ ap_init(void)
 	 * something unique to lock with.
 	 */
 	PCPU_SET(curproc, PCPU_GET(idleproc));
+	PCPU_SET(spinlocks, NULL);
 
 	/* lock against other AP's that are waking up */
 	mtx_lock_spin(&ap_boot_mtx);
diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h
index d2873efcbf0d..c83d73cb164b 100644
--- a/sys/i386/include/globaldata.h
+++ b/sys/i386/include/globaldata.h
@@ -65,6 +65,7 @@ struct globaldata {
 	u_int		gd_other_cpus;
 	SLIST_ENTRY(globaldata) gd_allcpu;
 	int		gd_witness_spin_check;
+	struct lock_list_entry *gd_spinlocks;
 #ifdef KTR_PERCPU
 #ifdef KTR
 	volatile int	gd_ktr_idx;
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 97979054bb19..47903d06fefb 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -2268,6 +2268,7 @@ ap_init(void)
 	 * something unique to lock with.
 	 */
 	PCPU_SET(curproc, PCPU_GET(idleproc));
+	PCPU_SET(spinlocks, NULL);
 
 	/* lock against other AP's that are waking up */
 	mtx_lock_spin(&ap_boot_mtx);
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index d2873efcbf0d..c83d73cb164b 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -65,6 +65,7 @@ struct globaldata {
 	u_int		gd_other_cpus;
 	SLIST_ENTRY(globaldata) gd_allcpu;
 	int		gd_witness_spin_check;
+	struct lock_list_entry *gd_spinlocks;
 #ifdef KTR_PERCPU
 #ifdef KTR
 	volatile int	gd_ktr_idx;