Changeset 25158 in vbox for trunk/src

Timestamp:

Dec 3, 2009 9:43:03 AM (15 years ago)

Author:

vboxsync

Message:

#4507: Virtio: csRx removed, cs moved out of GC.

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet.cpp (modified) (11 diffs)
• VirtIO/Virtio.cpp (modified) (4 diffs)
• VirtIO/Virtio.h (modified) (2 diffs)

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

@@ -114 +114 @@
     VPCISTATE               VPCI;
 
-    PDMCRITSECT             csRx;                           /**< Protects RX queue. */
+//    PDMCRITSECT             csRx;                           /**< Protects RX queue. */
 
     PDMINETWORKPORT         INetworkPort;
@@ -187 +187 @@
     STAMCOUNTER             StatTransmitBytes;
 #if defined(VBOX_WITH_STATISTICS)
-    STAMPROFILEADV          StatReceive;
+    STAMPROFILE             StatReceive;
+    STAMPROFILE             StatReceiveStore;
     STAMPROFILEADV          StatTransmit;
-    STAMPROFILEADV          StatTransmitSend;
+    STAMPROFILE             StatTransmitSend;
     STAMPROFILE             StatRxOverflow;
     STAMCOUNTER             StatRxOverflowWakeup;
@@ -254 +255 @@
 DECLINLINE(int) vnetCsRxEnter(PVNETSTATE pState, int rcBusy)
 {
-    return PDMCritSectEnter(&pState->csRx, rcBusy);
+    // STAM_PROFILE_START(&pState->CTXSUFF(StatCsRx), a);
+    // int rc = PDMCritSectEnter(&pState->csRx, rcBusy);
+    // STAM_PROFILE_STOP(&pState->CTXSUFF(StatCsRx), a);
+    // return rc;
+    return VINF_SUCCESS;
 }
 
 DECLINLINE(void) vnetCsRxLeave(PVNETSTATE pState)
 {
-    PDMCritSectLeave(&pState->csRx);
+    // PDMCritSectLeave(&pState->csRx);
 }
 
@@ -683 +688 @@
             uElemSize += uSize;
         }
+        STAM_PROFILE_START(&pState->StatReceiveStore, a);
         vqueuePut(&pState->VPCI, pState->pRxQueue, &elem, uElemSize);
+        STAM_PROFILE_STOP(&pState->StatReceiveStore, a);
     }
     vqueueSync(&pState->VPCI, pState->pRxQueue);
@@ -715 +722 @@
         return VINF_SUCCESS;
 
-    STAM_PROFILE_ADV_START(&pState->StatReceive, a);
+    STAM_PROFILE_START(&pState->StatReceive, a);
     vpciSetReadLed(&pState->VPCI, true);
     if (vnetAddressFilter(pState, pvBuf, cb))
@@ -728 +735 @@
     }
     vpciSetReadLed(&pState->VPCI, false);
-    STAM_PROFILE_ADV_STOP(&pState->StatReceive, a);
+    STAM_PROFILE_STOP(&pState->StatReceive, a);
     return rc;
 }
@@ -840 +847 @@
                 uOffset += uSize;
             }
-            STAM_PROFILE_ADV_START(&pState->StatTransmitSend, a);
+            STAM_PROFILE_START(&pState->StatTransmitSend, a);
             int rc = pState->pDrv->pfnSend(pState->pDrv, pState->pTxBuf, uOffset);
-            STAM_PROFILE_ADV_STOP(&pState->StatTransmitSend, a);
+            STAM_PROFILE_STOP(&pState->StatTransmitSend, a);
             STAM_REL_COUNTER_ADD(&pState->StatTransmitBytes, uOffset);
         }
@@ -860 +867 @@
     {
         int rc = TMTimerStop(pState->CTX_SUFF(pTxTimer));
-        vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, true);
         Log3(("%s vnetQueueTransmit: Got kicked with notification disabled, "
               "re-enable notification and flush TX queue\n", INSTANCE(pState)));
         vnetTransmitPendingPackets(pState, pQueue);
+        vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, true);
     }
     else
     {
+        vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, false);
         TMTimerSetMicro(pState->CTX_SUFF(pTxTimer), VNET_TX_DELAY);
-        vringSetNotification(&pState->VPCI, &pState->pTxQueue->VRing, false);
     }
 }
@@ -1430 +1437 @@
 
     /* Initialize critical section. */
-    char szTmp[sizeof(pState->VPCI.szInstance) + 2];
-    RTStrPrintf(szTmp, sizeof(szTmp), "%sRX", pState->VPCI.szInstance);
-    rc = PDMDevHlpCritSectInit(pDevIns, &pState->csRx, szTmp);
-    if (RT_FAILURE(rc))
-        return rc;
+    // char szTmp[sizeof(pState->VPCI.szInstance) + 2];
+    // RTStrPrintf(szTmp, sizeof(szTmp), "%sRX", pState->VPCI.szInstance);
+    // rc = PDMDevHlpCritSectInit(pDevIns, &pState->csRx, szTmp);
+    // if (RT_FAILURE(rc))
+    //     return rc;
 
     /* Map our ports to IO space. */
@@ -1511 +1518 @@
 #if defined(VBOX_WITH_STATISTICS)
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatReceive,            STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling receive",                  "/Devices/VNet%d/Receive/Total", iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatReceiveStore,       STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling receive storing",          "/Devices/VNet%d/Receive/Store", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatRxOverflow,         STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_OCCURENCE, "Profiling RX overflows",        "/Devices/VNet%d/RxOverflow", iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatRxOverflowWakeup,   STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Nr of RX overflow wakeups",          "/Devices/VNet%d/RxOverflowWakeup", iInstance);
@@ -1546 +1554 @@
         pState->pTxBuf = NULL;
     }
-    if (PDMCritSectIsInitialized(&pState->csRx))
-        PDMR3CritSectDelete(&pState->csRx);
+    // if (PDMCritSectIsInitialized(&pState->csRx))
+    //     PDMR3CritSectDelete(&pState->csRx);
 
     return vpciDestruct(&pState->VPCI);

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -422 +422 @@
     bool        fHasBecomeReady;
     STAM_PROFILE_ADV_START(&pState->CTXSUFF(StatIOWrite), a);
-
-    rc = vpciCsEnter(pState, VINF_IOM_HC_IOPORT_WRITE);
-    if (RT_UNLIKELY(rc != VINF_SUCCESS))
-    {
-        STAM_PROFILE_ADV_STOP(&pState->CTXSUFF(StatIOWrite), a);
-        return rc;
-    }
-
 
     port -= pState->addrIOPort;
@@ -487 +479 @@
             if (u32 < pState->nQueues)
                 if (pState->Queues[u32].VRing.addrDescriptors)
-                    pState->Queues[u32].pfnCallback(pState, &pState->Queues[u32]);
+                {
+                    rc = vpciCsEnter(pState, VERR_SEM_BUSY);
+                    if (RT_LIKELY(rc == VINF_SUCCESS))
+                    {
+                        pState->Queues[u32].pfnCallback(pState, &pState->Queues[u32]);
+                        vpciCsLeave(pState);
+                    }
+                }
                 else
                     Log(("%s The queue (#%d) being notified has not been initialized.\n",
@@ -519 +518 @@
 
     STAM_PROFILE_ADV_STOP(&pState->CTXSUFF(StatIOWrite), a);
-    vpciCsLeave(pState);
     return rc;
 }
@@ -857 +855 @@
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatIntsRaised,         STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Number of raised interrupts",   vpciCounter(pcszNameFmt, "Interrupts/Raised"), iInstance);
     PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatIntsSkipped,        STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,     "Number of skipped interrupts",   vpciCounter(pcszNameFmt, "Interrupts/Skipped"), iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatCsGC,               STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling CS wait in GC",      vpciCounter(pcszNameFmt, "Cs/CsGC"), iInstance);
+    PDMDevHlpSTAMRegisterF(pDevIns, &pState->StatCsHC,               STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL, "Profiling CS wait in HC",      vpciCounter(pcszNameFmt, "Cs/CsHC"), iInstance);
 #endif /* VBOX_WITH_STATISTICS */
 

trunk/src/VBox/Devices/VirtIO/Virtio.h

@@ -212 +212 @@
     STAMCOUNTER            StatIntsRaised;
     STAMCOUNTER            StatIntsSkipped;
+    STAMPROFILE            StatCsGC;
+    STAMPROFILE            StatCsHC;
 #endif /* VBOX_WITH_STATISTICS */
 };
@@ -267 +269 @@
                      const char *pcszName);
 
-
+#define VPCI_CS
 DECLINLINE(int) vpciCsEnter(VPCISTATE *pState, int iBusyRc)
 {
-    return PDMCritSectEnter(&pState->cs, iBusyRc);
+#ifdef VPCI_CS
+    STAM_PROFILE_START(&pState->CTXSUFF(StatCs), a);
+    int rc = PDMCritSectEnter(&pState->cs, iBusyRc);
+    STAM_PROFILE_STOP(&pState->CTXSUFF(StatCs), a);
+    return rc;
+#else
+    return VINF_SUCCESS;
+#endif
 }
 
 DECLINLINE(void) vpciCsLeave(VPCISTATE *pState)
 {
+#ifdef VPCI_CS
     PDMCritSectLeave(&pState->cs);
+#endif
 }