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.

1 files changed, 6 insertions, 6 deletions

diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 4578879..5a3cd80 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -382,7 +382,7 @@ msleep(ident, mtx, priority, wmesg, timo)
 	if (p && KTRPOINT(p, KTR_CSW))
 		ktrcsw(p->p_tracep, 1, 0);
 #endif
-	WITNESS_SLEEP(0, mtx);
+	WITNESS_SLEEP(0, &mtx->mtx_object);
 	mtx_lock_spin(&sched_lock);
 	if (cold || panicstr) {
 		/*
@@ -401,7 +401,7 @@ msleep(ident, mtx, priority, wmesg, timo)
 
 	if (mtx != NULL) {
 		mtx_assert(mtx, MA_OWNED | MA_NOTRECURSED);
-		WITNESS_SAVE(mtx, mtx);
+		WITNESS_SAVE(&mtx->mtx_object, mtx);
 		mtx_unlock_flags(mtx, MTX_NOSWITCH);
 		if (priority & PDROP)
 			mtx = NULL;
@@ -498,7 +498,7 @@ out:
 	PICKUP_GIANT();
 	if (mtx != NULL) {
 		mtx_lock(mtx);
-		WITNESS_RESTORE(mtx, mtx);
+		WITNESS_RESTORE(&mtx->mtx_object, mtx);
 	}
 	return (rval);
 }
@@ -573,12 +573,12 @@ mawait(struct mtx *mtx, int priority, int timo)
 	int s;
 	WITNESS_SAVE_DECL(mtx);
 
-	WITNESS_SLEEP(0, mtx);
+	WITNESS_SLEEP(0, &mtx->mtx_object);
 	mtx_lock_spin(&sched_lock);
 	DROP_GIANT_NOSWITCH();
 	if (mtx != NULL) {
 		mtx_assert(mtx, MA_OWNED | MA_NOTRECURSED);
-		WITNESS_SAVE(mtx, mtx);
+		WITNESS_SAVE(&mtx->mtx_object, mtx);
 		mtx_unlock_flags(mtx, MTX_NOSWITCH);
 		if (priority & PDROP)
 			mtx = NULL;
@@ -691,7 +691,7 @@ out:
 	PICKUP_GIANT();
 	if (mtx != NULL) {
 		mtx_lock(mtx);
-		WITNESS_RESTORE(mtx, mtx);
+		WITNESS_RESTORE(&mtx->mtx_object, mtx);
 	}
 	return (rval);
 }