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

Timestamp:

Sep 12, 2017 4:21:58 PM (7 years ago)

Author:

vboxsync

Message:

Dev/E1000: (bugref:8979) Fixed regression caused by r116797, tweaking MSS obtained from guest.

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (2 diffs)

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

@@ -4366 +4366 @@
 
     uint16_t u16MaxPktLen = pThis->contextTSE.dw3.u8HDRLEN + pThis->contextTSE.dw3.u16MSS;
-    if (RT_UNLIKELY(u16MaxPktLen <= pThis->contextTSE.dw3.u8HDRLEN))
-    {
-        E1kLog(("%s Transmit packet is too small: %u <= %u(min)\n", pThis->szPrf, u16MaxPktLen, pThis->contextTSE.dw3.u8HDRLEN));
-        return VINF_SUCCESS; // @todo consider VERR_BUFFER_UNDERFLOW;
-    }
-    if (RT_UNLIKELY(u16MaxPktLen > E1K_MAX_TX_PKT_SIZE || u16MaxPktLen > pThis->CTX_SUFF(pTxSg)->cbAvailable))
-    {
-        E1kLog(("%s Transmit packet is too large: %u > %u(max)\n", pThis->szPrf, u16MaxPktLen, E1K_MAX_TX_PKT_SIZE));
-        return VINF_SUCCESS; // @todo consider VERR_BUFFER_OVERFLOW;
-    }
 
     /*
@@ -4977 +4967 @@
     {
         pThis->contextTSE = pDesc->context;
-        pThis->u32PayRemain = pDesc->context.dw2.u20PAYLEN;
-        pThis->u16HdrRemain = pDesc->context.dw3.u8HDRLEN;
-        e1kSetupGsoCtx(&pThis->GsoCtx, &pDesc->context);
+        uint32_t cbMaxSegmentSize = pThis->contextTSE.dw3.u16MSS + pThis->contextTSE.dw3.u8HDRLEN + 4; /*VTAG*/
+        if (RT_UNLIKELY(cbMaxSegmentSize > E1K_MAX_TX_PKT_SIZE))
+        {
+            pThis->contextTSE.dw3.u16MSS = E1K_MAX_TX_PKT_SIZE - pThis->contextTSE.dw3.u8HDRLEN - 4; /*VTAG*/
+            LogRelMax(10, ("%s Transmit packet is too large: %u > %u(max). Adjusted MSS to %u.\n",
+                           pThis->szPrf, cbMaxSegmentSize, E1K_MAX_TX_PKT_SIZE, pThis->contextTSE.dw3.u16MSS));
+        }
+        pThis->u32PayRemain = pThis->contextTSE.dw2.u20PAYLEN;
+        pThis->u16HdrRemain = pThis->contextTSE.dw3.u8HDRLEN;
+        e1kSetupGsoCtx(&pThis->GsoCtx, &pThis->contextTSE);
         STAM_COUNTER_INC(&pThis->StatTxDescCtxTSE);
     }