Changeset 33141 in vbox for trunk/src/VBox

Timestamp:

Oct 14, 2010 4:35:21 PM (14 years ago)

Author:

vboxsync

Message:

VBoxNetFlt/solaris: fix panic with using fastmutex with preemption disabled.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFltInternal.h (modified) (1 diff)
• solaris/VBoxNetFlt-solaris.c (modified) (10 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h

@@ -208 +208 @@
             RTMAC MacAddr;
             /** Mutex protection used for loopback. */
-            RTSEMFASTMUTEX hFastMtx;
+            kmutex_t hMtx;
             /** Mutex protection used for dynamic IPv6 attaches. */
             RTSEMFASTMUTEX hPollMtx;

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

@@ -909 +909 @@
         vboxnetflt_promisc_stream_t *pPromiscStream = (vboxnetflt_promisc_stream_t *)pStream;
 
-        int rc = RTSemFastMutexRequest(pStream->pThis->u.s.hFastMtx);
-        AssertRCReturn(rc, rc);
+        mutex_enter(&pStream->pThis->u.s.hMtx);
 
         /*
@@ -938 +937 @@
 #endif
 
-        RTSemFastMutexRelease(pStream->pThis->u.s.hFastMtx);
+        mutex_exit(&pStream->pThis->u.s.hMtx);
     }
 
@@ -3064 +3063 @@
         return VERR_NET_MSG_SIZE;
 
-    int rc = RTSemFastMutexRequest(pThis->u.s.hFastMtx);
-    AssertRCReturn(rc, rc);
+    int rc = VINF_SUCCESS;
+    mutex_enter(&pThis->u.s.hMtx);
 
     PVBOXNETFLTPACKETID pCur = NULL;
@@ -3156 +3155 @@
     }
 
-    RTSemFastMutexRelease(pThis->u.s.hFastMtx);
+    mutex_exit(&pThis->u.s.hMtx);
 
     return rc;
@@ -3189 +3188 @@
         return false;
 
-    int rc = RTSemFastMutexRequest(pThis->u.s.hFastMtx);
-    AssertRCReturn(rc, rc);
+    mutex_enter(&pThis->u.s.hMtx);
 
     PVBOXNETFLTPACKETID pPrev = NULL;
@@ -3247 +3245 @@
 
     LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk returns %d.\n", fIsOurPacket));
-    RTSemFastMutexRelease(pThis->u.s.hFastMtx);
+    mutex_exit(&pThis->u.s.hMtx);
     return fIsOurPacket;
 }
@@ -3697 +3695 @@
     vboxNetFltSolarisDetachFromInterface(pThis);
 
-    if (pThis->u.s.hFastMtx != NIL_RTSEMFASTMUTEX)
-    {
-        RTSemFastMutexDestroy(pThis->u.s.hFastMtx);
-        pThis->u.s.hFastMtx = NIL_RTSEMFASTMUTEX;
-    }
+    return VINF_SUCCESS;
+}
+
+
+int  vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis)
+{
+    /* Nothing to do here. */
+    return VINF_SUCCESS;
+}
+
+
+void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
+{
+    LogFlowFunc((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n", pThis));
+
+    mutex_destroy(&pThis->u.s.hMtx);
 
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
@@ -3711 +3720 @@
 #endif
 
-    return VINF_SUCCESS;
-}
-
-
-int  vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis)
-{
-    /* Nothing to do here. */
-    return VINF_SUCCESS;
-}
-
-
-void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
-{
-    LogFlowFunc((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n", pThis));
-    /* Nothing to do here. */
 }
 
@@ -3736 +3730 @@
      * Mutex used for loopback lockouts.
      */
-    int rc = RTSemFastMutexCreate(&pThis->u.s.hFastMtx);
+    int rc = VINF_SUCCESS;
+    mutex_init(&pThis->u.s.hMtx, NULL /* name */, MUTEX_DRIVER, NULL /* cookie */);
+#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
+    rc = RTSemFastMutexCreate(&pThis->u.s.hPollMtx);
     if (RT_SUCCESS(rc))
     {
+#endif
+        rc = vboxNetFltSolarisAttachToInterface(pThis);
+        if (RT_SUCCESS(rc))
+            return rc;
+
+        LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface failed. rc=%Rrc\n", rc));
+
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
-        rc = RTSemFastMutexCreate(&pThis->u.s.hPollMtx);
-        if (RT_SUCCESS(rc))
-        {
+        RTSemFastMutexDestroy(pThis->u.s.hPollMtx);
+        pThis->u.s.hPollMtx = NIL_RTSEMFASTMUTEX;
+    }
+    else
+        LogRel((DEVICE_NAME ":vboxNetFltOsInitInstance failed to create poll mutex. rc=%Rrc\n", rc));
 #endif
-            rc = vboxNetFltSolarisAttachToInterface(pThis);
-            if (RT_SUCCESS(rc))
-                return rc;
-
-            LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface failed. rc=%Rrc\n", rc));
-
-#ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
-            RTSemFastMutexDestroy(pThis->u.s.hPollMtx);
-            pThis->u.s.hPollMtx = NIL_RTSEMFASTMUTEX;
-        }
-        else
-            LogRel((DEVICE_NAME ":vboxNetFltOsInitInstance failed to create poll mutex. rc=%Rrc\n", rc));
-#endif
-
-        RTSemFastMutexDestroy(pThis->u.s.hFastMtx);
-        pThis->u.s.hFastMtx = NIL_RTSEMFASTMUTEX;
-    }
-    else
-        LogRel((DEVICE_NAME ":vboxNetFltOsInitInstance failed to create mutex. rc=%Rrc\n", rc));
+
+    mutex_destroy(&pThis->u.s.hMtx);
 
     NOREF(pvContext);
@@ -3781 +3770 @@
     pThis->u.s.fAttaching = false;
     pThis->u.s.fVLAN = false;
-    pThis->u.s.hFastMtx = NIL_RTSEMFASTMUTEX;
 #ifdef VBOXNETFLT_SOLARIS_IPV6_POLLING
     pThis->u.s.hPollMtx = NIL_RTSEMFASTMUTEX;