Changeset 46904 in vbox for trunk/include/VBox

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/include/VBox

Files:

• intnet.h (modified) (3 diffs)
• intnetinline.h (modified) (14 diffs)

trunk/include/VBox/intnet.h

@@ -214 +214 @@
 typedef struct INTNETHDR
 {
+    /** The size of the frame. */
+    uint32_t        cbFrame : 24;
     /** Header type. This is currently serving as a magic, it
      * can be extended later to encode special command frames and stuff. */
-    uint16_t        u16Type;
-    /** The size of the frame. */
-    uint16_t        cbFrame;
+    uint32_t        u8Type  : 8;
     /** The offset from the start of this header to where the actual frame starts.
      * This is used to keep the frame it self contiguous in virtual memory and
@@ -236 +236 @@
 AssertCompile(INTNETHDR_ALIGNMENT <= INTNETRINGBUF_ALIGNMENT);
 
-/** @name Frame types (INTNETHDR::u16Type).
+/** @name Frame types (INTNETHDR::u8Type).
  * @{ */
 /** Normal frames. */
-#define INTNETHDR_TYPE_FRAME        0x2442
+#define INTNETHDR_TYPE_FRAME        0x42
 /** Padding frames. */
-#define INTNETHDR_TYPE_PADDING      0x3553
+#define INTNETHDR_TYPE_PADDING      0x53
 /** Generic segment offload frames.
  * The frame starts with a PDMNETWORKGSO structure which is followed by the
  * header template and data. */
-#define INTNETHDR_TYPE_GSO          0x4664
+#define INTNETHDR_TYPE_GSO          0x64
 AssertCompileSize(PDMNETWORKGSO, 8);
 /** @}  */
@@ -258 +258 @@
         AssertPtr(pHdr); \
         Assert(RT_ALIGN_PT(pHdr, INTNETHDR_ALIGNMENT, INTNETHDR *) == pHdr); \
-        Assert(   (pHdr)->u16Type == INTNETHDR_TYPE_FRAME \
-               || (pHdr)->u16Type == INTNETHDR_TYPE_GSO \
-               || (pHdr)->u16Type == INTNETHDR_TYPE_PADDING); \
+        Assert(   (pHdr)->u8Type == INTNETHDR_TYPE_FRAME \
+               || (pHdr)->u8Type == INTNETHDR_TYPE_GSO \
+               || (pHdr)->u8Type == INTNETHDR_TYPE_PADDING); \
         { \
             uintptr_t const offHdr   = (uintptr_t)pHdr - (uintptr_t)pRingBuf; \

trunk/include/VBox/intnetinline.h

@@ -44 +44 @@
  *
  * @returns  true / false.
- * @param   u16Type             The frame type to check.
- */
-DECLINLINE(bool) IntNetIsValidFrameType(uint16_t u16Type)
-{
-    if (RT_LIKELY(   u16Type == INTNETHDR_TYPE_FRAME
-                  || u16Type == INTNETHDR_TYPE_GSO
-                  || u16Type == INTNETHDR_TYPE_PADDING))
+ * @param    u8Type             The frame type to check.
+ */
+DECLINLINE(bool) IntNetIsValidFrameType(uint8_t u8Type)
+{
+    if (RT_LIKELY(   u8Type == INTNETHDR_TYPE_FRAME
+                  || u8Type == INTNETHDR_TYPE_GSO
+                  || u8Type == INTNETHDR_TYPE_PADDING))
         return true;
     return false;
@@ -328 +328 @@
 #ifdef VBOX_STRICT
     const uintptr_t off = (uintptr_t)pu8 - (uintptr_t)pBuf;
-    Assert(IntNetIsValidFrameType(pHdr->u16Type));
+    Assert(IntNetIsValidFrameType(pHdr->u8Type));
     Assert(off < pBuf->cbBuf);
     Assert(off + pHdr->cbFrame <= pBuf->cbBuf);
@@ -354 +354 @@
 #ifdef VBOX_STRICT
     const uintptr_t off = (uintptr_t)pGso - (uintptr_t)pBuf;
-    Assert(pHdr->u16Type == INTNETHDR_TYPE_GSO);
+    Assert(pHdr->u8Type == INTNETHDR_TYPE_GSO);
     Assert(off < pBuf->cbBuf);
     Assert(off + pHdr->cbFrame <= pBuf->cbBuf);
@@ -375 +375 @@
     Assert(offReadOld <  pRingBuf->offEnd);
     Assert(RT_ALIGN_PT(pHdr, INTNETHDR_ALIGNMENT, INTNETHDR *) == pHdr);
-    Assert(IntNetIsValidFrameType(pHdr->u16Type));
+    Assert(IntNetIsValidFrameType(pHdr->u8Type));
 
     /* skip the frame */
@@ -402 +402 @@
  * @param   ppvFrame            Where to return the frame pointer.
  */
-DECLINLINE(int) intnetRingAllocateFrameInternal(PINTNETRINGBUF pRingBuf, uint32_t cbFrame, uint16_t u16Type,
+DECLINLINE(int) intnetRingAllocateFrameInternal(PINTNETRINGBUF pRingBuf, uint32_t cbFrame, uint8_t u8Type,
                                                 PINTNETHDR *ppHdr, void **ppvFrame)
 {
@@ -426 +426 @@
             if (RT_UNLIKELY(!ASMAtomicCmpXchgU32(&pRingBuf->offWriteInt, offNew, offWriteInt)))
                 return VERR_WRONG_ORDER; /* race */
-            Log2(("intnetRingAllocateFrameInternal: offWriteInt: %#x -> %#x (1) (R=%#x T=%#x S=%#x)\n", offWriteInt, offNew, offRead, u16Type, cbFrame));
+            Log2(("intnetRingAllocateFrameInternal: offWriteInt: %#x -> %#x (1) (R=%#x T=%#x S=%#x)\n", offWriteInt, offNew, offRead, u8Type, cbFrame));
 
             PINTNETHDR pHdr = (PINTNETHDR)((uint8_t *)pRingBuf + offWriteInt);
-            pHdr->u16Type  = u16Type;
-            pHdr->cbFrame  = (uint16_t)cbFrame; Assert(pHdr->cbFrame == cbFrame);
+            pHdr->u8Type   = u8Type;
+            pHdr->cbFrame  = cbFrame; Assert(pHdr->cbFrame == cbFrame);
             pHdr->offFrame = sizeof(INTNETHDR);
 
@@ -447 +447 @@
             if (RT_UNLIKELY(!ASMAtomicCmpXchgU32(&pRingBuf->offWriteInt, offNew, offWriteInt)))
                 return VERR_WRONG_ORDER; /* race */
-            Log2(("intnetRingAllocateFrameInternal: offWriteInt: %#x -> %#x (2) (R=%#x T=%#x S=%#x)\n", offWriteInt, offNew, offRead, u16Type, cbFrame));
+            Log2(("intnetRingAllocateFrameInternal: offWriteInt: %#x -> %#x (2) (R=%#x T=%#x S=%#x)\n", offWriteInt, offNew, offRead, u8Type, cbFrame));
 
             PINTNETHDR pHdr = (PINTNETHDR)((uint8_t *)pRingBuf + offWriteInt);
-            pHdr->u16Type  = u16Type;
-            pHdr->cbFrame  = (uint16_t)cbFrame; Assert(pHdr->cbFrame == cbFrame);
+            pHdr->u8Type   = u8Type;
+            pHdr->cbFrame  = cbFrame; Assert(pHdr->cbFrame == cbFrame);
             pHdr->offFrame = pRingBuf->offStart - offWriteInt;
 
@@ -467 +467 @@
         if (RT_UNLIKELY(!ASMAtomicCmpXchgU32(&pRingBuf->offWriteInt, offNew, offWriteInt)))
             return VERR_WRONG_ORDER; /* race */
-        Log2(("intnetRingAllocateFrameInternal: offWriteInt: %#x -> %#x (3) (R=%#x T=%#x S=%#x)\n", offWriteInt, offNew, offRead, u16Type, cbFrame));
+        Log2(("intnetRingAllocateFrameInternal: offWriteInt: %#x -> %#x (3) (R=%#x T=%#x S=%#x)\n", offWriteInt, offNew, offRead, u8Type, cbFrame));
 
         PINTNETHDR pHdr = (PINTNETHDR)((uint8_t *)pRingBuf + offWriteInt);
-        pHdr->u16Type  = u16Type;
-        pHdr->cbFrame  = (uint16_t)cbFrame; Assert(pHdr->cbFrame == cbFrame);
+        pHdr->u8Type   = u8Type;
+        pHdr->cbFrame  = cbFrame; Assert(pHdr->cbFrame == cbFrame);
         pHdr->offFrame = sizeof(INTNETHDR);
 
@@ -561 +561 @@
         offWriteCom = pRingBuf->offStart;
     }
-    Log2(("IntNetRingCommitFrame:   offWriteCom: %#x -> %#x (R=%#x T=%#x S=%#x)\n", pRingBuf->offWriteCom, offWriteCom, pRingBuf->offReadX, pHdr->u16Type, cbFrame));
+    Log2(("IntNetRingCommitFrame:   offWriteCom: %#x -> %#x (R=%#x T=%#x S=%#x)\n", pRingBuf->offWriteCom, offWriteCom, pRingBuf->offReadX, pHdr->u8Type, cbFrame));
     ASMAtomicWriteU32(&pRingBuf->offWriteCom, offWriteCom);
     STAM_REL_COUNTER_ADD(&pRingBuf->cbStatWritten, cbFrame);
@@ -589 +589 @@
     Assert(pRingBuf->offWriteCom == ((uintptr_t)pHdr - (uintptr_t)pRingBuf));
 
-    if (pHdr->u16Type == INTNETHDR_TYPE_GSO)
+    if (pHdr->u8Type == INTNETHDR_TYPE_GSO)
         cbUsed += sizeof(PDMNETWORKGSO);
 
@@ -613 +613 @@
         /** @todo Later: Try unallocate the extra memory.  */
         PINTNETHDR pHdrPadding = (PINTNETHDR)((uint8_t *)pHdr + pHdr->offFrame + cbAlignedUsed);
-        pHdrPadding->u16Type  = INTNETHDR_TYPE_PADDING;
-        pHdrPadding->cbFrame  = (uint16_t)(cbAlignedFrame - cbAlignedUsed - sizeof(INTNETHDR));
+        pHdrPadding->u8Type   = INTNETHDR_TYPE_PADDING;
+        pHdrPadding->cbFrame  = cbAlignedFrame - cbAlignedUsed - sizeof(INTNETHDR);
+        Assert(pHdrPadding->cbFrame == cbAlignedFrame - cbAlignedUsed - sizeof(INTNETHDR));
         pHdrPadding->offFrame = sizeof(INTNETHDR);
-        pHdr->cbFrame = (uint16_t)cbUsed;
-    }
-
-    Log2(("IntNetRingCommitFrameEx:   offWriteCom: %#x -> %#x (R=%#x T=%#x S=%#x P=%#x)\n", pRingBuf->offWriteCom, offWriteCom, pRingBuf->offReadX, pHdr->u16Type, pHdr->cbFrame, cbAlignedFrame - cbAlignedUsed));
+        pHdr->cbFrame = cbUsed; Assert(pHdr->cbFrame == cbUsed);
+    }
+
+    Log2(("IntNetRingCommitFrameEx:   offWriteCom: %#x -> %#x (R=%#x T=%#x S=%#x P=%#x)\n", pRingBuf->offWriteCom, offWriteCom, pRingBuf->offReadX, pHdr->u8Type, pHdr->cbFrame, cbAlignedFrame - cbAlignedUsed));
     ASMAtomicWriteU32(&pRingBuf->offWriteCom, offWriteCom);
     STAM_REL_COUNTER_ADD(&pRingBuf->cbStatWritten, cbUsed);
@@ -665 +666 @@
 
             PINTNETHDR pHdr = (PINTNETHDR)((uint8_t *)pRingBuf + offWriteInt);
-            pHdr->u16Type  = INTNETHDR_TYPE_FRAME;
-            pHdr->cbFrame  = (uint16_t)cbFrame; Assert(pHdr->cbFrame == cbFrame);
+            pHdr->u8Type   = INTNETHDR_TYPE_FRAME;
+            pHdr->cbFrame  = cbFrame; Assert(pHdr->cbFrame == cbFrame);
             pHdr->offFrame = sizeof(INTNETHDR);
 
@@ -690 +691 @@
 
             PINTNETHDR pHdr = (PINTNETHDR)((uint8_t *)pRingBuf + offWriteInt);
-            pHdr->u16Type  = INTNETHDR_TYPE_FRAME;
-            pHdr->cbFrame  = (uint16_t)cbFrame; Assert(pHdr->cbFrame == cbFrame);
+            pHdr->u8Type   = INTNETHDR_TYPE_FRAME;
+            pHdr->cbFrame  = cbFrame; Assert(pHdr->cbFrame == cbFrame);
             pHdr->offFrame = pRingBuf->offStart - offWriteInt;
 
@@ -714 +715 @@
 
         PINTNETHDR pHdr = (PINTNETHDR)((uint8_t *)pRingBuf + offWriteInt);
-        pHdr->u16Type  = INTNETHDR_TYPE_FRAME;
-        pHdr->cbFrame  = (uint16_t)cbFrame; Assert(pHdr->cbFrame == cbFrame);
+        pHdr->u8Type   = INTNETHDR_TYPE_FRAME;
+        pHdr->cbFrame  = cbFrame; Assert(pHdr->cbFrame == cbFrame);
         pHdr->offFrame = sizeof(INTNETHDR);