Changeset 44544 in vbox for trunk/src/VBox/Runtime

Timestamp:

Feb 5, 2013 1:56:17 PM (12 years ago)

Author:

vboxsync

Message:

Linux r0drv: implement DO_NOT_DISABLE_PROVE_LOCKING option.

File:

• trunk/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c

@@ -95 +95 @@
 #endif
 
+#if defined(CONFIG_PROVE_LOCKING) && defined(DO_NOT_DISABLE_PROVE_LOCKING)
+    /*
+      PLEASE DO NOT MODIFY THE NEXT FOUR LINES OF CODE!
+      We use this approach in order to split RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE and
+      RTSPINLOCK_FLAGS_INTERRUPT_SAFE spinlocks into separated locking classes when
+      CONFIG_PROVE_LOCKING kernel option is enabled. Using single spin_lock_init()
+      call will trigger kernel warning regarding to incorrect spinlock usage.
+    */
+    if (fFlags == RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE)
+        spin_lock_init(&pThis->Spinlock);
+    else
+        spin_lock_init(&pThis->Spinlock);
+#else
     spin_lock_init(&pThis->Spinlock);
+#endif
 
     *pSpinlock = pThis;
@@ -131 +145 @@
               ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0));
 
-#if defined(CONFIG_PROVE_LOCKING) && !defined(RT_STRICT)
+#if defined(CONFIG_PROVE_LOCKING) && !defined(DO_NOT_DISABLE_PROVE_LOCKING)
     lockdep_off();
 #endif
@@ -142 +156 @@
     else
         spin_lock(&pThis->Spinlock);
-#if defined(CONFIG_PROVE_LOCKING) && !defined(RT_STRICT)
+#if defined(CONFIG_PROVE_LOCKING) && !defined(DO_NOT_DISABLE_PROVE_LOCKING)
     lockdep_on();
 #endif
@@ -159 +173 @@
     RT_ASSERT_PREEMPT_CPUID_SPIN_RELEASE(pThis);
 
-#if defined(CONFIG_PROVE_LOCKING) && !defined(RT_STRICT)
+#if defined(CONFIG_PROVE_LOCKING) && !defined(DO_NOT_DISABLE_PROVE_LOCKING)
     lockdep_off();
 #endif
@@ -170 +184 @@
     else
         spin_unlock(&pThis->Spinlock);
-#if defined(CONFIG_PROVE_LOCKING) && !defined(RT_STRICT)
+#if defined(CONFIG_PROVE_LOCKING) && !defined(DO_NOT_DISABLE_PROVE_LOCKING)
     lockdep_on();
 #endif