Changeset 38549 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 26, 2011 1:26:07 PM (14 years ago)

Author:

vboxsync

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

73704

Message:

GSO: UDP fragmentation offloading (#5846)

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (3 diffs)
• DevVirtioNet.cpp (modified) (5 diffs)
• DrvIntNet.cpp (modified) (2 diffs)
• DrvNAT.cpp (modified) (1 diff)
• Pcap.cpp (modified) (2 diffs)
• SrvIntNetR0.cpp (modified) (1 diff)

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

@@ -2943 +2943 @@
     {
         if (pCtx->dw2.fTCP)
+        {
             pGso->u8Type = PDMNETWORKGSOTYPE_IPV4_TCP;
+            pGso->cbHdrsSeg = pCtx->dw3.u8HDRLEN;
+        }
         else
+        {
             pGso->u8Type = PDMNETWORKGSOTYPE_IPV4_UDP;
+            pGso->cbHdrsSeg = pCtx->tu.u8CSS; /* IP header only */
+        }
         /** @todo Detect IPv4-IPv6 tunneling (need test setup since linux doesn't do
          *        this yet it seems)... */
@@ -2951 +2957 @@
     else
     {
+        pGso->cbHdrsSeg = pCtx->dw3.u8HDRLEN; /* @todo IPv6 UFO */
         if (pCtx->dw2.fTCP)
             pGso->u8Type = PDMNETWORKGSOTYPE_IPV6_TCP;
@@ -2958 +2965 @@
     pGso->offHdr1  = pCtx->ip.u8CSS;
     pGso->offHdr2  = pCtx->tu.u8CSS;
-    pGso->cbHdrs   = pCtx->dw3.u8HDRLEN;
+    pGso->cbHdrsTotal = pCtx->dw3.u8HDRLEN;
     pGso->cbMaxSeg = pCtx->dw3.u16MSS;
     Assert(PDMNetGsoIsValid(pGso, sizeof(*pGso), pGso->cbMaxSeg * 5));
-    E1kLog2(("e1kSetupGsoCtx: mss=%#x hdr=%#x hdr1=%#x hdr2=%#x %s\n",
-             pGso->cbMaxSeg, pGso->cbHdrs, pGso->offHdr1, pGso->offHdr2, PDMNetGsoTypeName((PDMNETWORKGSOTYPE)pGso->u8Type) ));
+    E1kLog2(("e1kSetupGsoCtx: mss=%#x hdr=%#x hdrseg=%#x hdr1=%#x hdr2=%#x %s\n",
+             pGso->cbMaxSeg, pGso->cbHdrsTotal, pGso->cbHdrsSeg, pGso->offHdr1, pGso->offHdr2, PDMNetGsoTypeName((PDMNETWORKGSOTYPE)pGso->u8Type) ));
 }
 

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

@@ -725 +725 @@
     if (pGso)
     {
-        Log2(("%s vnetHandleRxPacket: gso type=%x cbHdr=%u mss=%u"
+        Log2(("%s vnetHandleRxPacket: gso type=%x cbHdrsTotal=%u cbHdrsSeg=%u mss=%u"
               " off1=0x%x off2=0x%x\n", INSTANCE(pState), pGso->u8Type,
-              pGso->cbHdrs, pGso->cbMaxSeg, pGso->offHdr1, pGso->offHdr2));
+              pGso->cbHdrsTotal, pGso->cbHdrsSeg, pGso->cbMaxSeg, pGso->offHdr1, pGso->offHdr2));
         Hdr.Hdr.u8Flags = VNETHDR_F_NEEDS_CSUM;
         switch (pGso->u8Type)
@@ -746 +746 @@
                 return VERR_INVALID_PARAMETER;
         }
-        Hdr.Hdr.u16HdrLen = pGso->cbHdrs;
+        Hdr.Hdr.u16HdrLen = pGso->cbHdrsTotal;
         Hdr.Hdr.u16GSOSize = pGso->cbMaxSeg;
         Hdr.Hdr.u16CSumStart = pGso->offHdr2;
@@ -981 +981 @@
         case VNETHDR_GSO_TCPV4:
             pGso->u8Type = PDMNETWORKGSOTYPE_IPV4_TCP;
+            pGso->cbHdrsSeg = pHdr->u16HdrLen;
             break;
         case VNETHDR_GSO_TCPV6:
             pGso->u8Type = PDMNETWORKGSOTYPE_IPV6_TCP;
+            pGso->cbHdrsSeg = pHdr->u16HdrLen;
             break;
         case VNETHDR_GSO_UDP:
             pGso->u8Type = PDMNETWORKGSOTYPE_IPV4_UDP;
+            pGso->cbHdrsSeg = pHdr->u16CSumStart;
             break;
         default:
@@ -998 +1001 @@
         return NULL;
     }
-    pGso->offHdr1  = sizeof(RTNETETHERHDR);
-    pGso->cbHdrs   = pHdr->u16HdrLen;
-    pGso->cbMaxSeg = pHdr->u16GSOSize;
+    pGso->offHdr1     = sizeof(RTNETETHERHDR);
+    pGso->cbHdrsTotal = pHdr->u16HdrLen;
+    pGso->cbMaxSeg    = pHdr->u16GSOSize;
     return pGso;
 }
@@ -1123 +1126 @@
                         {
                             Log4(("%s vnetTransmitPendingPackets: HdrLen before adjustment %d.\n",
-                                  INSTANCE(pState), pGso->cbHdrs));
+                                  INSTANCE(pState), pGso->cbHdrsTotal));
                             switch (pGso->u8Type)
                             {
                                 case PDMNETWORKGSOTYPE_IPV4_TCP:
                                 case PDMNETWORKGSOTYPE_IPV6_TCP:
-                                    pGso->cbHdrs = Hdr.u16CSumStart +
+                                    pGso->cbHdrsTotal = Hdr.u16CSumStart +
                                         ((PRTNETTCP)(((uint8_t*)pSgBuf->aSegs[0].pvSeg) + Hdr.u16CSumStart))->th_off * 4;
                                     break;
                                 case PDMNETWORKGSOTYPE_IPV4_UDP:
-                                    pGso->cbHdrs = Hdr.u16CSumStart + sizeof(RTNETUDP);
+                                    pGso->cbHdrsTotal = Hdr.u16CSumStart + sizeof(RTNETUDP);
                                     break;
                             }
                             /* Update GSO structure embedded into the frame */
-                            ((PPDMNETWORKGSO)pSgBuf->pvUser)->cbHdrs = pGso->cbHdrs;
+                            ((PPDMNETWORKGSO)pSgBuf->pvUser)->cbHdrsTotal = pGso->cbHdrsTotal;
                             Log4(("%s vnetTransmitPendingPackets: adjusted HdrLen to %d.\n",
-                                  INSTANCE(pState), pGso->cbHdrs));
+                                  INSTANCE(pState), pGso->cbHdrsTotal));
                         }
-                        Log2(("%s vnetTransmitPendingPackets: gso type=%x cbHdr=%u mss=%u"
+                        Log2(("%s vnetTransmitPendingPackets: gso type=%x cbHdrsTotal=%u cbHdrsSeg=%u mss=%u"
                               " off1=0x%x off2=0x%x\n", INSTANCE(pState), pGso->u8Type,
-                              pGso->cbHdrs, pGso->cbMaxSeg, pGso->offHdr1, pGso->offHdr2));
+                              pGso->cbHdrsTotal, pGso->cbHdrsSeg, pGso->cbMaxSeg, pGso->offHdr1, pGso->offHdr2));
                         STAM_REL_COUNTER_INC(&pState->StatTransmitGSO);
                     }

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

@@ -769 +769 @@
                                              cbFrame, u64Now, u64Now - pThis->u64LastReceiveTS, u64Now - pThis->u64LastTransferTS, cSegs));
                                     pThis->u64LastReceiveTS = u64Now;
-                                    Log2(("drvR3IntNetRecvRun: cbFrame=%#x type=%d cbHdrs=%#x Hdr1=%#x Hdr2=%#x MMS=%#x\n"
+                                    Log2(("drvR3IntNetRecvRun: cbFrame=%#x type=%d cbHdrsTotal=%#x cbHdrsSeg=%#x Hdr1=%#x Hdr2=%#x MMS=%#x\n"
                                           "%.*Rhxd\n",
-                                          cbFrame, pGso->u8Type, pGso->cbHdrs, pGso->offHdr1, pGso->offHdr2, pGso->cbMaxSeg,
+                                          cbFrame, pGso->u8Type, pGso->cbHdrsTotal, pGso->cbHdrsSeg, pGso->offHdr1, pGso->offHdr2, pGso->cbMaxSeg,
                                           cbFrame - sizeof(*pGso), pGso + 1));
                                 }
@@ -793 +793 @@
                         else
                         {
-                            AssertMsgFailed(("cbFrame=%#x type=%d cbHdrs=%#x Hdr1=%#x Hdr2=%#x MMS=%#x\n",
-                                             cbFrame, pGso->u8Type, pGso->cbHdrs, pGso->offHdr1, pGso->offHdr2, pGso->cbMaxSeg));
+                            AssertMsgFailed(("cbFrame=%#x type=%d cbHdrsTotal=%#x cbHdrsSeg=%#x Hdr1=%#x Hdr2=%#x MMS=%#x\n",
+                                             cbFrame, pGso->u8Type, pGso->cbHdrsTotal, pGso->cbHdrsSeg, pGso->offHdr1, pGso->offHdr2, pGso->cbMaxSeg));
                             STAM_REL_COUNTER_INC(&pBuf->cStatBadFrames);
                         }

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

@@ -401 +401 @@
                 size_t cbSeg;
                 void  *pvSeg;
-                m = slirp_ext_m_get(pThis->pNATState, pGso->cbHdrs + pGso->cbMaxSeg, &pvSeg, &cbSeg);
+                m = slirp_ext_m_get(pThis->pNATState, pGso->cbHdrsTotal + pGso->cbMaxSeg, &pvSeg, &cbSeg);
                 if (!m)
                     break;
 
 #if 1
-                uint32_t cbPayload;
+                uint32_t cbPayload, cbHdrs;
                 uint32_t offPayload = PDMNetGsoCarveSegment(pGso, pbFrame, pSgBuf->cbUsed,
-                                                            iSeg, cSegs, (uint8_t *)pvSeg, &cbPayload);
-                memcpy((uint8_t *)pvSeg + pGso->cbHdrs, pbFrame + offPayload, cbPayload);
-
-                slirp_input(pThis->pNATState, m, cbPayload + pGso->cbHdrs);
+                                                            iSeg, cSegs, (uint8_t *)pvSeg, &cbHdrs, &cbPayload);
+                memcpy((uint8_t *)pvSeg + cbHdrs, pbFrame + offPayload, cbPayload);
+
+                slirp_input(pThis->pNATState, m, cbPayload + cbHdrs);
 #else
                 uint32_t cbSegFrame;

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

@@ -157 +157 @@
     for (uint32_t iSeg = 0; iSeg < cSegs; iSeg++)
     {
-        uint32_t cbSegPayload;
-        uint32_t offSegPayload = PDMNetGsoCarveSegment(pGso, pbFrame, cbFrame, iSeg, cSegs, abHdrs, &cbSegPayload);
-
-        pcapUpdateHeader(&Hdr, pGso->cbHdrs + cbSegPayload, cbSegMax);
+        uint32_t cbSegPayload, cbHdrs;
+        uint32_t offSegPayload = PDMNetGsoCarveSegment(pGso, pbFrame, cbFrame, iSeg, cSegs, abHdrs, &cbHdrs, &cbSegPayload);
+
+        pcapUpdateHeader(&Hdr, cbHdrs + cbSegPayload, cbSegMax);
         int rc = RTStrmWrite(pStream, &Hdr, sizeof(Hdr));
         if (RT_FAILURE(rc))
             return rc;
 
-        rc = RTStrmWrite(pStream, abHdrs, RT_MIN(Hdr.incl_len, pGso->cbHdrs));
-        if (RT_SUCCESS(rc) && Hdr.incl_len > pGso->cbHdrs)
-            rc = RTStrmWrite(pStream, pbFrame + offSegPayload, Hdr.incl_len - pGso->cbHdrs);
+        rc = RTStrmWrite(pStream, abHdrs, RT_MIN(Hdr.incl_len, cbHdrs));
+        if (RT_SUCCESS(rc) && Hdr.incl_len > cbHdrs)
+            rc = RTStrmWrite(pStream, pbFrame + offSegPayload, Hdr.incl_len - cbHdrs);
         if (RT_FAILURE(rc))
             return rc;
@@ -237 +237 @@
     for (uint32_t iSeg = 0; iSeg < cSegs; iSeg++)
     {
-        uint32_t cbSegPayload;
-        uint32_t offSegPayload = PDMNetGsoCarveSegment(pGso, pbFrame, cbFrame, iSeg, cSegs, abHdrs, &cbSegPayload);
-
-        pcapUpdateHeader(&Hdr, pGso->cbHdrs + cbSegPayload, cbSegMax);
+        uint32_t cbSegPayload, cbHdrs;
+        uint32_t offSegPayload = PDMNetGsoCarveSegment(pGso, pbFrame, cbFrame, iSeg, cSegs, abHdrs, &cbHdrs, &cbSegPayload);
+
+        pcapUpdateHeader(&Hdr, cbHdrs + cbSegPayload, cbSegMax);
         int rc = RTFileWrite(File, &Hdr, sizeof(Hdr), NULL);
         if (RT_FAILURE(rc))
             return rc;
 
-        rc = RTFileWrite(File, abHdrs, RT_MIN(Hdr.incl_len, pGso->cbHdrs), NULL);
-        if (RT_SUCCESS(rc) && Hdr.incl_len > pGso->cbHdrs)
-            rc = RTFileWrite(File, pbFrame + offSegPayload, Hdr.incl_len - pGso->cbHdrs, NULL);
+        rc = RTFileWrite(File, abHdrs, RT_MIN(Hdr.incl_len, cbHdrs), NULL);
+        if (RT_SUCCESS(rc) && Hdr.incl_len > cbHdrs)
+            rc = RTFileWrite(File, pbFrame + offSegPayload, Hdr.incl_len - cbHdrs, NULL);
         if (RT_FAILURE(rc))
             return rc;

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

@@ -2663 +2663 @@
     for (uint32_t iSeg = 0; iSeg < cSegs; iSeg++)
     {
-        uint32_t cbSegPayload;
+        uint32_t cbSegPayload, cbSegHdrs;
         uint32_t offSegPayload = PDMNetGsoCarveSegment(&pSG->GsoCtx, (uint8_t *)pSG->aSegs[0].pv, pSG->cbTotal, iSeg, cSegs,
-                                                       pIfSender->abGsoHdrs, &cbSegPayload);
-
-        IntNetSgInitTempSegs(&u.SG, pSG->GsoCtx.cbHdrs + cbSegPayload, 2, 2);
+                                                       pIfSender->abGsoHdrs, &cbSegHdrs, &cbSegPayload);
+
+        IntNetSgInitTempSegs(&u.SG, cbSegHdrs + cbSegPayload, 2, 2);
         u.SG.aSegs[0].Phys = NIL_RTHCPHYS;
         u.SG.aSegs[0].pv   = pIfSender->abGsoHdrs;
-        u.SG.aSegs[0].cb   = pSG->GsoCtx.cbHdrs;
+        u.SG.aSegs[0].cb   = cbSegHdrs;
         u.SG.aSegs[1].Phys = NIL_RTHCPHYS;
         u.SG.aSegs[1].pv   = (uint8_t *)pSG->aSegs[0].pv + offSegPayload;