Changeset 12921 in vbox for trunk

Timestamp:

Oct 2, 2008 10:09:58 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/vboxnetflt: Flush the queues to see if it helps the SetActive race.

File:

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

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

@@ -611 +611 @@
      * Check for the VirtualBox instance.
      */
-    if (RT_UNLIKELY(!g_VBoxNetFltSolarisInstance))
+    PVBOXNETFLTINS pThis = g_VBoxNetFltSolarisInstance;
+    if (!pThis)
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to get VirtualBox instance.\n"));
@@ -617 +618 @@
     }
 
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    PVBOXNETFLTINS pThis = g_VBoxNetFltSolarisInstance;
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
     /*
      * Check VirtualBox stream type.
@@ -627 +624 @@
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed due to undefined VirtualBox open mode.\n"));
-
-        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
         return ENOENT;
     }
@@ -657 +652 @@
         {
             LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to allocate promiscuous stream data.\n"));
-
-            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
             return ENOMEM;
         }
@@ -679 +672 @@
         {
             LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to allocate stream data.\n"));
-
-            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
             return ENOMEM;
         }
@@ -700 +691 @@
         default:    /* Heh. */
         {
-            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
             AssertRelease(pStream->Type);
             break;
@@ -715 +705 @@
     *ppPrevStream = pStream;
 
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
     qprocson(pQueue);
 
@@ -783 +772 @@
     vboxnetflt_stream_t **ppPrevStream = NULL;
 
-    qprocsoff(pQueue);
-
     /*
      * Get instance data.
@@ -795 +782 @@
     }
 
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    PVBOXNETFLTINS pThis = ASMAtomicUoReadPtr((void * volatile *)&pStream->pThis);
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+    if (pStream->Type == kPromiscStream)
+    {
+        flushq(pQueue, FLUSHALL);
+        flushq(WR(pQueue), FLUSHALL);
+    }
+
+    qprocsoff(pQueue);
+
+    if (pStream->Type == kPromiscStream)
+    {
+        vboxnetflt_promisc_stream_t *pPromiscStream = (vboxnetflt_promisc_stream_t *)pStream;
+
+        int rc = RTSemFastMutexRequest(pStream->pThis->u.s.hFastMtx);
+        AssertRCReturn(rc, rc);
+
+        /*
+         * Free-up loopback buffers.
+         */
+        PVBOXNETFLTPACKETID pCur = pPromiscStream->pHead;
+        while (pCur)
+        {
+            PVBOXNETFLTPACKETID pNext = pCur->pNext;
+            RTMemFree(pCur);
+            pCur = pNext;
+        }
+        pPromiscStream->pHead = NULL;
+        pPromiscStream->pTail = NULL;
+        pPromiscStream->cLoopback = 0;
+
+        RTSemFastMutexRelease(pStream->pThis->u.s.hFastMtx);
+    }
 
     /*
@@ -817 +832 @@
         default:    /* Heh. */
         {
-            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
             AssertRelease(pStream->Type);
             break;
@@ -830 +844 @@
     NOREF(pCred);
 
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
-
     return 0;
 }
@@ -846 +858 @@
 static int VBoxNetFltSolarisModReadPut(queue_t *pQueue, mblk_t *pMsg)
 {
+    if (!pMsg)
+        return 0;
+
     LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut pQueue=%p pMsg=%p\n", pQueue, pMsg));
 
@@ -856 +871 @@
      * is somehow still in the host stream we must try not to panic the host.
      */
-    if (   pMsg
-        && pStream
+    if (   pStream
         && pStream->Type == kPromiscStream)
     {
@@ -977 +991 @@
             }
 
-            vboxNetFltRelease(pThis, true);        
+            vboxNetFltRelease(pThis, true);
         }
         else
@@ -1567 +1581 @@
 static void vboxNetFltSolarisCloseStream(PVBOXNETFLTINS pThis)
 {
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
-    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
-    if (pPromiscStream)
-    {
-        /*
-         * Free-up loopback buffers.
-         */
-        PVBOXNETFLTPACKETID pCur = pPromiscStream->pHead;
-        while (pCur)
-        {
-            PVBOXNETFLTPACKETID pNext = pCur->pNext;
-            RTMemFree(pCur);
-            pCur = pNext;
-        }
-        pPromiscStream->pHead = NULL;
-        pPromiscStream->pTail = NULL;
-        pPromiscStream->cLoopback = 0;
-    }
-
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
     ldi_close(pThis->u.s.hIface, FREAD | FWRITE, kcred);
 }
@@ -2369 +2361 @@
         fIsOurPacket = true;
 
-        LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p cLoopback=%d\n", pMsg, pPromiscStream->cLoopback));
+        LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p Checksum=%u cLoopbackQ=%d\n", pMsg, Checksum,
+                    pPromiscStream->cLoopback));
         break;
     }
@@ -2707 +2700 @@
     if (pStream)
     {
-        int rc = vboxNetFltSolarisPromiscReq(pStream->pReadQueue, fActive);
-        if (RT_FAILURE(rc))
-            LogRel((DEVICE_NAME ":vboxNetFltPortOsSetActive failed to request promiscuous mode! rc=%d\n", rc));
+        if (pStream->pReadQueue)
+        {
+            int rc = vboxNetFltSolarisPromiscReq(pStream->pReadQueue, fActive);
+            if (RT_FAILURE(rc))
+                LogRel((DEVICE_NAME ":vboxNetFltPortOsSetActive failed to request promiscuous mode! rc=%d\n", rc));
+        }
+        else
+            LogRel((DEVICE_NAME ":vboxNetFltPortOsSetActive queue not found!\n"));            
     }
     else