Changeset 24623 in vbox for trunk

Timestamp:

Nov 12, 2009 8:04:13 PM (15 years ago)

Author:

vboxsync

Message:

Virtio: small optimization (static TX buffer)

File:

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

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

@@ -225 +225 @@
 PDMBOTHCBDECL(void)     vnetReset(void *pState);
 PDMBOTHCBDECL(void)     vnetReady(void *pState);
-#ifdef DEBUG
-static const char *vnetGetQueueName(void *pvState, PVQUEUE pQueue);
-#endif /* DEBUG */
 RT_C_DECLS_END
 
@@ -982 +979 @@
               pState->Queues[i].uNextUsedIndex,
               pState->Queues[i].uPageNumber));
-
 }
 #else
-#define vpciDumpState(x, s)
+# define vpciDumpState(x, s)  do {} while (0)
 #endif
 
@@ -1266 +1262 @@
     uint16_t uStatus;
 };
-
 AssertCompileMemberOffset(struct VNetPCIConfig, uStatus, 6);
 
@@ -1290 +1285 @@
     uint32_t    padding;
 #endif
-    PTMTIMERR3  pLinkUpTimer;                             /**< Link Up(/Restore) Timer. */
+
+    /** transmit buffer */
+    R3PTRTYPE(uint8_t*)     pTxBuf;
+    /**< Link Up(/Restore) Timer. */
+    PTMTIMERR3              pLinkUpTimer; 
 
     /** PCI config area holding MAC address as well as TBD. */
-    struct VNetPCIConfig config;
+    struct VNetPCIConfig    config;
     /** MAC address obtained from the configuration. */
-    RTMAC       macConfigured;
+    RTMAC                   macConfigured;
     /** True if physical cable is attached in configuration. */
-    bool        fCableConnected;
+    bool                    fCableConnected;
 
     /** Number of packet being sent/received to show in debug log. */
-    uint32_t    u32PktNo;
+    uint32_t                u32PktNo;
 
     /** Locked state -- no state alteration possible. */
-    bool        fLocked;
+    bool                    fLocked;
 
     /** N/A: */
-    bool volatile fMaybeOutOfSpace;
-
-    R3PTRTYPE(PVQUEUE) pRxQueue;
-    R3PTRTYPE(PVQUEUE) pTxQueue;
-    R3PTRTYPE(PVQUEUE) pCtlQueue;
+    bool volatile           fMaybeOutOfSpace;
+
+    R3PTRTYPE(PVQUEUE)      pRxQueue;
+    R3PTRTYPE(PVQUEUE)      pTxQueue;
+    R3PTRTYPE(PVQUEUE)      pCtlQueue;
     /* Receive-blocking-related fields ***************************************/
 
@@ -1318 +1317 @@
     /* Statistic fields ******************************************************/
 
-    STAMCOUNTER                         StatReceiveBytes;
-    STAMCOUNTER                         StatTransmitBytes;
+    STAMCOUNTER             StatReceiveBytes;
+    STAMCOUNTER             StatTransmitBytes;
 #if defined(VBOX_WITH_STATISTICS)
-    STAMPROFILEADV                      StatReceive;
-    STAMPROFILEADV                      StatTransmit;
-    STAMPROFILEADV                      StatTransmitSend;
-    STAMPROFILE                         StatRxOverflow;
-    STAMCOUNTER                         StatRxOverflowWakeup;
+    STAMPROFILEADV          StatReceive;
+    STAMPROFILEADV          StatTransmit;
+    STAMPROFILEADV          StatTransmitSend;
+    STAMPROFILE             StatRxOverflow;
+    STAMCOUNTER             StatRxOverflowWakeup;
 #endif /* VBOX_WITH_STATISTICS */
 
@@ -1338 +1337 @@
 struct VNetHdr
 {
-    uint8_t u8Flags;
-    uint8_t u8GSOType;
+    uint8_t  u8Flags;
+    uint8_t  u8GSOType;
     uint16_t u16HdrLen;
     uint16_t u16GSOSize;
@@ -1347 +1346 @@
 typedef struct VNetHdr VNETHDR;
 typedef VNETHDR *PVNETHDR;
+AssertCompileSize(VNETHDR, 10);
 
 AssertCompileMemberOffset(VNETSTATE, VPCI, 0);
@@ -1800 +1800 @@
         else
         {
-            uint8_t *pFrame = (uint8_t *)RTMemAllocZ(VNET_MAX_FRAME_SIZE);
-            if (!pFrame)
-            {
-                Log(("%s vnetQueueTransmit: Failed to allocate %u bytes.\n",
-                     INSTANCE(pState), VNET_MAX_FRAME_SIZE));
-                vqueueElemFree(&elem);
-                break; /* For now we simply ignore the header, but it must be there anyway! */
-            }
-
             /* Assemble a complete frame. */
             for (unsigned int i = 1; i < elem.nOut && uOffset < VNET_MAX_FRAME_SIZE; i++)
@@ -1819 +1810 @@
                 }
                 PDMDevHlpPhysRead(pState->VPCI.CTX_SUFF(pDevIns), elem.aSegsOut[i].addr,
-                                  pFrame + uOffset, uSize);
+                                  pState->pTxBuf + uOffset, uSize);
                 uOffset += uSize;
             }
             STAM_PROFILE_ADV_START(&pState->StatTransmitSend, a);
-            int rc = pState->pDrv->pfnSend(pState->pDrv, pFrame, uOffset);
+            int rc = pState->pDrv->pfnSend(pState->pDrv, pState->pTxBuf, uOffset);
             STAM_PROFILE_ADV_STOP(&pState->StatTransmitSend, a);
             STAM_REL_COUNTER_ADD(&pState->StatTransmitBytes, uOffset);
-            RTMemFree(pFrame);
         }
         vqueuePut(&pState->VPCI, pQueue, &elem, sizeof(VNETHDR) + uOffset);
@@ -1968 +1958 @@
     rc = SSMR3GetMem(pSSM, &macConfigured, sizeof(macConfigured));
     AssertRCReturn(rc, rc);
-    if (   memcmp(&macConfigured, &pState->macConfigured, sizeof(macConfigured))
-           && (uPass == 0 || !PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns)) )
+    if (memcmp(&macConfigured, &pState->macConfigured, sizeof(macConfigured))
+        && (uPass == 0 || !PDMDevHlpVMTeleportedAndNotFullyResumedYet(pDevIns)))
         LogRel(("%s: The mac address differs: config=%RTmac saved=%RTmac\n", INSTANCE(pState), &pState->macConfigured, &macConfigured));
 
@@ -2051 +2041 @@
     pState->INetworkConfig.pfnSetLinkState   = vnetSetLinkState;
 
+    pState->pTxBuf = (uint8_t *)RTMemAllocZ(VNET_MAX_FRAME_SIZE);
+    AssertMsgReturn(pState->pTxBuf, 
+                    ("Cannot allocate TX buffer for virtio-net device\n"), VERR_NO_MEMORY);
+
     /* Register save/restore state handlers. */
     rc = PDMDevHlpSSMRegisterEx(pDevIns, VNET_SAVEDSTATE_VERSION, sizeof(VNETSTATE), NULL,
@@ -2057 +2051 @@
                                 vnetLoadPrep, vnetLoadExec, NULL);
     if (RT_FAILURE(rc))
-    return rc;
+        return rc;
 
     /* Create the RX notifier signaller. */
@@ -2135 +2129 @@
         RTSemEventDestroy(pState->hEventMoreRxDescAvail);
         pState->hEventMoreRxDescAvail = NIL_RTSEMEVENT;
+    }
+
+    if (pState->pTxBuf)
+    {
+        RTMemFree(pState->pTxBuf);
+        pState->pTxBuf = NULL;
     }
 
@@ -2348 +2348 @@
 #endif /* IN_RING3 */
 #endif /* !VBOX_DEVICE_STRUCT_TESTCASE */
-