Changeset 52134 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jul 22, 2014 5:39:46 PM (11 years ago)

Author:

vboxsync

Message:

NDIS6: Cumulative commit containing async send, unload race fix (intnet), missing offload fix, basic vboxnetadp6.sys (#7231)

File:

• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp

@@ -450 +450 @@
 
 
+#ifdef VBOX_WITH_INTNET_DISCONNECT
+/*******************************************************************************
+*   Forward Declarations                                                       *
+*******************************************************************************/
+static void intnetR0TrunkIfDestroy(PINTNETTRUNKIF pThis, PINTNETNETWORK pNetwork);
+
+
+/**
+ * Checks if a pointer belongs to the list of known networks without
+ * accessing memory it points to.
+ *
+ * @returns true, if such network is in the list.
+ * @param   pIntNet     The pointer to the internal network instance (global).
+ * @param   pNetwork    The pointer that must be validated.
+ */
+DECLINLINE(bool) intnetR0NetworkIsValid(PINTNET pIntNet, PINTNETNETWORK pNetwork)
+{
+    for (PINTNETNETWORK pCurr = pIntNet->pNetworks; pCurr; pCurr = pCurr->pNext)
+        if (pCurr == pNetwork)
+            return true;
+    return false;
+}
+#endif /* VBOX_WITH_INTNET_DISCONNECT */
+
 
 /**
@@ -716 +740 @@
 DECLINLINE(void) intnetR0BusyDecTrunk(PINTNETTRUNKIF pTrunk)
 {
-    intnetR0BusyDec(pTrunk->pNetwork, &pTrunk->cBusy);
+    if (pTrunk)
+        intnetR0BusyDec(pTrunk->pNetwork, &pTrunk->cBusy);
 }
 
@@ -744 +769 @@
 DECLINLINE(void) intnetR0BusyIncTrunk(PINTNETTRUNKIF pTrunk)
 {
+    if (!pTrunk) return;
     uint32_t cNewBusy = ASMAtomicIncU32(&pTrunk->cBusy);
     AssertMsg((cNewBusy & ~INTNET_BUSY_WAKEUP_MASK) < INTNET_MAX_IFS * 3, ("%#x\n", cNewBusy));
@@ -3097 +3123 @@
      * since we modified the MAC in the initial request the guest made.
      */
+    RTSpinlockAcquire(pNetwork->hAddrSpinlock);
+    RTMAC MacAddrTrunk;
+    if (pNetwork->MacTab.pTrunk)
+        MacAddrTrunk = pNetwork->MacTab.pTrunk->MacAddr;
+    else
+        memset(&MacAddrTrunk, 0, sizeof(MacAddrTrunk));
+    RTSpinlockReleaseNoInts(pNetwork->hAddrSpinlock);
     if (    ar_oper == RTNET_ARPOP_REPLY
-        &&  !memcmp(&pArpIPv4->ar_tha, &pNetwork->MacTab.pTrunk->MacAddr, sizeof(RTMAC)))
+        &&  !memcmp(&pArpIPv4->ar_tha, &MacAddrTrunk, sizeof(RTMAC)))
     {
         PINTNETIF pIf = intnetR0NetworkAddrCacheLookupIf(pNetwork, (PCRTNETADDRU)&pArpIPv4->ar_tpa,
@@ -3106 +3139 @@
             Log6(("fw: ar_tha %.6Rhxs -> %.6Rhxs\n", &pArpIPv4->ar_tha, &pIf->MacAddr));
             pArpIPv4->ar_tha = pIf->MacAddr;
-            if (!memcmp(&pEthHdr->DstMac, &pNetwork->MacTab.pTrunk->MacAddr, sizeof(RTMAC)))
+            if (!memcmp(&pEthHdr->DstMac, &MacAddrTrunk, sizeof(RTMAC)))
             {
                 Log6(("fw: DstMac %.6Rhxs -> %.6Rhxs\n", &pEthHdr->DstMac, &pIf->MacAddr));
@@ -3272 +3305 @@
     /* ASSUMES: that the trunk won't change its report while we're checking. */
     PINTNETTRUNKIF  pTrunk = pDstTab->pTrunk;
-    if ((fTrunkDst & pTrunk->fNoPreemptDsts) == fTrunkDst)
+    if (pTrunk && (fTrunkDst & pTrunk->fNoPreemptDsts) == fTrunkDst)
         return true;
 
@@ -3517 +3550 @@
     {
         PINTNETTRUNKIF pTrunk = pDstTab->pTrunk;
-        intnetR0BusyDec(pNetwork, &pTrunk->cBusy);
+        if (pTrunk)
+            intnetR0BusyDec(pNetwork, &pTrunk->cBusy);
         pDstTab->pTrunk    = NULL;
         pDstTab->fTrunkDst = 0;
@@ -3574 +3608 @@
     {
         PINTNETTRUNKIF pTrunk = pDstTab->pTrunk;
-        if (pIfSender)
-            intnetR0TrunkIfSend(pTrunk, pNetwork, pIfSender, pDstTab->fTrunkDst, pSG);
-        intnetR0BusyDec(pNetwork, &pTrunk->cBusy);
+        if (pTrunk)
+        {
+            if (pIfSender)
+                intnetR0TrunkIfSend(pTrunk, pNetwork, pIfSender, pDstTab->fTrunkDst, pSG);
+            intnetR0BusyDec(pNetwork, &pTrunk->cBusy);
+        }
         pDstTab->pTrunk    = NULL;
         pDstTab->fTrunkDst = 0;
@@ -4971 +5008 @@
     pThis->fNoPreemptDsts = fNoPreemptDsts;
 }
+
+
+#ifdef VBOX_WITH_INTNET_DISCONNECT
+/** @copydoc INTNETTRUNKSWPORT::pfnDisconnect */
+static DECLCALLBACK(void) intnetR0TrunkIfPortDisconnect(PINTNETTRUNKSWPORT pSwitchPort)
+{
+    PINTNETTRUNKIF pThis = INTNET_SWITCHPORT_2_TRUNKIF(pSwitchPort);
+    /*
+     * We intentionally do not increase the busy count of the trunk as it will cause a deadlock
+     * with a racing intnetR0NetworkDestruct. It is safe to do only due to the fact that our
+     * caller must have increased the busy count of the corresponding netflt instance thus
+     * preventing intnetR0NetworkDestruct from destroying the trunk.
+     */
+    PINTNETNETWORK pNetwork = pThis->pNetwork;
+    if (pNetwork)
+    {
+        /*
+         * We need to save pIntNet too in case pNetwork becomes invalid while we are waiting
+         * on pIntNet->hMtxCreateOpenDestroy.
+         */
+        PINTNET pIntNet = pNetwork->pIntNet;
+        Assert(pNetwork->pIntNet);
+        /*
+         * We must decrease the busy count of corresponing netflt instance here allowing
+         * intnetR0NetworkDestruct to proceed with destruction.
+         */
+        pThis->pIfPort->pfnRelease(pThis->pIfPort, true);
+        /* Take the big create/open/destroy sem. */
+        RTSemMutexRequest(pIntNet->hMtxCreateOpenDestroy, RT_INDEFINITE_WAIT);
+        /*
+         * At this point pNetwork may no longer exist, being destroyed by intnetR0NetworkDestruct
+         * so we need to make sure it is still valid by looking it up in pIntNet->pNetworks.
+         */
+        if (intnetR0NetworkIsValid(pIntNet, pNetwork))
+        {
+            pThis->pIfPort->pfnSetState(pThis->pIfPort, INTNETTRUNKIFSTATE_DISCONNECTING);
+
+            RTSpinlockAcquire(pNetwork->hAddrSpinlock);
+            pNetwork->MacTab.pTrunk = NULL;
+            RTSpinlockReleaseNoInts(pNetwork->hAddrSpinlock);
+
+            intnetR0TrunkIfDestroy(pThis, pNetwork);
+        }
+
+        RTSemMutexRelease(pNetwork->pIntNet->hMtxCreateOpenDestroy);
+    }
+}
+#endif /* VBOX_WITH_INTNET_DISCONNECT */
 
 
@@ -5332 +5417 @@
         pTrunk->SwitchPort.pfnReportGsoCapabilities   = intnetR0TrunkIfPortReportGsoCapabilities;
         pTrunk->SwitchPort.pfnReportNoPreemptDsts     = intnetR0TrunkIfPortReportNoPreemptDsts;
+#ifdef VBOX_WITH_INTNET_DISCONNECT
+        pTrunk->SwitchPort.pfnDisconnect              = intnetR0TrunkIfPortDisconnect;
+#endif /* VBOX_WITH_INTNET_DISCONNECT */
         pTrunk->SwitchPort.u32VersionEnd              = INTNETTRUNKSWPORT_VERSION;
         //pTrunk->pIfPort                 = NULL;