Changeset 39344 in vbox for trunk

Timestamp:

Nov 17, 2011 11:21:13 AM (13 years ago)

Author:

vboxsync

Message:

e1000: move part of eth header instead of packet body (#4806)

Location:

trunk/src/VBox

Files:

• Devices/Network/DevE1000.cpp (modified) (3 diffs)
• VMM/VMMR0/VMMR0.def (modified) (1 diff)
• VMM/VMMRC/VMMRC.def (modified) (1 diff)

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

@@ -3206 +3206 @@
     if (cbFrame > 16 && pState->fVTag)
     {
-        E1kLog3(("%s Inserting VLAN tag %08x\n",
+        /*
+         * We should have 'adjusted' pvSeg earlier to make room for four
+         * additional bytes at the beginning of buffer. Now we move it back.
+         */
+        uint32_t *pSrc = (uint32_t*)pSg->aSegs[0].pvSeg;
+        uint32_t *pDst = pSrc - 1;
+        pSg->aSegs[0].pvSeg = pDst;
+        *pDst++ = *pSrc++; /* Copy destination address */
+        *pDst++ = *pSrc++; /* Copy destination and source addresses */
+        *pDst++ = *pSrc++; /* Copy source address */
+        *pDst++ = RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16);
+        E1kLog3(("%s Inserted VLAN tag %08x\n",
             INSTANCE(pState), RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16)));
-        memmove((uint8_t*)pSg->aSegs[0].pvSeg + 16, (uint8_t*)pSg->aSegs[0].pvSeg + 12, cbFrame - 12);
-        *((uint32_t*)pSg->aSegs[0].pvSeg + 3) = RT_BE2H_U16(VET) | (RT_BE2H_U16(pState->u16VTagTCI) << 16);
     }
     /* Update the stats */
@@ -3734 +3743 @@
                 /** @todo Is there any way to indicating errors other than collisions? Like
                  *        VERR_NET_DOWN. */
+                /*
+                 * If allocate a bigger buffer we need to move pvSeg
+                 * accordingly, leaving room in front.
+                 *
+                 * Note that e1kTransmitFrame not necessarily moves it back. In
+                 * case of multi-descriptor packet with TSE we won't know if
+                 * VLAN tag has to be inserted until the last descriptor is
+                 * fetched. If it has not we simply leave pvSeg as it is (+4)
+                 * and send the packet without inserting VLAN tag.
+                 */
+                if (cbVTag)
+                {
+                    Assert(cbVTag == 4);
+                    pState->CTX_SUFF(pTxSg)->aSegs[0].pvSeg =
+                        (uint8_t*)(pState->CTX_SUFF(pTxSg)->aSegs[0].pvSeg) + cbVTag;
+                }
             }
 
@@ -3824 +3849 @@
                 /** @todo Is there any way to indicating errors other than collisions? Like
                  *        VERR_NET_DOWN. */
+                /*
+                 * If allocate a bigger buffer we need to move pvSeg
+                 * accordingly, leaving room in front. Also see the comment
+                 * in data descriptor processing.
+                 */
+                if (cbVTag)
+                {
+                    Assert(cbVTag == 4);
+                    pState->CTX_SUFF(pTxSg)->aSegs[0].pvSeg =
+                        (uint8_t*)(pState->CTX_SUFF(pTxSg)->aSegs[0].pvSeg) + cbVTag;
+                }
             }
 

trunk/src/VBox/VMM/VMMR0/VMMR0.def

@@ -98 +98 @@
     nocrt_memcpy
     memcpy=nocrt_memcpy                 ; not-os2
-    nocrt_memmove
     nocrt_memset
     memset=nocrt_memset                 ; not-os2

trunk/src/VBox/VMM/VMMRC/VMMRC.def

@@ -86 +86 @@
     nocrt_memcpy
     memcpy=nocrt_memcpy                 ; not-os2
-    nocrt_memmove
     nocrt_memset
     memset=nocrt_memset                 ; not-os2