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

Timestamp:

Sep 21, 2008 11:47:07 AM (16 years ago)

Author:

vboxsync

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

36894

Message:

Solaris/vboxnetflt: race handling, more paranoid.

File:

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

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

@@ -604 +604 @@
     }
 
+    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+    PVBOXNETFLTINS pThis = pState->pCurInstance;
+    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
+
     /*
      * Check VirtualBox stream type.
@@ -610 +614 @@
     {
         LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed due to undefined VirtualBox open mode.\n"));
+
+        RTSpinlockRelease(pThis->hSpinlock, &Tmp);
         return ENOENT;
     }
@@ -638 +644 @@
         {
             LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to allocate promiscuous stream data.\n"));
+
+            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
             return ENOMEM;
         }
@@ -656 +664 @@
         {
             LogRel((DEVICE_NAME ":VBoxNetFltSolarisModOpen failed to allocate stream data.\n"));
+    
+            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
             return ENOMEM;
         }
@@ -666 +676 @@
      * the one that we will associate this stream with.
      */
-    pStream->pThis = pState->pCurInstance;
+    pStream->pThis = pThis;
     pStream->Type = pState->CurType;
     switch (pStream->Type)
     {
-        case kIpStream:         pState->pCurInstance->u.s.pvIpStream = pStream;         break;
-        case kArpStream:        pState->pCurInstance->u.s.pvArpStream = pStream;        break;
-        case kPromiscStream:    pState->pCurInstance->u.s.pvPromiscStream = pStream;    break;
-        default:    AssertRelease(pStream->Type);   break;
+        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;
+        default:    /* Heh. */
+        {
+                RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+                AssertRelease(pStream->Type);
+                break;
+        }
     }
 
@@ -693 +708 @@
         /*
          * Bind to SAP 0 (DL_ETHER).
-         * Note: We don't support DL_TPR (token passing ring) SAP as that is
-         * unnecessary asynchronous work to get DL_INFO_REQ acknowledgements
-         * and determine SAP based on the Mac Type etc. Besides nobody uses
-         * TPR anymore as far as I know.
+         * Note: We don't support DL_TPR (token passing ring) SAP as that is unnecessary asynchronous
+         * work to get DL_INFO_REQ acknowledgements and determine SAP based on the Mac Type etc.
+         * Besides TPR doesn't really exist anymore practically as far as I know.
          */
         int rc = vboxNetFltSolarisBindReq(pStream->pReadQueue, 0 /* SAP */);
-        if (RT_UNLIKELY(RT_FAILURE(rc)))
-        {
+        if (RT_LIKELY(RT_SUCCESS(rc)))
+        {
+            /*
+             * Request the physical address (we cache the acknowledgement).
+             */
+            /** @todo take a look at DLPI notifications additionally for these things. */
+            rc = vboxNetFltSolarisPhysAddrReq(pStream->pReadQueue);
+            if (RT_LIKELY(RT_SUCCESS(rc)))
+            {
+                /*
+                 * Enable raw mode.
+                 */
+                rc = vboxNetFltSolarisSetRawMode(pPromiscStream);
+                if (RT_FAILURE(rc))
+                    LogRel((DEVICE_NAME ":vboxNetFltSolarisSetRawMode failed rc=%Vrc.\n", rc));
+            }
+            else
+                LogRel((DEVICE_NAME ":vboxNetFltSolarisSetRawMode failed rc=%Vrc.\n", rc));
+        }
+        else        
             LogRel((DEVICE_NAME ":vboxNetFltSolarisBindReq failed rc=%Vrc.\n", rc));
+
+        if (RT_FAILURE(rc))
+        {
+            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
             return EPROTO;
-        }
-
-        /*
-         * Request the physical address (we cache the acknowledgement).
-         */
-        /** @todo take a look at DLPI notifications additionally for these things. */
-        rc = vboxNetFltSolarisPhysAddrReq(pStream->pReadQueue);
-        if (RT_UNLIKELY(RT_FAILURE(rc)))
-        {
-            LogRel((DEVICE_NAME ":vboxNetFltSolarisPhysAddrReq failed rc=%Vrc.\n", rc));
-            return EPROTO;
-        }
-
-        /*
-         * Enable raw mode.
-         */
-        rc = vboxNetFltSolarisSetRawMode(pPromiscStream);
-        if (RT_UNLIKELY(RT_FAILURE(rc)))
-        {
-            LogRel((DEVICE_NAME ":vboxNetFltSolarisSetRawMode failed rc=%Vrc.\n", rc));
-            return EPROTO;        
         }
     }
@@ -732 +747 @@
     LogFlow((DEVICE_NAME ":VBoxNetFltSolarisModOpen returns 0, DevMinor=%d pQueue=%p\n", DevMinor, pStream->pReadQueue));
 
+    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
     return 0;
 }
@@ -763 +779 @@
         return ENXIO;
     }
+
+    RTSPINLOCKTMP Tmp = RTSPINLOCKTMP_INITIALIZER;
+    PVBOXNETFLTINS pThis = pStream->pThis;
+    RTSpinlockAcquire(pThis->hSpinlock, &Tmp);
 
     qprocsoff(pQueue);
@@ -782 +802 @@
         case kArpStream:        ASMAtomicUoWritePtr(pStream->pThis->u.s.pvArpStream, NULL);     break;
         case kPromiscStream:    ASMAtomicUoWritePtr(pStream->pThis->u.s.pvPromiscStream, NULL); break;
-        default: AssertRelease(pStream->Type); break;
+        default:    /* Heh. */
+        {
+            RTSpinlockRelease(pThis->hSpinlock, &Tmp);
+            AssertRelease(pStream->Type);
+            break;
+        }
     }
 
@@ -791 +816 @@
     NOREF(fOpenMode);
     NOREF(pCred);
+
+    RTSpinlockRelease(pThis->hSpinlock, &Tmp);
 
     return 0;
@@ -2314 +2341 @@
         fSrc = INTNETTRUNKDIR_HOST;
 
-#if 1
+    /*
+     * Afaik; we no longer need to worry about incorrect checksums because we now use
+     * a dedicated stream and don't intercept packets under IP/ARP which might be doing
+     * checksum offloading.
+     */
+#if 0
     if (fSrc & INTNETTRUNKDIR_HOST)
     {
@@ -2321 +2353 @@
             pMsg = pCorrectedMsg;
     }
+
+    vboxNetFltSolarisAnalyzeMBlk(pMsg);
 #endif
-
-    vboxNetFltSolarisAnalyzeMBlk(pMsg);
 
     /*
@@ -2433 +2465 @@
         PRTNETIPV4 pIpHdr = (PRTNETIPV4)pbProtocol;
         size_t cbPayload = cbIpPacket - (pIpHdr->ip_hl << 2);
-
         bool fChecksumAdjusted = false;
-
-        /*
-         * Fix up TCP/UDP and IP checksums if they're incomplete/invalid.
-         */
-        if (pIpHdr->ip_p == RTNETIPV4_PROT_TCP)
+        if (RTNetIPv4IsHdrValid(pIpHdr, cbPayload, cbPayload))
         {
             pbProtocol += (pIpHdr->ip_hl << 2);
-            PRTNETTCP pTcpHdr = (PRTNETTCP)pbProtocol;
-            uint16_t TcpChecksum = RTNetIPv4TCPChecksum(pIpHdr, pTcpHdr, NULL);
-            if (pTcpHdr->th_sum != TcpChecksum)
+
+            /*
+             * Fix up TCP/UDP and IP checksums if they're incomplete/invalid.
+             */
+            if (pIpHdr->ip_p == RTNETIPV4_PROT_TCP)
             {
-                pTcpHdr->th_sum = TcpChecksum;
-                fChecksumAdjusted = true;
-                LogFlow((DEVICE_NAME ":fixed TCP checksum.\n"));
+                PRTNETTCP pTcpHdr = (PRTNETTCP)pbProtocol;
+                uint16_t TcpChecksum = RTNetIPv4TCPChecksum(pIpHdr, pTcpHdr, NULL);
+                if (pTcpHdr->th_sum != TcpChecksum)
+                {
+                    pTcpHdr->th_sum = TcpChecksum;
+                    fChecksumAdjusted = true;
+                    LogFlow((DEVICE_NAME ":fixed TCP checksum.\n"));
+                }
             }
-
-            uint16_t IpChecksum = RTNetIPv4HdrChecksum(pIpHdr);
-            if (pIpHdr->ip_sum != IpChecksum)
+            else if (pIpHdr->ip_p == RTNETIPV4_PROT_UDP)
             {
-                pIpHdr->ip_sum = IpChecksum;
-                fChecksumAdjusted = true;
-                LogFlow((DEVICE_NAME ":fixed IP checksum.\n"));
-            }
-        }
-        else if (pIpHdr->ip_p == RTNETIPV4_PROT_UDP)
-        {
-            pbProtocol += (pIpHdr->ip_hl << 2);
-            PRTNETUDP pUdpHdr = (PRTNETUDP)pbProtocol;
-            uint16_t UdpChecksum = RTNetIPv4UDPChecksum(pIpHdr, pUdpHdr, pUdpHdr + 1);
-
-            if (pUdpHdr->uh_sum != UdpChecksum)
-            {
-                pUdpHdr->uh_sum = UdpChecksum;
-                fChecksumAdjusted = true;
-                LogFlow((DEVICE_NAME ":Fixed UDP checksum."));
-            }
-
-            uint16_t IpChecksum = RTNetIPv4HdrChecksum(pIpHdr);
-            if (pIpHdr->ip_sum != IpChecksum)
-            {
-                pIpHdr->ip_sum = IpChecksum;
-                fChecksumAdjusted = true;
-                LogFlow((DEVICE_NAME ":fixed IP checksum.\n"));
+                PRTNETUDP pUdpHdr = (PRTNETUDP)pbProtocol;
+                uint16_t UdpChecksum = RTNetIPv4UDPChecksum(pIpHdr, pUdpHdr, pUdpHdr + 1);
+
+                if (pUdpHdr->uh_sum != UdpChecksum)
+                {
+                    pUdpHdr->uh_sum = UdpChecksum;
+                    fChecksumAdjusted = true;
+                    LogFlow((DEVICE_NAME ":Fixed UDP checksum."));
+                }
             }
         }