Changeset 12633 in vbox

Timestamp:

Sep 22, 2008 12:02:48 PM (17 years ago)

Author:

vboxsync

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

36913

Message:

Solaris/vboxnetflt: attempt to address setactive race during teardown.

File:

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

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

@@ -194 +194 @@
     ddi_prop_op,                    /* property ops */
     &g_VBoxNetFltSolarisStreamTab,
-    D_NEW | D_MP | D_MTPERMOD,      /* compat. flag */
+    D_NEW | D_MP | D_MTPERQ,        /* compat. flag */
     CB_REV                          /* revision */
 };
@@ -303 +303 @@
     queue_t *pReadQueue;                  /* read side queue */
     struct vboxnetflt_stream_t *pNext;    /* next stream in list */
-    PVBOXNETFLTINS pThis;                 /* the backend instance */
+    PVBOXNETFLTINS volatile pThis;        /* the backend instance */
     VBOXNETFLTSTREAMTYPE Type;            /* the type of the stream Ip/Arp */
 } vboxnetflt_stream_t;
@@ -701 +701 @@
      * the one that we will associate this stream with.
      */
-    pStream->pThis = pThis;
+    ASMAtomicUoWritePtr((void * volatile *)&pStream->pThis, pThis);
     pStream->Type = pState->CurType;
     switch (pStream->Type)
     {
-        case kIpStream:         ASMAtomicUoWritePtr(&pThis->u.s.pvIpStream, pStream);         break;
-        case kArpStream:        ASMAtomicUoWritePtr(&pThis->u.s.pvArpStream, pStream);        break;
-        case kPromiscStream:    ASMAtomicUoWritePtr(&pThis->u.s.pvPromiscStream, pStream);    break;
+        case kIpStream:         ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pvIpStream, pStream);         break;
+        case kArpStream:        ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pvArpStream, pStream);        break;
+        case kPromiscStream:    ASMAtomicUoWritePtr((void * volatile *)&pThis->u.s.pvPromiscStream, pStream);    break;
         default:    /* Heh. */
         {
@@ -806 +806 @@
 
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
-    PVBOXNETFLTINS pThis = pStream->pThis;
+    PVBOXNETFLTINS pThis = ASMAtomicUoReadPtr((void * volatile *)&pStream->pThis);
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
 
@@ -871 +871 @@
     bool fSendUpstream = true;
     bool fActive = false;
+    bool fRetained = false;
     vboxnetflt_stream_t *pStream = pQueue->q_ptr;
     PVBOXNETFLTINS pThis = NULL;
@@ -881 +882 @@
         && pStream->Type == kPromiscStream)
     {
-        pThis = vboxNetFltSolarisFindInstance(pStream);
+        pThis = ASMAtomicUoReadPtr((void * volatile *)&pStream->pThis);
         if (RT_LIKELY(pThis))
         {
@@ -890 +891 @@
             RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
             fActive = ASMAtomicUoReadBool(&pThis->fActive);
-            if (fActive)
-                vboxNetFltRetain(pThis, true);
+            vboxNetFltRetain(pThis, true);
+            fRetained = true;
             RTSpinlockRelease(pThis->hSpinlock, &Tmp);
 
@@ -1035 +1036 @@
     }
 
-    if (fActive)
+    if (fRetained)
         vboxNetFltRelease(pThis, true);
 
@@ -1774 +1775 @@
     RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
 
-    vboxnetflt_promisc_stream_t *pPromiscStream = pThis->u.s.pvPromiscStream;
+    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
     if (pPromiscStream)
     {
@@ -2377 +2378 @@
  *
  * @returns VBox status code.
- * @param   pThis       The instance.
+ * @param   pThis               The instance.
  * @param   pPromiscStream      Pointer to the promiscuous stream.
- * @param   pMsg        Pointer to the message.
+ * @param   pMsg                Pointer to the message.
  */
 static int vboxNetFltSolarisQueueLoopback(PVBOXNETFLTINS pThis, vboxnetflt_promisc_stream_t *pPromiscStream, mblk_t *pMsg)
@@ -2390 +2391 @@
     LogFlow((DEVICE_NAME ":vboxNetFltSolarisQueueLoopback pThis=%p pPromiscStream=%p pMsg=%p\n", pThis, pPromiscStream, pMsg));
 
+    if (RT_UNLIKELY(pMsg->b_cont))
+    {
+        /*
+         * We don't currently make chained messages in on Xmit
+         * so this only needs to be supported when we do that.
+         */
+        return VERR_NOT_SUPPORTED;
+    }
+
     size_t cbMsg = MBLKL(pMsg);
-    if (cbMsg < sizeof(RTNETETHERHDR))
+    if (RT_UNLIKELY(cbMsg < sizeof(RTNETETHERHDR)))
         return VERR_NET_MSG_SIZE;
-
-    if (pMsg->b_cont)
-    {
-        /* @todo -XXX- handle chained messages */
-        return VERR_NOT_IMPLEMENTED;
-    }
 
     RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
@@ -2502 +2506 @@
     if (pMsg->b_cont)
     {
-        /** @todo -XXX- implement chained message handling. */
+        /** Handle this when Xmit makes chained messages */
         return false;
     }
@@ -2510 +2514 @@
         return false;
 
+    PVBOXNETFLTPACKETID pPrev = NULL;
     PVBOXNETFLTPACKETID pCur = pPromiscStream->pHead;
     bool fIsOur = false;
     while (pCur)
     {
-        if (pCur->cbPacket != cbMsg)
-        {
-            pCur = pCur->pNext;
-            continue;
-        }
-
         PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pMsg->b_rptr;
-        if (   pCur->SrcMac.au8[0] != pEthHdr->SrcMac.au8[0]
+        if (   pCur->cbPacket != cbMsg
+            || pCur->SrcMac.au8[0] != pEthHdr->SrcMac.au8[0]
             || pCur->SrcMac.au8[1] != pEthHdr->SrcMac.au8[1]
             || pCur->SrcMac.au8[2] != pEthHdr->SrcMac.au8[2]
@@ -2534 +2534 @@
             || pCur->DstMac.au8[5] != pEthHdr->DstMac.au8[5])
         {
+            pPrev = pCur;
             pCur = pCur->pNext;
             continue;
@@ -2541 +2542 @@
         if (pCur->Checksum != Checksum)
         {
+            pPrev = pCur;
             pCur = pCur->pNext;
             continue;
@@ -2547 +2549 @@
         /*
          * Yes, it really is our own packet, mark it as handled
-         * and return it's found.
+         * and move it to the tail and return it's found.
          */
         pCur->cbPacket = 0;
+        if (pPrev)
+        {
+            pPrev->pNext = pCur->pNext;
+            pPromiscStream->pTail->pNext = pCur;
+            pPromiscStream->pTail = pCur;
+            pCur->pNext = NULL;
+        }
+
         LogFlow((DEVICE_NAME ":vboxNetFltSolarisIsOurMBlk found packet %p cLoopback=%d\n", pMsg, pPromiscStream->cLoopback));
         return true;
@@ -2578 +2588 @@
      * Don't loopback packets we transmit to the wire.
      */
-    vboxnetflt_promisc_stream_t *pPromiscStream = pThis->u.s.pvPromiscStream;
+    vboxnetflt_promisc_stream_t *pPromiscStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
     if (vboxNetFltSolarisIsOurMBlk(pThis, pPromiscStream, pMsg))
     {
@@ -2889 +2899 @@
      * Enable/disable promiscuous mode.
      */
-    vboxnetflt_stream_t *pStream = pThis->u.s.pvPromiscStream;
+    vboxnetflt_stream_t *pStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvPromiscStream);
     if (pStream)
     {
@@ -2961 +2971 @@
     if (fDst & INTNETTRUNKDIR_WIRE)
     {
-        vboxnetflt_promisc_stream_t *pPromiscStream = pThis->u.s.pvPromiscStream;
+        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);
 
         mblk_t *pMsg = vboxNetFltSolarisMBlkFromSG(pThis, pSG, fDst);
@@ -3015 +3026 @@
              * Send message up ARP stream.
              */
-            vboxnetflt_stream_t *pArpStream = pThis->u.s.pvArpStream;
+            vboxnetflt_stream_t *pArpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvArpStream);
             queue_t *pArpReadQueue = pArpStream->pReadQueue;
+            Assert(pArpReadQueue);
+
             putnext(pArpReadQueue, pMsg);
         }
@@ -3026 +3039 @@
              * Send messages up IP stream.
              */
-            vboxnetflt_stream_t *pIpStream = pThis->u.s.pvIpStream;
+            vboxnetflt_stream_t *pIpStream = ASMAtomicUoReadPtr((void * volatile *)&pThis->u.s.pvIpStream);
             queue_t *pIpReadQueue = pIpStream->pReadQueue;
+            Assert(pIpReadQueue);
+
             putnext(pIpReadQueue, pMsg);
         }