Changeset 38549 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt/linux

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)

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (8 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -1198 +1198 @@
          * directly as it may be immediately forwarded by IP layer @bugref{5020}.
          */
-        Assert(skb_headlen(pPkt) >= pSG->GsoCtx.cbHdrs);
+        Assert(skb_headlen(pPkt) >= pSG->GsoCtx.cbHdrsTotal);
         pPkt->ip_summed  = CHECKSUM_PARTIAL;
 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
@@ -1460 +1460 @@
 static void vboxNetFltDumpPacket(PINTNETSG pSG, bool fEgress, const char *pszWhere, int iIncrement)
 {
+    int i, offSeg;
     uint8_t *pInt, *pExt;
     static int iPacketNo = 1;
@@ -1479 +1480 @@
          pExt[0], pExt[1], pExt[2], pExt[3], pExt[4], pExt[5],
          pSG->cbTotal, iPacketNo));
-    Log3(("%.*Rhxd\n", pSG->aSegs[0].cb, pSG->aSegs[0].pv));
+    if (pSG->cSegsUsed == 1)
+    {
+        Log3(("%.*Rhxd\n", pSG->aSegs[0].cb, pSG->aSegs[0].pv));
+    }
+    else
+    {
+        for (i = 0, offSeg = 0; i < pSG->cSegsUsed; i++)
+        {
+            Log3(("-- segment %d at 0x%x (%d bytes) --\n%.*Rhxd\n",
+                  i, offSeg, pSG->aSegs[i].cb, pSG->aSegs[i].cb, pSG->aSegs[i].pv));
+            offSeg += pSG->aSegs[i].cb;
+        }
+    }
+
 }
 #else
@@ -1663 +1677 @@
 
         cbTransportHdr = pTcp->th_off * 4;
+        pGsoCtx->cbHdrsSeg = offTransport + cbTransportHdr;
         if (RT_UNLIKELY(   cbTransportHdr < RTNETTCP_MIN_LEN
                         || cbTransportHdr > cbTransport
@@ -1677 +1692 @@
         Assert(uProtocol == RTNETIPV4_PROT_UDP);
         cbTransportHdr = sizeof(RTNETUDP);
+        pGsoCtx->cbHdrsSeg = offTransport; /* Exclude UDP header */
         if (RT_UNLIKELY(   offTransport + cbTransportHdr >= UINT8_MAX
                         || offTransport + cbTransportHdr >= pSkb->len ))
@@ -1689 +1705 @@
      */
     pGsoCtx->u8Type       = enmGsoType;
-    pGsoCtx->cbHdrs       = offTransport + cbTransportHdr;
+    pGsoCtx->cbHdrsTotal  = offTransport + cbTransportHdr;
     pGsoCtx->cbMaxSeg     = skb_shinfo(pSkb)->gso_size;
     pGsoCtx->offHdr1      = pSkb->mac_len;
     pGsoCtx->offHdr2      = offTransport;
-    pGsoCtx->au8Unused[0] = 0;
-    pGsoCtx->au8Unused[1] = 0;
+    pGsoCtx->u8Unused     = 0;
 
     return true;
@@ -1948 +1963 @@
                 fGsoCapabilites |= RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_UDP);
 # endif
+            Log3(("vboxNetFltLinuxReportNicGsoCapabilities: reporting wire %s%s%s%s\n",
+                  (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP)) ? "tso " : "",
+                  (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP)) ? "tso6 " : "",
+                  (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_UDP)) ? "ufo " : "",
+                  (fGsoCapabilites & RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_UDP)) ? "ufo6 " : ""));
             pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort, fGsoCapabilites, INTNETTRUNKDIR_WIRE);
         }
@@ -2426 +2446 @@
     /** @todo duplicate work here now? Attach */
 #if defined(VBOXNETFLT_WITH_GSO_XMIT_HOST)
+    Log3(("vboxNetFltOsConnectIt: reporting host tso tso6 ufo\n"));
     pThis->pSwitchPort->pfnReportGsoCapabilities(pThis->pSwitchPort,
                                                  0
                                                  | RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_TCP)
                                                  | RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_TCP)
+                                                 | RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_UDP)
 # if 0 /** @todo GSO: Test UDP offloading (UFO) on linux. */
-                                                 | RT_BIT_32(PDMNETWORKGSOTYPE_IPV4_UDP)
                                                  | RT_BIT_32(PDMNETWORKGSOTYPE_IPV6_UDP)
 # endif