Debug version of simple_lock. This will store the CPU id of the

holding CPU along with the lock.  When a CPU fails to get the lock
it compares its own id to the holder id.  If they are the same it
panic()s, as simple locks are binary, and this would cause a deadlock.

Controlled by smptests.h: SL_DEBUG, ON by default.

Some minor cleanup.

3 files changed, 33 insertions, 60 deletions

diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c
index 955a3a1..322f0f1 100644
--- a/sys/amd64/amd64/mp_machdep.c
+++ b/sys/amd64/amd64/mp_machdep.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.32 1997/08/30 01:25:13 smp Exp smp $
+ *	$Id: mp_machdep.c,v 1.34 1997/08/31 03:05:56 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -1446,16 +1446,18 @@ struct simplelock	fast_intr_lock;
 /* critical region around INTR() routines */
 struct simplelock	intr_lock;
 
+/* lock regions around the clock hardware */
+struct simplelock	clock_lock;
+
 #ifdef SIMPLE_MPINTRLOCK
-/* critical region around INTR() routines */
+/* lock regions protected in UP kernel via cli/sti */
 struct simplelock	mpintr_lock;
-struct simplelock	clock_lock;
 #endif
 
-#if 0
-/* lock the com (tty) data structures */
+#ifdef USE_COMLOCK
+/* locks com (tty) data/hardware accesses: a FASTINTR() */
 struct simplelock	com_lock;
-#endif
+#endif /* USE_COMLOCK */
 
 static void
 init_locks(void)
@@ -1470,27 +1472,16 @@ init_locks(void)
 	isr_lock = FREE_LOCK;
 
 #ifdef SIMPLE_MPINTRLOCK
-	/* lock regions protected in UP kernel via cli/sti */
 	s_lock_init((struct simplelock*)&mpintr_lock);
-	s_lock_init((struct simplelock*)&clock_lock);
 #endif
-
-	/* serializes FAST_INTR() accesses */
+	s_lock_init((struct simplelock*)&clock_lock);
 	s_lock_init((struct simplelock*)&fast_intr_lock);
-
-	/* serializes INTR() accesses */
 	s_lock_init((struct simplelock*)&intr_lock);
-
-	/* locks the IO APIC and apic_imen accesses */
 	s_lock_init((struct simplelock*)&imen_lock);
-
-	/* locks cpl/cml/cim/ipending accesses */
 	s_lock_init((struct simplelock*)&cpl_lock);
-
-#if 0
-	/* locks com (tty) data/hardware accesses: a FASTINTR() */
+#ifdef USE_COMLOCK
 	s_lock_init((struct simplelock*)&com_lock);
-#endif
+#endif /* USE_COMLOCK */
 }
 
 
diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c
index 955a3a1..322f0f1 100644
--- a/sys/amd64/amd64/mptable.c
+++ b/sys/amd64/amd64/mptable.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.32 1997/08/30 01:25:13 smp Exp smp $
+ *	$Id: mp_machdep.c,v 1.34 1997/08/31 03:05:56 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -1446,16 +1446,18 @@ struct simplelock	fast_intr_lock;
 /* critical region around INTR() routines */
 struct simplelock	intr_lock;
 
+/* lock regions around the clock hardware */
+struct simplelock	clock_lock;
+
 #ifdef SIMPLE_MPINTRLOCK
-/* critical region around INTR() routines */
+/* lock regions protected in UP kernel via cli/sti */
 struct simplelock	mpintr_lock;
-struct simplelock	clock_lock;
 #endif
 
-#if 0
-/* lock the com (tty) data structures */
+#ifdef USE_COMLOCK
+/* locks com (tty) data/hardware accesses: a FASTINTR() */
 struct simplelock	com_lock;
-#endif
+#endif /* USE_COMLOCK */
 
 static void
 init_locks(void)
@@ -1470,27 +1472,16 @@ init_locks(void)
 	isr_lock = FREE_LOCK;
 
 #ifdef SIMPLE_MPINTRLOCK
-	/* lock regions protected in UP kernel via cli/sti */
 	s_lock_init((struct simplelock*)&mpintr_lock);
-	s_lock_init((struct simplelock*)&clock_lock);
 #endif
-
-	/* serializes FAST_INTR() accesses */
+	s_lock_init((struct simplelock*)&clock_lock);
 	s_lock_init((struct simplelock*)&fast_intr_lock);
-
-	/* serializes INTR() accesses */
 	s_lock_init((struct simplelock*)&intr_lock);
-
-	/* locks the IO APIC and apic_imen accesses */
 	s_lock_init((struct simplelock*)&imen_lock);
-
-	/* locks cpl/cml/cim/ipending accesses */
 	s_lock_init((struct simplelock*)&cpl_lock);
-
-#if 0
-	/* locks com (tty) data/hardware accesses: a FASTINTR() */
+#ifdef USE_COMLOCK
 	s_lock_init((struct simplelock*)&com_lock);
-#endif
+#endif /* USE_COMLOCK */
 }
 
 
diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h
index 955a3a1..322f0f1 100644
--- a/sys/amd64/include/mptable.h
+++ b/sys/amd64/include/mptable.h
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: mp_machdep.c,v 1.32 1997/08/30 01:25:13 smp Exp smp $
+ *	$Id: mp_machdep.c,v 1.34 1997/08/31 03:05:56 smp Exp smp $
  */
 
 #include "opt_smp.h"
@@ -1446,16 +1446,18 @@ struct simplelock	fast_intr_lock;
 /* critical region around INTR() routines */
 struct simplelock	intr_lock;
 
+/* lock regions around the clock hardware */
+struct simplelock	clock_lock;
+
 #ifdef SIMPLE_MPINTRLOCK
-/* critical region around INTR() routines */
+/* lock regions protected in UP kernel via cli/sti */
 struct simplelock	mpintr_lock;
-struct simplelock	clock_lock;
 #endif
 
-#if 0
-/* lock the com (tty) data structures */
+#ifdef USE_COMLOCK
+/* locks com (tty) data/hardware accesses: a FASTINTR() */
 struct simplelock	com_lock;
-#endif
+#endif /* USE_COMLOCK */
 
 static void
 init_locks(void)
@@ -1470,27 +1472,16 @@ init_locks(void)
 	isr_lock = FREE_LOCK;
 
 #ifdef SIMPLE_MPINTRLOCK
-	/* lock regions protected in UP kernel via cli/sti */
 	s_lock_init((struct simplelock*)&mpintr_lock);
-	s_lock_init((struct simplelock*)&clock_lock);
 #endif
-
-	/* serializes FAST_INTR() accesses */
+	s_lock_init((struct simplelock*)&clock_lock);
 	s_lock_init((struct simplelock*)&fast_intr_lock);
-
-	/* serializes INTR() accesses */
 	s_lock_init((struct simplelock*)&intr_lock);
-
-	/* locks the IO APIC and apic_imen accesses */
 	s_lock_init((struct simplelock*)&imen_lock);
-
-	/* locks cpl/cml/cim/ipending accesses */
 	s_lock_init((struct simplelock*)&cpl_lock);
-
-#if 0
-	/* locks com (tty) data/hardware accesses: a FASTINTR() */
+#ifdef USE_COMLOCK
 	s_lock_init((struct simplelock*)&com_lock);
-#endif
+#endif /* USE_COMLOCK */
 }