Changeset 15101 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Dec 8, 2008 11:04:31 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetFlt: Thread protection while closing.

File:

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

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

@@ -369 +369 @@
 vboxnetflt_stream_t *g_VBoxNetFltSolarisStreams;
 
+/** Global mutex protecting open/close. */
+static RTSEMFASTMUTEX g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
+
 /**
  * g_VBoxNetFltInstance is the current PVBOXNETFLTINS to be associated with the stream being created
@@ -410 +413 @@
         g_VBoxNetFltSolarisInstance = NULL;
 
-        /*
-         * 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);
+        int rc = RTSemFastMutexCreate(&g_VBoxNetFltSolarisMtx);
         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"));
+            /*
+             * 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;
+        }
 
         RTR0Term();
@@ -453 +463 @@
         LogRel((DEVICE_NAME ":_fini - busy!\n"));
         return EBUSY;
+    }
+
+    if (g_VBoxNetFltSolarisMtx != NIL_RTSEMFASTMUTEX)
+    {
+        RTSemFastMutexDestroy(g_VBoxNetFltSolarisMtx);
+        g_VBoxNetFltSolarisMtx = NIL_RTSEMFASTMUTEX;
     }
 
@@ -595 +611 @@
             fOpenMode, fStreamMode));
 
+    int rc = RTSemFastMutexRequest(g_VBoxNetFltSolarisMtx);
+    AssertRCReturn(rc, rc);
+
     /*
      * Already open?
@@ -601 +620 @@
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen invalid open.\n"));
+        RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
         return ENOENT;
     }
@@ -611 +631 @@
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to get VirtualBox instance.\n"));
+        RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
         return ENOENT;
     }
@@ -620 +641 @@
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed due to undefined VirtualBox open mode.\n"));
+        RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
         return ENOENT;
     }
@@ -648 +670 @@
         {
             LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to allocate promiscuous stream data.\n"));
+            RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
             return ENOMEM;
         }
@@ -668 +691 @@
         {
             LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to allocate stream data.\n"));
+            RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
             return ENOMEM;
         }
@@ -701 +725 @@
     pStream->pNext = *ppPrevStream;
     *ppPrevStream = pStream;
+
+    /*
+     * Release global lock, & do not hold locks across putnext calls.
+     */
+    RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
 
     qprocson(pQueue);
@@ -771 +800 @@
     LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModClose pQueue=%p fOpenMode=%d\n", pQueue, fOpenMode));
 
+    int rc = RTSemFastMutexRequest(g_VBoxNetFltSolarisMtx);
+    AssertRCReturn(rc, rc);
+
     vboxnetflt_stream_t *pStream = NULL;
     vboxnetflt_stream_t **ppPrevStream = NULL;
@@ -782 +814 @@
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModClose failed to get stream.\n"));
         vboxNetFltRelease(pStream->pThis, false /* fBusy */);
+        RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
         return ENXIO;
     }
@@ -848 +881 @@
     NOREF(fOpenMode);
     NOREF(pCred);
+
+    RTSemFastMutexRelease(g_VBoxNetFltSolarisMtx);
 
     return 0;