Changeset 44535 in vbox for trunk/src/VBox/Runtime/r0drv/linux

Timestamp:

Feb 5, 2013 8:41:50 AM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83582

Message:

BUGZ: 6570,6602 Disable lock validator for linux r0drv when CONFIG_PROVE_LOCKING is enabled.

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
 
-    /*
-       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);
+    spin_lock_init(&pThis->Spinlock);
 
     *pSpinlock = pThis;
@@ -142 +131 @@
               ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0));
 
+#ifdef CONFIG_PROVE_LOCKING
+    lockdep_off();
+#endif
     if (pThis->fFlags & RTSPINLOCK_FLAGS_INTERRUPT_SAFE)
     {
@@ -150 +142 @@
     else
         spin_lock(&pThis->Spinlock);
+#ifdef CONFIG_PROVE_LOCKING
+    lockdep_on();
+#endif
 
     RT_ASSERT_PREEMPT_CPUID_SPIN_ACQUIRED(pThis);
@@ -164 +159 @@
     RT_ASSERT_PREEMPT_CPUID_SPIN_RELEASE(pThis);
 
+#ifdef CONFIG_PROVE_LOCKING
+    lockdep_off();
+#endif
     if (pThis->fFlags & RTSPINLOCK_FLAGS_INTERRUPT_SAFE)
     {
@@ -172 +170 @@
     else
         spin_unlock(&pThis->Spinlock);
+#ifdef CONFIG_PROVE_LOCKING
+    lockdep_on();
+#endif
 
     RT_ASSERT_PREEMPT_CPUID();