Changeset 41864 in vbox for trunk

Timestamp:

Jun 21, 2012 5:21:12 PM (13 years ago)

Author:

vboxsync

Message:

PCNet,NetShaper: PCNet exact packet len counting + wrong lock order fix in NetShaper (#5582)

Location:

trunk/src/VBox

Files:

• Devices/Network/DevPCNet.cpp (modified) (4 diffs)
• VMM/VMMR3/PDMNetShaper.cpp (modified) (3 diffs)

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

@@ -296 +296 @@
     STAMPROFILE                         StatTransmitSendR3;
     STAMPROFILE                         StatTransmitSendRZ;
+    STAMPROFILEADV                      StatTxLenCalcRZ;
+    STAMPROFILEADV                      StatTxLenCalcR3;
     STAMPROFILEADV                      StatTdtePollRZ;
     STAMPROFILEADV                      StatTdtePollR3;
@@ -1821 +1823 @@
 
 /**
+ * Poll Transmit Descriptor Table Entry
+ * @return true if transmit descriptors available
+ */
+static int pcnetCalcPacketLen(PCNetState *pThis, unsigned cb)
+{
+    TMD tmd;
+    unsigned cbPacket = cb;
+    uint32_t iDesc = CSR_XMTRC(pThis);
+
+    STAM_PROFILE_ADV_START(&pThis->CTX_SUFF_Z(StatTxLenCalc), a);
+    do
+    {
+        /* Advance the ring counter */
+        if (iDesc < 2)
+            iDesc = CSR_XMTRL(pThis);
+        else
+            iDesc--;
+
+        RTGCPHYS32 addrDesc = pcnetTdraAddr(pThis, iDesc);
+
+        if (!pcnetTmdLoad(pThis, &tmd, PHYSADDR(pThis, addrDesc), true))
+        {
+            STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatTxLenCalc), a);
+            /*
+             * No need to count further since this packet won't be sent anyway
+             * due to underflow.
+             */
+            Log3(("#%d pcnetCalcPacketLen: underflow, return %u\n", PCNET_INST_NR, cbPacket));
+            return cbPacket;
+        }
+        if (RT_UNLIKELY(tmd.tmd1.ones != 15))
+        {
+            STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatTxLenCalc), a);
+            LogRel(("PCNet#%d: BAD TMD XDA=%#010x\n",
+                    PCNET_INST_NR, PHYSADDR(pThis, addrDesc)));
+            Log3(("#%d pcnetCalcPacketLen: bad TMD, return %u\n", PCNET_INST_NR, cbPacket));
+            return cbPacket;
+        }
+        Log3(("#%d pcnetCalcPacketLen: got valid TMD, cb=%u\n", PCNET_INST_NR, 4096 - tmd.tmd1.bcnt));
+        cbPacket += 4096 - tmd.tmd1.bcnt;
+    } while (!tmd.tmd1.enp);
+    STAM_PROFILE_ADV_STOP(&pThis->CTX_SUFF_Z(StatTxLenCalc), a);
+
+    Log3(("#%d pcnetCalcPacketLen: return %u\n", PCNET_INST_NR, cbPacket));
+    return cbPacket;
+}
+
+
+/**
  * Write data into guest receive buffers.
  */
@@ -2503 +2554 @@
              */
             unsigned cb = 4096 - tmd.tmd1.bcnt;
-            rc = pcnetXmitAllocBuf(pThis, RT_MAX(MAX_FRAME, cb), fLoopback, &SgLoop, &pSgBuf);
+            rc = pcnetXmitAllocBuf(pThis, pcnetCalcPacketLen(pThis, cb), fLoopback, &SgLoop, &pSgBuf);
             if (rc == VERR_TRY_AGAIN)
             {
@@ -5331 +5382 @@
     PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatTransmitSendRZ,     STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet send transmit in RZ","/Devices/PCNet%d/Transmit/SendRZ", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatTransmitSendR3,     STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet send transmit in R3","/Devices/PCNet%d/Transmit/SendR3", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatTxLenCalcRZ,        STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet TX len calc in RZ",  "/Devices/PCNet%d/Transmit/LenCalcRZ", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatTxLenCalcR3,        STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet TX len calc in R3",  "/Devices/PCNet%d/Transmit/LenCalcR3", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatTdtePollRZ,         STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet TdtePoll in RZ",     "/Devices/PCNet%d/TdtePollRZ", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatTdtePollR3,         STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling PCNet TdtePoll in R3",     "/Devices/PCNet%d/TdtePollR3", iInstance);

trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp

@@ -233 +233 @@
 static void pdmNsBwGroupXmitPending(PPDMNSBWGROUP pBwGroup)
 {
-    int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
+    /*
+     * We don't need to hold the bandwidth group lock to iterate over the list
+     * of filters since the filters are removed while the shaper lock is being
+     * held.
+     */
+    AssertPtr(pBwGroup);
+    AssertPtr(pBwGroup->pShaper);
+    Assert(RTCritSectIsOwner(&pBwGroup->pShaper->cs));
+    //int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
 
     PPDMNSFILTER pFilter = pBwGroup->pFiltersHead;
@@ -249 +257 @@
     }
 
-    rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
+    //rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
 }
 
@@ -266 +274 @@
 {
     PPDMNSBWGROUP pBwGroup = pFilter->pBwGroupR3;
+    /*
+     * We need to make sure we hold the shaper lock since pdmNsBwGroupXmitPending()
+     * does not hold the bandwidth group lock while iterating over the list
+     * of group's filters.
+     */
+    AssertPtr(pBwGroup);
+    AssertPtr(pBwGroup->pShaper);
+    Assert(RTCritSectIsOwner(&pBwGroup->pShaper->cs));
     int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);