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

Timestamp:

Jul 2, 2013 12:59:56 PM (11 years ago)

Author:

vboxsync

Message:

IntNet, VirtioNet, NetFilter: Large frame support + drop oversized + UFO fix (#6821)

Location:

trunk/src/VBox/Devices/Network

Files:

• DevVirtioNet.cpp (modified) (4 diffs)
• DrvIntNet.cpp (modified) (5 diffs)
• SrvIntNetR0.cpp (modified) (4 diffs)
• testcase/tstIntNet-1.cpp (modified) (3 diffs)

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

@@ -67 +67 @@
 
 #define VNET_TX_DELAY           150   /**< 150 microseconds */
-#define VNET_MAX_FRAME_SIZE     65536  ///< @todo Is it the right limit?
+#define VNET_MAX_FRAME_SIZE     65535 + 18  /**< Max IP packet size + Ethernet header with VLAN tag */
 #define VNET_MAC_FILTER_LEN     32
 #define VNET_MAX_VID            (1 << 12)
@@ -386 +386 @@
         | VNET_F_HOST_TSO4
         | VNET_F_HOST_TSO6
-/*        | VNET_F_HOST_UFO   -- Disabled temporarely (see @bugref{6821}) */
+        | VNET_F_HOST_UFO
         | VNET_F_GUEST_CSUM   /* We expect the guest to accept partial TCP checksums (see @bugref{4796}) */
         | VNET_F_GUEST_TSO4
@@ -1155 +1155 @@
             for (unsigned int i = 1; i < elem.nOut; i++)
                 uSize += elem.aSegsOut[i].cb;
+            Log5(("%s vnetTransmitPendingPackets: complete frame is %u bytes.\n",
+                  INSTANCE(pThis), uSize));
             Assert(uSize <= VNET_MAX_FRAME_SIZE);
             if (pThis->pDrv)
@@ -1211 +1213 @@
                             /* Update GSO structure embedded into the frame */
                             ((PPDMNETWORKGSO)pSgBuf->pvUser)->cbHdrsTotal = pGso->cbHdrsTotal;
-                            ((PPDMNETWORKGSO)pSgBuf->pvUser)->cbHdrsSeg   = pGso->cbHdrsTotal;
+                            ((PPDMNETWORKGSO)pSgBuf->pvUser)->cbHdrsSeg   = pGso->cbHdrsSeg;
                             Log4(("%s vnetTransmitPendingPackets: adjusted HdrLen to %d.\n",
                                   INSTANCE(pThis), pGso->cbHdrsTotal));

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

@@ -463 +463 @@
     Assert(pSgBuf->fFlags == (PDMSCATTERGATHER_FLAGS_MAGIC | PDMSCATTERGATHER_FLAGS_OWNER_1));
     Assert(pSgBuf->cbUsed <= pSgBuf->cbAvailable);
-    Assert(   pHdr->u16Type == INTNETHDR_TYPE_FRAME
-           || pHdr->u16Type == INTNETHDR_TYPE_GSO);
+    Assert(   pHdr->u8Type == INTNETHDR_TYPE_FRAME
+           || pHdr->u8Type == INTNETHDR_TYPE_GSO);
     Assert(PDMCritSectIsOwner(&pThis->XmitLock));
 
     /** @todo LATER: try unalloc the frame. */
-    pHdr->u16Type = INTNETHDR_TYPE_PADDING;
+    pHdr->u8Type = INTNETHDR_TYPE_PADDING;
     IntNetRingCommitFrame(&pThis->CTX_SUFF(pBuf)->Send, pHdr);
 
@@ -703 +703 @@
 
             Log2(("pHdr=%p offRead=%#x: %.8Rhxs\n", pHdr, pRingBuf->offReadX, pHdr));
-            uint16_t u16Type = pHdr->u16Type;
-            if (    (   u16Type == INTNETHDR_TYPE_FRAME
-                     || u16Type == INTNETHDR_TYPE_GSO)
+            uint8_t u8Type = pHdr->u8Type;
+            if (    (   u8Type == INTNETHDR_TYPE_FRAME
+                     || u8Type == INTNETHDR_TYPE_GSO)
                 &&  !pThis->fLinkDown)
             {
@@ -715 +715 @@
                 if (rc == VINF_SUCCESS)
                 {
-                    if (u16Type == INTNETHDR_TYPE_FRAME)
+                    if (u8Type == INTNETHDR_TYPE_FRAME)
                     {
                         /*
@@ -814 +814 @@
                              * NIC is going down, likely because the VM is being reset. Skip the frame.
                              */
-                            AssertMsg(IntNetIsValidFrameType(pHdr->u16Type), ("Unknown frame type %RX16! offRead=%#x\n", pHdr->u16Type, pRingBuf->offReadX));
+                            AssertMsg(IntNetIsValidFrameType(pHdr->u8Type), ("Unknown frame type %RX16! offRead=%#x\n", pHdr->u8Type, pRingBuf->offReadX));
                             IntNetRingSkipFrame(pRingBuf);
                         }
@@ -831 +831 @@
                  * Link down or unknown frame - skip to the next frame.
                  */
-                AssertMsg(IntNetIsValidFrameType(pHdr->u16Type), ("Unknown frame type %RX16! offRead=%#x\n", pHdr->u16Type, pRingBuf->offReadX));
+                AssertMsg(IntNetIsValidFrameType(pHdr->u8Type), ("Unknown frame type %RX16! offRead=%#x\n", pHdr->u8Type, pRingBuf->offReadX));
                 IntNetRingSkipFrame(pRingBuf);
                 STAM_REL_COUNTER_INC(&pBuf->cStatBadFrames);

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

@@ -2688 +2688 @@
 
     /*
+     * @todo: We have to adjust MSS so it does not exceed the value configured
+     * for the host's interface.
+     */
+
+    /*
      * Carve out the frame segments with the header and frame in different
      * scatter / gather segments.
@@ -3744 +3749 @@
             while ((pHdr = IntNetRingGetNextFrameToRead(&pIf->pIntBuf->Send)) != NULL)
             {
-                uint16_t const      u16Type = pHdr->u16Type;
-                if (u16Type == INTNETHDR_TYPE_FRAME)
+                uint8_t const      u8Type = pHdr->u8Type;
+                if (u8Type == INTNETHDR_TYPE_FRAME)
                 {
                     /* Send regular frame. */
@@ -3754 +3759 @@
                     enmSwDecision = intnetR0NetworkSend(pNetwork, pIf,  0 /*fSrc*/, &Sg, pDstTab);
                 }
-                else if (u16Type == INTNETHDR_TYPE_GSO)
+                else if (u8Type == INTNETHDR_TYPE_GSO)
                 {
                     /* Send GSO frame if sane. */
@@ -3776 +3781 @@
                 else
                 {
-                    if (u16Type != INTNETHDR_TYPE_PADDING)
+                    if (u8Type != INTNETHDR_TYPE_PADDING)
                         STAM_REL_COUNTER_INC(&pIf->pIntBuf->cStatBadFrames); /* ignore */
                     enmSwDecision = INTNETSWDECISION_DROP;

trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

@@ -463 +463 @@
         while ((pHdr = IntNetRingGetNextFrameToRead(pRingBuf)))
         {
-            if (pHdr->u16Type == INTNETHDR_TYPE_FRAME)
+            if (pHdr->u8Type == INTNETHDR_TYPE_FRAME)
             {
                 size_t      cbFrame = pHdr->cbFrame;
@@ -540 +540 @@
                 }
             }
-            else if (pHdr->u16Type == INTNETHDR_TYPE_GSO)
+            else if (pHdr->u8Type == INTNETHDR_TYPE_GSO)
             {
                 PCPDMNETWORKGSO pGso    = IntNetHdrGetGsoContext(pHdr, pBuf);
@@ -568 +568 @@
                 }
             }
-            else if (pHdr->u16Type != INTNETHDR_TYPE_PADDING)
+            else if (pHdr->u8Type != INTNETHDR_TYPE_PADDING)
             {
-                RTPrintf("tstIntNet-1: Unknown frame type %d\n", pHdr->u16Type);
+                RTPrintf("tstIntNet-1: Unknown frame type %d\n", pHdr->u8Type);
                 STAM_REL_COUNTER_INC(&pBuf->cStatBadFrames);
                 g_cErrors++;