Changeset 32453 in vbox

Timestamp:

Sep 13, 2010 2:46:00 PM (14 years ago)

Author:

vboxsync

Message:

spinlock-r0drv-nt.cpp: Hack to try to resolve the ISR issue in VBoxGuest (disabled).

File:

• trunk/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp

@@ -45 +45 @@
 
 /*******************************************************************************
+*   Defined Constants And Macros                                               *
+*******************************************************************************/
+/** Apply the NoIrq hack if defined. */
+//#define RTSPINLOCK_NT_HACK_NOIRQ
+
+#ifdef RTSPINLOCK_NT_HACK_NOIRQ
+/** Indicates that the spinlock is taken. */
+# define RTSPINLOCK_NT_HACK_NOIRQ_TAKEN  UINT32(0x00c0ffee)
+/** Indicates that the spinlock is taken. */
+# define RTSPINLOCK_NT_HACK_NOIRQ_FREE   UINT32(0xfe0000fe)
+#endif
+
+
+/*******************************************************************************
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
@@ -54 +68 @@
     /** Spinlock magic value (RTSPINLOCK_MAGIC). */
     uint32_t volatile   u32Magic;
+#ifdef RTSPINLOCK_NT_HACK_NOIRQ
+    /** Spinlock hack. */
+    uint32_t volatile   u32Hack;
+#endif
     /** The NT spinlock structure. */
     KSPIN_LOCK          Spinlock;
@@ -74 +92 @@
      */
     pSpinlockInt->u32Magic = RTSPINLOCK_MAGIC;
+#ifdef RTSPINLOCK_NT_HACK_NOIRQ
+    pSpinlockInt->u32Hack  = RTSPINLOCK_NT_HACK_NOIRQ;
+#endif
     KeInitializeSpinLock(&pSpinlockInt->Spinlock);
     Assert(sizeof(KIRQL) == sizeof(unsigned char));
+    AssertCompile(sizeof(KIRQL) == sizeof(unsigned char));
 
     *pSpinlock = pSpinlockInt;
@@ -107 +129 @@
     AssertMsg(pSpinlockInt && pSpinlockInt->u32Magic == RTSPINLOCK_MAGIC, ("magic=%#x\n", pSpinlockInt->u32Magic));
 
+#ifndef RTSPINLOCK_NT_HACK_NOIRQ
     KeAcquireSpinLock(&pSpinlockInt->Spinlock, &pTmp->uchIrqL);
     pTmp->uFlags = ASMGetFlags();
     ASMIntDisable();
+#else
+    pTmp->uchIrqL = KeGetCurrentIrql();
+    if (pTmp->uchIrqL < DISPATCH_LEVEL)
+    {
+        KeRaiseIrql(DISPATCH_LEVEL, &pTmp->uchIrqL);
+        Assert(pTmp->uchIrqL < DISPATCH_LEVEL);
+    }
+    pTmp->uFlags = ASMGetFlags();
+    ASMIntDisable();
+    if (!ASMAtomicCmpXchgU32(&pSpinlockInt->u32Hack, RTSPINLOCK_NT_HACK_NOIRQ_TAKEN, RTSPINLOCK_NT_HACK_NOIRQ_FREE))
+    {
+        while (!ASMAtomicCmpXchgU32(&pSpinlockInt->u32Hack, RTSPINLOCK_NT_HACK_NOIRQ_TAKEN, RTSPINLOCK_NT_HACK_NOIRQ_FREE))
+            ASMNopPause();
+    }
+#endif
 }
 
@@ -118 +156 @@
     AssertMsg(pSpinlockInt && pSpinlockInt->u32Magic == RTSPINLOCK_MAGIC, ("magic=%#x\n", pSpinlockInt->u32Magic));
 
+#ifndef RTSPINLOCK_NT_HACK_NOIRQ
     ASMSetFlags(pTmp->uFlags);
     KeReleaseSpinLock(&pSpinlockInt->Spinlock, pTmp->uchIrqL);
+#else
+    Assert(pSpinlockInt->u32Hack == RTSPINLOCK_NT_HACK_NOIRQ_TAKEN);
+    ASMAtomicWriteU32(&pSpinlockInt->u32Hack, RTSPINLOCK_NT_HACK_NOIRQ_FREE);
+    ASMSetFlags(pTmp->uFlags);
+    if (pTmp->uchIrqL < DISPATCH_LEVEL)
+        KeLowerIrql(pTmp->uchIrqL);
+#endif
 }