Changeset 22770 in vbox

Timestamp:

Sep 4, 2009 9:51:34 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/semevent-r0drv: prevent deadlock when waking threads from interrupt context (#4259)

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• semevent-r0drv-solaris.c (modified) (1 diff)
• semeventmulti-r0drv-solaris.c (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c

@@ -139 +139 @@
     RT_ASSERT_INTS_ON();
 
-    mutex_enter(&pEventInt->Mtx);
+    /*
+     * If we're in interrupt context we need to unpin the underlying current
+     * thread as this could lead to a deadlock (see #4259 for the full explanation)
+     */
+    int fAcquired = mutex_tryenter(&pEventInt->Mtx);
+    if (!fAcquired)
+    {
+        if (curthread->t_intr && getpil() < DISP_LEVEL)
+            swtch();
+
+        mutex_enter(&pEventInt->Mtx);
+    }
 
     if (pEventInt->cWaiters > 0)

trunk/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c

@@ -138 +138 @@
     RT_ASSERT_INTS_ON();
 
-    mutex_enter(&pThis->Mtx);
+    /*
+     * If we're in interrupt context we need to unpin the underlying current
+     * thread as this could lead to a deadlock (see #4259 for the full explanation)
+     */
+    int fAcquired = mutex_tryenter(&pThis->Mtx);
+    if (!fAcquired)
+    {
+        if (curthread->t_intr && getpil() < DISP_LEVEL)
+            swtch();
+
+        mutex_enter(&pThis->Mtx);
+    }
 
     ASMAtomicXchgU8(&pThis->fSignaled, true);