Changeset 22768 in vbox

Timestamp:

Sep 4, 2009 9:06:10 AM (15 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: fixed the deadlock in #4259

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -65 +65 @@
 #include <sys/strsun.h>
 #include <sys/modctl.h>
+#include <sys/archsystm.h>
 #include <sys/ddi.h>
 #include <sys/sunddi.h>
@@ -3078 +3079 @@
     int rc = vboxNetFltSolarisMBlkToSG(pThis, pMsg, pSG, cSegs, fSrc);
     if (RT_SUCCESS(rc))
+    {
+        /*
+         * If we're -still- in interrupt context we need to unpin the underlying current
+         * thread as this could lead to a deadlock (see #4259 for the full explanation)
+         */
+        if (curthread->t_intr && getpil() < DISP_LEVEL)
+            swtch();
         pThis->pSwitchPort->pfnRecv(pThis->pSwitchPort, pSG, fSrc);
+    }
     else
         LogRel((DEVICE_NAME ":vboxNetFltSolarisMBlkToSG failed. rc=%d\n", rc));