Changeset 13769 in vbox

Timestamp:

Nov 3, 2008 7:13:51 PM (16 years ago)

Author:

vboxsync

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

38746

Message:

Solaris/VBoxNetFlt: Teardown time race fixes.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

• VBoxNetFlt.c (modified) (2 diffs)
• solaris/VBoxNetFlt-solaris.c (modified) (21 diffs)

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

@@ -740 +740 @@
      */
     cRefs = ASMAtomicIncU32(&pThis->cRefs);
-    Assert(cRefs > 0 && cRefs < UINT32_MAX / 2);
+    Assert(cRefs > 1 && cRefs < UINT32_MAX / 2);
 
     /*
@@ -748 +748 @@
     {
         cRefs = ASMAtomicIncU32(&pThis->cBusy);
-        Assert(cRefs > 0 && cRefs < UINT32_MAX / 2);
+        Assert(cRefs > 1 && cRefs < UINT32_MAX / 2);
     }
 

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

@@ -367 +367 @@
 static VBOXNETFLTGLOBALS g_VBoxNetFltSolarisGlobals;
 
-/** Mutex protecting dynamic binding of the filter. */
-RTSEMFASTMUTEX g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
-
 /** The list of all opened streams. */
 vboxnetflt_stream_t *g_VBoxNetFltSolarisStreams;
@@ -413 +410 @@
         g_VBoxNetFltSolarisStreams = NULL;
         g_VBoxNetFltSolarisInstance = NULL;
-        rc = RTSemFastMutexCreate(&g_VBoxNetFltSolarisMtx);
+
+        /*
+         * Initialize the globals and connect to the support driver.
+         *
+         * This will call back vboxNetFltOsOpenSupDrv (and maybe vboxNetFltOsCloseSupDrv)
+         * for establishing the connect to the support driver.
+         */
+        memset(&g_VBoxNetFltSolarisGlobals, 0, sizeof(g_VBoxNetFltSolarisGlobals));
+        rc = vboxNetFltInitGlobals(&g_VBoxNetFltSolarisGlobals);
         if (RT_SUCCESS(rc))
         {
-            /*
-             * Initialize the globals and connect to the support driver.
-             *
-             * This will call back vboxNetFltOsOpenSupDrv (and maybe vboxNetFltOsCloseSupDrv)
-             * for establishing the connect to the support driver.
-             */
-            memset(&g_VBoxNetFltSolarisGlobals, 0, sizeof(g_VBoxNetFltSolarisGlobals));
-            rc = vboxNetFltInitGlobals(&g_VBoxNetFltSolarisGlobals);
-            if (RT_SUCCESS(rc))
-            {
-                rc = mod_install(&g_VBoxNetFltSolarisModLinkage);
-                if (!rc)
-                    return rc;
-
-                LogRel((DEVICE_NAME ":mod_install failed. rc=%d\n", rc));
-                vboxNetFltTryDeleteGlobals(&g_VBoxNetFltSolarisGlobals);
-            }
-            else
-                LogRel((DEVICE_NAME ":failed to initialize globals.\n"));
-
-            RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
-            g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
+            rc = mod_install(&g_VBoxNetFltSolarisModLinkage);
+            if (!rc)
+                return rc;
+
+            LogRel((DEVICE_NAME ":mod_install failed. rc=%d\n", rc));
+            vboxNetFltTryDeleteGlobals(&g_VBoxNetFltSolarisGlobals);
         }
         else
-            LogRel((DEVICE_NAME ":failed to create mutex.\n"));
+            LogRel((DEVICE_NAME ":failed to initialize globals.\n"));
 
         RTR0Term();
@@ -465 +454 @@
         LogRel((DEVICE_NAME ":_fini - busy!\n"));
         return EBUSY;
-    }
-
-    if (g_VBoxNetFltSolarisMtx != NIL_RTSEMFASTMUTEX)
-    {
-        RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
-        g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
     }
 
@@ -858 +841 @@
     }
 
+    vboxNetFltRelease(pStream->pThis, false /* fBusy */);
     RTMemFree(pStream);
     pQueue->q_ptr = NULL;
@@ -906 +890 @@
             RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
             const bool fActive = ASMAtomicUoReadBool(&pThis->fActive);
-            vboxNetFltRetain(pThis, true);
+            vboxNetFltRetain(pThis, true /* fBusy */);
             RTSpinlockRelease(pThis->hSpinlock, &Tmp);
 
@@ -1074 +1058 @@
             }
 
-            vboxNetFltRelease(pThis, true);
+            vboxNetFltRelease(pThis, true /* fBusy */);
         }
         else
@@ -1717 +1701 @@
 static void vboxNetFltSolarisCloseStream(PVBOXNETFLTINS pThis)
 {
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisCloseStream pThis=%p\n"));
+
+    vboxNetFltRetain(pThis, false /* fBusy */);
+
     ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
 }
@@ -1730 +1718 @@
 static int vboxNetFltSolarisAttachIp4(PVBOXNETFLTINS pThis, bool fAttach)
 {
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachIp4 pThis=%p fAttach=%d\n", pThis, fAttach));
+
     /*
      * Statuatory Warning: Hackish code ahead.
@@ -1777 +1767 @@
 
     /*
-     * Obtain the interface flags from IP.
+     * Obtain the interface flags from IPv4.
      */
     rc = vboxNetFltSolarisGetIfFlags(Ip4DevHandle, &Ip4Interface);
@@ -1851 +1841 @@
                                  * Inject/Eject from the host IP stack.
                                  */
+                                if (!fAttach)
+                                    vboxNetFltRetain(pThis, false /* fBusy */);
                                 rc = strioctl(pIp4VNode, fAttach ? _I_INSERT : _I_REMOVE, (intptr_t)&StrMod, 0, K_TO_K,
                                             kcred, &ret);
                                 if (!rc)
                                 {
+                                    if (!fAttach)
+                                        vboxNetFltRetain(pThis, false /* fBusy */);
+
                                     /*
                                      * Inject/Eject from the host ARP stack.
@@ -1902 +1897 @@
                                         LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: failed to %s the ARP stack. rc=%d\n",
                                                 fAttach ? "inject into" : "eject from", rc));
+                                        if (!fAttach)
+                                            vboxNetFltRelease(pThis, false /* fBusy */);
                                     }
 
@@ -1913 +1910 @@
                                     LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp4: failed to %s the IP stack. rc=%d\n",
                                             fAttach ? "inject into" : "eject from", rc));
+                                    if (!fAttach)
+                                        vboxNetFltRelease(pThis, false /* fBusy */);
                                 }
                             }
@@ -1962 +1961 @@
 static int vboxNetFltSolarisAttachIp6(PVBOXNETFLTINS pThis, bool fAttach)
 {
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisAttachIp6 pThis=%p fAttach=%d\n", pThis, fAttach));
+
     /*
      * Statuatory Warning: Hackish code ahead.
@@ -2055 +2056 @@
                                 g_VBoxNetFltSolarisStreamType = kIp6Stream;
 
+                                if (!fAttach)
+                                    vboxNetFltRetain(pThis, false /* fBusy */);
+
                                 /*
                                  * Inject/Eject from the host IPv6 stack.
@@ -2099 +2103 @@
                                     LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachIp6: failed to %s the IP stack. rc=%d\n",
                                             fAttach ? "inject into" : "eject from", rc));
+                                    if (!fAttach)
+                                        vboxNetFltRelease(pThis, false /* fBusy */);
                                 }
                             }
@@ -2173 +2179 @@
 static int vboxNetFltSolarisAttachToInterface(PVBOXNETFLTINS pThis)
 {
-    int rc = RTSemFastMutexRequest(g_VBoxNetFltSolarisMtx);
-    AssertRC(rc);
-
-    rc = vboxNetFltSolarisOpenStream(pThis);
+    int rc = vboxNetFltSolarisOpenStream(pThis);
     if (RT_SUCCESS(rc))
     {
@@ -2193 +2196 @@
         LogRel((DEVICE_NAME ":vboxNetFltSolarisAttachToInterface vboxNetFltSolarisOpenStream failed rc=%Vrc\n", rc));
 
-    RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
     return rc;
 }
@@ -2208 +2210 @@
 static int vboxNetFltSolarisDetachFromInterface(PVBOXNETFLTINS pThis)
 {
-    int rc = RTSemFastMutexRequest(g_VBoxNetFltSolarisMtx);
-    AssertRC(rc);
+    LogFlow((DEVICE_NAME ":vboxNetFltSolarisDetachFromInterface pThis=%p\n", pThis));
 
     ASMAtomicWriteBool(&pThis->fDisconnectedFromHost, true);
     vboxNetFltSolarisCloseStream(pThis);
-    rc = vboxNetFltSolarisModSetup(pThis, false, kIp4Stream);
+    int rc = vboxNetFltSolarisModSetup(pThis, false, kIp4Stream);
     if (pThis->u.s.pvIp6Stream)
-        vboxNetFltSolarisModSetup(pThis, false, kIp6Stream);
-
-    RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
+        rc = vboxNetFltSolarisModSetup(pThis, false, kIp6Stream);
+
     return rc;
 }
@@ -3077 +3077 @@
 int vboxNetFltOsDisconnectIt(PVBOXNETFLTINS pThis)
 {
+    LogFlow((DEVICE_NAME ":vboxNetFltOsDisconnectIt pThis=%p\n", pThis));
+
+    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;
@@ -3082 +3097 @@
 
 
-int  vboxNetFltOsConnectIt(PVBOXNETFLTINS pThis)
-{
+void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
+{
+    LogFlow((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n", pThis));
     /* Nothing to do here. */
-    return VINF_SUCCESS;
-}
-
-
-void vboxNetFltOsDeleteInstance(PVBOXNETFLTINS pThis)
-{
-    LogFlow((DEVICE_NAME ":vboxNetFltOsDeleteInstance pThis=%p\n"));
-    vboxNetFltSolarisDetachFromInterface(pThis);
-
-    if (pThis->u.s.hFastMtx != NIL_RTSEMFASTMUTEX)
-    {
-        RTSemFastMutexDestroy(pThis->u.s.hFastMtx);
-        pThis->u.s.hFastMtx = NIL_RTSEMFASTMUTEX;
-    }
 }
 
@@ -3284 +3286 @@
                     freemsg(pMsg);  /* Should really never happen... */
             }
-            else if (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_IPV6))
-            {
-                /*
-                 * Send messages up IPv6 stream.
-                 */
-                LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST IPv6\n"));
-
-                vboxnetflt_stream_t *pIp6Stream  = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIp6Stream);
-                if (pIp6Stream)
-                {
-                    pMsg->b_rptr += sizeof(RTNETETHERHDR);
-                    queue_t *pIp6ReadQueue = pIp6Stream->pReadQueue;
-                    putnext(pIp6ReadQueue, pMsg);
-                }
-                else
-                    freemsg(pMsg);
-            }
             else
             {
-                /*
-                 * Send messages up IPv4 stream.
-                 */
-                LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST IPv4\n"));
-
-                pMsg->b_rptr += sizeof(RTNETETHERHDR);
-                queue_t *pIp4ReadQueue = pIp4Stream->pReadQueue;
-                putnext(pIp4ReadQueue, pMsg);
+                 vboxnetflt_stream_t *pIp6Stream  = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIp6Stream);
+                 if (   pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_IPV6)
+                     && pIp6Stream)
+                 {
+                     /*
+                      * Send messages up IPv6 stream.
+                      */
+                      LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST IPv6\n"));
+
+                     pMsg->b_rptr += sizeof(RTNETETHERHDR);
+                     queue_t *pIp6ReadQueue = pIp6Stream->pReadQueue;
+                     putnext(pIp6ReadQueue, pMsg);
+                 }
+                 else
+                 {
+                    /*
+                     * Send messages up IPv4 stream.
+                     */
+                    LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST IPv4\n"));
+
+                    pMsg->b_rptr += sizeof(RTNETETHERHDR);
+                    queue_t *pIp4ReadQueue = pIp4Stream->pReadQueue;
+                    putnext(pIp4ReadQueue, pMsg);
+                }
             }
         }