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

Timestamp:

Sep 22, 2008 5:08:10 PM (16 years ago)

Author:

vboxsync

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

36946

Message:

Solaris/vboxnetflt: More threading/race fixes. Ugh.

Location:

trunk/src/VBox/HostDrivers/VBoxNetFlt

Files:

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

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

@@ -154 +154 @@
              * @{ */
             /** Pointer to the bound IP stream. */
-            void *pvIpStream;
+            void volatile *pvIpStream;
             /** Pointer to the bound ARP stream. */
-            void *pvArpStream;
+            void volatile *pvArpStream;
             /** Pointer to the unbound promiscuous stream. */
-            void *pvPromiscStream;
+            void volatile *pvPromiscStream;
             /** Layered device handle to the interface. */
             ldi_handle_t hIface;

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

@@ -194 +194 @@
     ddi_prop_op,                    /* property ops */
     &g_VBoxNetFltSolarisStreamTab,
-    D_NEW | D_MP | D_MTPERQ,        /* compat. flag */
+    D_NEW | D_MP | D_MTQPAIR,       /* compat. flag */
     CB_REV                          /* revision */
 };
@@ -2381 +2381 @@
  * @param   pPromiscStream      Pointer to the promiscuous stream.
  * @param   pMsg                Pointer to the message.
+ * @remarks Warning!! Assumes caller has taken care of any locking necessary.
  */
 static int vboxNetFltSolarisQueueLoopback(PVBOXNETFLTINS pThis, vboxnetflt_promisc_stream_t *pPromiscStream, mblk_t *pMsg)
@@ -2427 +2428 @@
                 pPromiscStream->pHead = pCur;
                 pPromiscStream->pTail = pCur;
+                pCur->pNext = NULL;
                 pPromiscStream->cLoopback++;
 
@@ -2445 +2447 @@
             }
 
-            Assert(pPromiscStream->pTail);
+            AssertRelease(pPromiscStream->pTail);
 
             pCur = RTMemAllocZ(sizeof(VBOXNETFLTPACKETID));
@@ -2454 +2456 @@
             }
 
+            vboxNetFltSolarisInitPacketId(pCur, pMsg);
             pPromiscStream->pTail->pNext = pCur;
-            vboxNetFltSolarisInitPacketId(pCur, pMsg);
+            pPromiscStream->pTail = pCur;
+            pCur->pNext = NULL;
             pPromiscStream->cLoopback++;
 
@@ -2482 +2486 @@
     }
 
-    RTSpinlockRelease(pThis->hSpinlock, &Tmp);        
+    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
     return rc;
 }
@@ -2558 +2562 @@
             pPromiscStream->pTail = pCur;
             pCur->pNext = NULL;
+            pPromiscStream->cLoopback--;
         }
 
@@ -2969 +2974 @@
      * Create a message block and send it down the wire (downstream).
      */
+    int rc = VINF_SUCCESS;
     if (fDst & INTNETTRUNKDIR_WIRE)
     {
         vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
-        if (!pPromiscStream)
-            return VERR_INVALID_POINTER;
-
-        queue_t *pPromiscWriteQueue = WR(pPromiscStream->Stream.pReadQueue);
-        Assert(pPromiscWriteQueue);
-
+        if (RT_LIKELY(pPromiscStream))
+        {
+            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;
+        }
+        else
+            rc = VERR_INVALID_POINTER;
+    }
+
+
+    /*
+     * Create a message block and send it up the host stack (upstream).
+     */
+    if (fDst & INTNETTRUNKDIR_HOST)
+    {
         mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
-        if (RT_UNLIKELY(!pMsg))
-        {
-            LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit vboxNetFltSolarisMBlkFromSG failed.\n"));
-            return VERR_NO_MEMORY;
-        }
-
-        LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_WIRE\n"));
-
-        vboxNetFltSolarisQueueLoopback(pThis, pPromiscStream, pMsg);
-        putnext(pPromiscWriteQueue, pMsg);
-    }
-
-    /*
-     * Create a message block and send it up the host stack (upstream).
-     */
-    if (fDst & INTNETTRUNKDIR_HOST)
-    {
-        mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
-        if (RT_UNLIKELY(!pMsg))
-        {
-            LogRel((DEVICE_NAME ":vboxNetFltPortOsXmit vboxNetFltSolarisMBlkFromSG failed.\n"));
-            return VERR_NO_MEMORY;
-        }
-
-        PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr;
-        bool fArp = (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_ARP));
-
-        /*
-         * Construct a DL_UNITDATA_IND style message.
-         */
-        mblk_t *pDlpiMsg;
-        int rc = vboxNetFltSolarisRawToUnitData(pMsg, &pDlpiMsg);
-        if (RT_FAILURE(rc))
-        {
-            LogRel((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData failed! rc=%d\n", rc));
-            freemsg(pMsg);
-            return VERR_NO_MEMORY;
-        }
-        pMsg = pDlpiMsg;
-
-        if (fArp)
-        {
-            LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST ARP\n"));
+        if (RT_LIKELY(pMsg))
+        {
+            PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr;
+            bool fArp = (pEthHdr->EtherType == RT_H2BE_U16(RTNET_ETHERTYPE_ARP));
 
             /*
-             * Send message up ARP stream.
+             * Construct a DL_UNITDATA_IND style message.
              */
-            vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvArpStream);
-            queue_t *pArpReadQueue = pArpStream->pReadQueue;
-            Assert(pArpReadQueue);
-
-            putnext(pArpReadQueue, pMsg);
+            mblk_t *pDlpiMsg;
+            int rc = vboxNetFltSolarisRawToUnitData(pMsg, &pDlpiMsg);
+            if (RT_SUCCESS(rc))
+            {
+                pMsg = pDlpiMsg;
+
+                if (fArp)
+                {
+                    LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST ARP\n"));
+
+                    /*
+                     * Send message up ARP stream.
+                     */
+                    vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvArpStream);
+                    queue_t *pArpReadQueue = pArpStream->pReadQueue;
+                    Assert(pArpReadQueue);
+
+                    putnext(pArpReadQueue, pMsg);
+                }
+                else
+                {
+                    LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST\n"));
+
+                    /*
+                     * Send messages up IP stream.
+                     */
+                    vboxnetflt_stream_t *pIpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
+                    queue_t *pIpReadQueue = pIpStream->pReadQueue;
+                    Assert(pIpReadQueue);
+
+                    putnext(pIpReadQueue, pMsg);
+                }
+            }
+            else
+            {
+                LogRel((DEVICE_NAME ":vboxNetFltSolarisRawToUnitData failed! rc=%d\n", rc));
+                freemsg(pMsg);
+                rc = VERR_NO_MEMORY;
+            }
         }
         else
-        {
-            LogFlow((DEVICE_NAME ":vboxNetFltPortOsXmit INTNETTRUNKDIR_HOST\n"));
-
-            /*
-             * Send messages up IP stream.
-             */
-            vboxnetflt_stream_t *pIpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
-            queue_t *pIpReadQueue = pIpStream->pReadQueue;
-            Assert(pIpReadQueue);
-
-            putnext(pIpReadQueue, pMsg);
-        }
-    }
-
-    return VINF_SUCCESS;
-}
-
+            rc = VERR_NO_MEMORY;
+    }
+
+    return rc;
+}
+