Changeset 82685 in vbox

Timestamp:

Jan 9, 2020 10:05:26 AM (5 years ago)

Author:

vboxsync

Message:

Dev/E1000: (bugref:9615) GSO and VLAN buffer allocation fixes.

File:

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

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

@@ -3849 +3849 @@
             return VINF_SUCCESS;
         }
+        if (fGso && pThis->GsoCtx.u8Type == PDMNETWORKGSOTYPE_INVALID)
+        {
+            E1kLog3(("Invalid GSO context, won't allocate this packet, cb=%u %s%s\n",
+                     pThis->cbTxAlloc, pThis->fVTag ? "VLAN " : "", pThis->fGSO ? "GSO " : ""));
+            /* No valid GSO context is available, ignore this packet. */
+            pThis->cbTxAlloc = 0;
+            return VINF_SUCCESS;
+        }
 
         PPDMINETWORKUP pDrv = pThisCC->CTX_SUFF(pDrv);
@@ -4422 +4430 @@
             pThis->cbTxAlloc = RT_MIN(pThis->u32PayRemain,
                                        pThis->contextTSE.dw3.u16MSS)
-                                + pThis->contextTSE.dw3.u8HDRLEN
-                                + (pThis->fVTag ? 4 : 0);
+                                + pThis->contextTSE.dw3.u8HDRLEN;
+            /* Do not add VLAN tags to empty packets. */
+            if (pThis->fVTag && pThis->cbTxAlloc > 0)
+                pThis->cbTxAlloc += 4;
             rc = e1kXmitAllocBuf(pThis, pThisCC, false /* fGSO */);
         }
@@ -5276 +5286 @@
                 cbPacket :
                 RT_MIN(cbPacket, pThis->contextTSE.dw3.u16MSS + pThis->contextTSE.dw3.u8HDRLEN);
-            if (pThis->fVTag)
+            /* Do not add VLAN tags to empty packets. */
+            if (pThis->fVTag && pThis->cbTxAlloc > 0)
                 pThis->cbTxAlloc += 4;
             LogFlow(("%s e1kLocateTxPacket: RET true cbTxAlloc=%d cbPacket=%d%s%s\n",