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

Timestamp:

Jan 14, 2010 3:06:13 PM (15 years ago)

Author:

vboxsync

Message:

#3987: Virtio minor cs optimizations + timer stats.

File:

• trunk/src/VBox/Devices/Network/DevVirtioNet.cpp (modified) (13 diffs)

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

@@ -140 +140 @@
     /**< Transmit Delay Timer - GC. */
     PTMTIMERRC              pTxTimerRC;
+
 #if HC_ARCH_BITS == 64
     uint32_t    padding2;
 #endif
 
+    uint32_t   u32i;
+    uint32_t   u32AvgDiff;
+    uint32_t   u32MinDiff;
+    uint32_t   u32MaxDiff;
+    uint64_t   u64NanoTS;
+
 #endif /* VNET_TX_DELAY */
+    /** Indicates transmission in progress -- only one thread is allowed. */
+    uint32_t                uIsTransmitting;
 
     /** PCI config area holding MAC address as well as TBD. */
@@ -170 +179 @@
     uint8_t                 aVlanFilter[VNET_MAX_VID / sizeof(uint8_t)];
 
-#if HC_ARCH_BITS == 64
+#if HC_ARCH_BITS != 64
     uint32_t    padding3;
 #endif
@@ -266 +275 @@
     // PDMCritSectLeave(&pState->csRx);
 }
+
+/**
+ * Dump a packet to debug log.
+ *
+ * @param   pState      The device state structure.
+ * @param   cpPacket    The packet.
+ * @param   cb          The size of the packet.
+ * @param   cszText     A string denoting direction of packet transfer.
+ */
+DECLINLINE(void) vnetPacketDump(PVNETSTATE pState, const uint8_t *cpPacket, size_t cb, const char *cszText)
+{
+#ifdef DEBUG
+    Log(("%s %s packet #%d (%d bytes):\n",
+         INSTANCE(pState), cszText, ++pState->u32PktNo, cb));
+    //Log3(("%.*Rhxd\n", cb, cpPacket));
+#endif
+}
+
 
 
@@ -354 +381 @@
     memset(pState->aMacFilter,  0, VNET_MAC_FILTER_LEN * sizeof(RTMAC));
     memset(pState->aVlanFilter, 0, sizeof(pState->aVlanFilter));
+    pState->uIsTransmitting   = 0;
 }
 
@@ -650 +678 @@
     hdr.u8GSOType = VNETHDR_GSO_NONE;
 
+    vnetPacketDump(pState, (const uint8_t*)pvBuf, cb, "<-- Incoming");
+
     unsigned int uOffset = 0;
     for (unsigned int nElem = 0; uOffset < cb; nElem++)
@@ -812 +842 @@
 static DECLCALLBACK(void) vnetTransmitPendingPackets(PVNETSTATE pState, PVQUEUE pQueue)
 {
+    /*
+     * Only one thread is allowed to transmit at a time, others should skip
+     * transmission as the packets will be picked up by the transmitting
+     * thread.
+     */
+    if (!ASMAtomicCmpXchgU32(&pState->uIsTransmitting, 1, 0))
+        return;
+
     if ((pState->VPCI.uStatus & VPCI_STATUS_DRV_OK) == 0)
     {
@@ -818 +856 @@
         return;
     }
+
+    Log3(("%s vnetTransmitPendingPackets: About to trasmit %d pending packets\n", INSTANCE(pState), 
+          vringReadAvailIndex(&pState->VPCI, &pState->pTxQueue->VRing) - pState->pTxQueue->uNextAvailIndex));
 
     vpciSetWriteLed(&pState->VPCI, true);
@@ -849 +890 @@
             if (pState->pDrv)
             {
+                vnetPacketDump(pState, pState->pTxBuf, uOffset, "--> Outgoing");
+
                 STAM_PROFILE_START(&pState->StatTransmitSend, a);
                 int rc = pState->pDrv->pfnSend(pState->pDrv, pState->pTxBuf, uOffset);
@@ -860 +903 @@
     }
     vpciSetWriteLed(&pState->VPCI, false);
+
+    ASMAtomicWriteU32(&pState->uIsTransmitting, 0);
 }
 
@@ -873 +918 @@
               "re-enable notification and flush TX queue\n", INSTANCE(pState)));
         vnetTransmitPendingPackets(pState, pQueue);
-        vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, true);
+        if (RT_FAILURE(vnetCsEnter(pState, VERR_SEM_BUSY)))
+            LogRel(("vnetQueueTransmit: Failed to enter critical section!/n"));
+        else
+        {
+            vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, true);
+            vnetCsLeave(pState);
+        }
     }
     else
     {
-        vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, false);
-        TMTimerSetMicro(pState->CTX_SUFF(pTxTimer), VNET_TX_DELAY);
+        if (RT_FAILURE(vnetCsEnter(pState, VERR_SEM_BUSY)))
+            LogRel(("vnetQueueTransmit: Failed to enter critical section!/n"));
+        else
+        {
+            vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, false);
+            TMTimerSetMicro(pState->CTX_SUFF(pTxTimer), VNET_TX_DELAY);
+            pState->u64NanoTS = RTTimeNanoTS();
+            vnetCsLeave(pState);
+        }
     }
 }
@@ -896 +954 @@
     VNETSTATE *pState = (VNETSTATE*)pvUser;
 
-    int rc = vnetCsEnter(pState, VERR_SEM_BUSY);
-    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+    uint32_t u32MicroDiff = (uint32_t)((RTTimeNanoTS() - pState->u64NanoTS)/1000);
+    if (u32MicroDiff < pState->u32MinDiff)
+        pState->u32MinDiff = u32MicroDiff;
+    if (u32MicroDiff > pState->u32MaxDiff)
+        pState->u32MaxDiff = u32MicroDiff;
+    pState->u32AvgDiff = (pState->u32AvgDiff * pState->u32i + u32MicroDiff) / (pState->u32i + 1);
+    pState->u32i++;
+    Log3(("vnetTxTimer: Expired, diff %9d usec, avg %9d usec, min %9d usec, max %9d usec\n",
+            u32MicroDiff, pState->u32AvgDiff, pState->u32MinDiff, pState->u32MaxDiff));
+
+//    Log3(("%s vnetTxTimer: Expired\n", INSTANCE(pState))); 
+    vnetTransmitPendingPackets(pState, pState->pTxQueue);
+    if (RT_FAILURE(vnetCsEnter(pState, VERR_SEM_BUSY)))
+    {
+        LogRel(("vnetTxTimer: Failed to enter critical section!/n"));
         return;
+    }
     vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, true);
-    Log3(("%s vnetTxTimer: Expired, %d packets pending\n", INSTANCE(pState),
-          vringReadAvailIndex(&pState->VPCI, &pState->pTxQueue->VRing) - pState->pTxQueue->uNextAvailIndex));
-    vnetTransmitPendingPackets(pState, pState->pTxQueue);
     vnetCsLeave(pState);
 }
@@ -1486 +1555 @@
     pState->pTxTimerR0 = TMTimerR0Ptr(pState->pTxTimerR3);
     pState->pTxTimerRC = TMTimerRCPtr(pState->pTxTimerR3);
+
+    pState->u32i = pState->u32AvgDiff = pState->u32MaxDiff = 0;
+    pState->u32MinDiff = ~0;
 #endif /* VNET_TX_DELAY */
 
@@ -1544 +1616 @@
     VNETSTATE* pState = PDMINS_2_DATA(pDevIns, VNETSTATE*);
 
+    LogRel(("TxTimer stats (avg/min/max): %7d usec %7d usec %7d usec\n",
+            pState->u32AvgDiff, pState->u32MinDiff, pState->u32MaxDiff));
     Log(("%s Destroying instance\n", INSTANCE(pState)));
     if (pState->hEventMoreRxDescAvail != NIL_RTSEMEVENT)