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

Timestamp:

Jul 8, 2020 2:03:45 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139043

Message:

Resolved other part of xtracker #9766. Rearranged structs, arrays and pointers to improve cache locality (impacts: Network/DevVirtioNet.cpp, DevVirtioNet_1_0.cpp, and VirtIO/VirtioCore.*)

Location:

trunk/src/VBox/Devices/Network

Files:

• DevVirtioNet.cpp (modified) (1 diff)
• DevVirtioNet_1_0.cpp (modified) (4 diffs)

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

@@ -903 +903 @@
                 return VERR_INVALID_PARAMETER;
         }
-        Hdr.Hdr.u16HdrLen = pGso->cbHdrsTotal;
-        Hdr.Hdr.u16GSOSize = pGso->cbMaxSeg;
+        Hdr.Hdr.u16HdrLen    = pGso->cbHdrsTotal;
+        Hdr.Hdr.u16GSOSize   = pGso->cbMaxSeg;
         Hdr.Hdr.u16CSumStart = pGso->offHdr2;
+        Hdr.u16NumBufs       = 0;
         STAM_REL_COUNTER_INC(&pThis->StatReceiveGSO);
     }
     else
     {
-        Hdr.Hdr.u8Flags   = 0;
-        Hdr.Hdr.u8GSOType = VNETHDR_GSO_NONE;
+        Hdr.Hdr.u8Flags       = 0;
+        Hdr.Hdr.u8GSOType     = VNETHDR_GSO_NONE;
+        Hdr.Hdr.u16HdrLen     = 0;
+        Hdr.Hdr.u16GSOSize    = 0;
+        Hdr.Hdr.u16CSumStart  = 0;
+        Hdr.Hdr.u16CSumOffset = 0;
+        Hdr.u16NumBufs        = 0;
     }
 

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

@@ -1684 +1684 @@
 
 static int virtioNetR3CopyRxPktToGuest(PPDMDEVINS pDevIns, PVIRTIONET pThis, const void *pvBuf, size_t cb,
-                                       VIRTIONETPKTHDR *rxPktHdr, uint16_t cSegsAllocated,
+                                       PVIRTIONETPKTHDR rxPktHdr, uint16_t cSegsAllocated,
                                        PRTSGBUF pVirtSegBufToGuest, PRTSGSEG paVirtSegsToGuest,
                                        PVIRTIONETVIRTQ pRxVirtq)
@@ -1806 +1806 @@
 
     LogFunc(("%s (%RTmac) pGso %s\n", pThis->szInst, pvBuf, pGso ? "present" : "not present"));
-    VIRTIONETPKTHDR rxPktHdr = { 0 };
+    VIRTIONETPKTHDR rxPktHdr;
 
     if (pGso)
@@ -1832 +1832 @@
                 return VERR_INVALID_PARAMETER;
         }
-        rxPktHdr.uHdrLen = pGso->cbHdrsTotal;
-        rxPktHdr.uGsoSize = pGso->cbMaxSeg;
-        rxPktHdr.uChksumStart = pGso->offHdr2;
+        rxPktHdr.uHdrLen        = pGso->cbHdrsTotal;
+        rxPktHdr.uGsoSize       = pGso->cbMaxSeg;
+        rxPktHdr.uChksumStart   = pGso->offHdr2;
+        rxPktHdr.uNumBuffers    = 0;
         STAM_REL_COUNTER_INC(&pThis->StatReceiveGSO);
     }
     else
     {
-        rxPktHdr.uFlags = 0;
-        rxPktHdr.uGsoType = VIRTIONET_HDR_GSO_NONE;
+        rxPktHdr.uFlags         = 0;
+        rxPktHdr.uGsoType       = VIRTIONET_HDR_GSO_NONE;
+        rxPktHdr.uHdrLen        = 0;
+        rxPktHdr.uGsoSize       = 0;
+        rxPktHdr.uChksumStart   = 0;
+        rxPktHdr.uChksumOffset  = 0;
+        rxPktHdr.uNumBuffers    = 0;
     }
 
@@ -2307 +2313 @@
                     pGso->cbHdrsTotal = pPktHdr->uChksumStart +
                         ((PRTNETTCP)(((uint8_t*)pSgBuf->aSegs[0].pvSeg) + pPktHdr->uChksumStart))->th_off * 4;
+
                     AssertMsgReturn(pSgBuf->cbUsed > pGso->cbHdrsTotal,
-                                    ("cbHdrsTotal exceeds size of frame"), VERR_BUFFER_OVERFLOW);
+                        ("cbHdrsTotal exceeds size of frame"), VERR_BUFFER_OVERFLOW);
+
                     pGso->cbHdrsSeg   = pGso->cbHdrsTotal;
                     break;