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

Timestamp:

Sep 23, 2008 7:42:25 AM (16 years ago)

Author:

vboxsync

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

36953

Message:

Solaris/vboxnetflt: fixed a race between xmit and recv.

File:

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

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

@@ -681 +681 @@
     }
     else
-    {    
+    {
         /*
          * Allocate & initialize per-stream data. Hook it into the (read and write) queue's module specific data.
@@ -689 +689 @@
         {
             LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to allocate stream data.\n"));
-    
+
             RTSpinlockRelease(pThis->hSpinlock, &Tmp);
             return ENOMEM;
@@ -757 +757 @@
                 LogRel((DEVICE_NAME ":vboxNetFltSolarisSetRawMode failed rc=%Vrc.\n", rc));
         }
-        else        
+        else
             LogRel((DEVICE_NAME ":vboxNetFltSolarisBindReq failed rc=%Vrc.\n", rc));
 
@@ -906 +906 @@
                         && pPromiscStream->fRawMode)
                     {
+                        RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
                         vboxNetFltSolarisRecv(pThis, pStream, pQueue, pMsg);
+                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
                         fSendUpstream = false;
                     }
@@ -921 +923 @@
                     switch (Prim)
                     {
-#if 0
-                        case DL_UNITDATA_IND:
-                        {
-                            /*
-                             * I do not think control would come here... We convert all outgoing fast mode requests
-                             * to raw mode; so I don't think we should really receive any fast mode replies.
-                             */
-                            LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModReadPut: DL_UNITDATA_IND\n"));
-
-                            if (fActive)
-                            {
-                                vboxNetFltSolarisRecv(pThis, pStream, pQueue, pMsg);
-                                fSendUpstream = false;
-                            }
-                            break;
-                        }
-#endif
-
                         case DL_BIND_ACK:
                         {
@@ -2405 +2389 @@
         return VERR_NET_MSG_SIZE;
 
-    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
-
     PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr;
     PVBOXNETFLTPACKETID pCur = NULL;
@@ -2441 +2422 @@
                 pCur = pPromiscStream->pTail;
                 vboxNetFltSolarisInitPacketId(pCur, pMsg);
+                pPromiscStream->cLoopback++;
 
                 LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback re-used tail checksum=%u cLoopback=%d.\n",
@@ -2486 +2468 @@
     }
 
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
     return rc;
 }
@@ -2562 +2543 @@
             pPromiscStream->pTail = pCur;
             pCur->pNext = NULL;
-            pPromiscStream->cLoopback--;
-        }
+        }
+        pPromiscStream->cLoopback--;
 
         LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p cLoopback=%d\n", pMsg, pPromiscStream->cLoopback));
@@ -2590 +2571 @@
     Assert(pStream->Type == kPromiscStream);
 
+    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
+    if (RT_UNLIKELY(!pPromiscStream))
+    {
+        freemsg(pMsg);
+        LogRel((DEVICE_NAME ":Promiscuous stream missing!! Failing to receive packet.\n"));
+        return VERR_INVALID_POINTER;
+    }
+
     /*
      * Don't loopback packets we transmit to the wire.
      */
-    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
     if (vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg))
     {
@@ -2975 +2963 @@
      */
     int rc = VINF_SUCCESS;
+    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
     if (fDst & INTNETTRUNKDIR_WIRE)
     {
-        vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
-        if (RT_LIKELY(pPromiscStream))
-        {
+        mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
+        if (RT_LIKELY(pMsg))
+        {
+            LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n"));
+
+            RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+
+            vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
             queue_t *pPromiscWriteQueue = WR(pPromiscStream->Stream.pReadQueue);
-            Assert(pPromiscWriteQueue);
-
-            mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
-            if (RT_LIKELY(pMsg))
-            {
-                LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n"));
-
-                rc = vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
-                putnext(pPromiscWriteQueue, pMsg);
-            }
-            else
-                rc = VERR_NO_MEMORY;
+
+            rc = vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
+
+            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+
+            putnext(pPromiscWriteQueue, pMsg);
         }
         else
-            rc = VERR_INVALID_POINTER;
+            rc = VERR_NO_MEMORY;
     }
 
@@ -3026 +3014 @@
                      * Send message up ARP stream.
                      */
+                    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+
                     vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvArpStream);
-                    queue_t *pArpReadQueue = pArpStream->pReadQueue;
-                    Assert(pArpReadQueue);
-
-                    putnext(pArpReadQueue, pMsg);
+                    if (RT_LIKELY(pArpStream))
+                    {
+                        queue_t *pArpReadQueue = pArpStream->pReadQueue;
+                        Assert(pArpReadQueue);
+
+                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+
+                        putnext(pArpReadQueue, pMsg);
+                    }
+                    else
+                    {
+                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+                        rc = VERR_INVALID_POINTER;
+                    }
                 }
                 else
@@ -3039 +3039 @@
                      * Send messages up IP stream.
                      */
+                    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+
                     vboxnetflt_stream_t *pIpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
-                    queue_t *pIpReadQueue = pIpStream->pReadQueue;
-                    Assert(pIpReadQueue);
-
-                    putnext(pIpReadQueue, pMsg);
+                    if (RT_LIKELY(pIpStream))
+                    {
+                        queue_t *pIpReadQueue = pIpStream->pReadQueue;
+                        Assert(pIpReadQueue);
+    
+                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+                        putnext(pIpReadQueue, pMsg);
+                    }
+                    else
+                    {
+                        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+                        rc = VERR_INVALID_POINTER;                    
+                    }
                 }
             }