Changeset 33325 in vbox for trunk/src/VBox/Devices/VirtIO

Timestamp:

Oct 21, 2010 8:34:14 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66905

Message:

virtio-net: large (GSO) receive packet support (#4807)

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio.cpp (modified) (1 diff)
• Virtio.h (modified) (1 diff)

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -181 +181 @@
 }
 
-void vqueuePut(PVPCISTATE pState, PVQUEUE pQueue, PVQUEUEELEM pElem, uint32_t uLen)
-{
-    unsigned int i, uOffset;
+void vqueuePut(PVPCISTATE pState, PVQUEUE pQueue, PVQUEUEELEM pElem, uint32_t uLen, uint32_t uReserved)
+{
+    unsigned int i, uOffset, cbReserved = uReserved;
 
     Log2(("%s vqueuePut: %s desc_idx=%u acb=%u\n", INSTANCE(pState),
           QUEUENAME(pState, pQueue), pElem->uIndex, uLen));
-    for (i = uOffset = 0; i < pElem->nIn && uOffset < uLen; i++)
-    {
-        uint32_t cbSegLen = RT_MIN(uLen - uOffset, pElem->aSegsIn[i].cb);
+    for (i = uOffset = 0; i < pElem->nIn && uOffset < uLen - uReserved; i++)
+    {
+        uint32_t cbSegLen = RT_MIN(uLen - cbReserved - uOffset, pElem->aSegsIn[i].cb - cbReserved);
         if (pElem->aSegsIn[i].pv)
         {
             Log2(("%s vqueuePut: %s used_idx=%u seg=%u addr=%p pv=%p cb=%u acb=%u\n", INSTANCE(pState),
                   QUEUENAME(pState, pQueue), pQueue->uNextUsedIndex, i, pElem->aSegsIn[i].addr, pElem->aSegsIn[i].pv, pElem->aSegsIn[i].cb, cbSegLen));
-            PDMDevHlpPhysWrite(pState->CTX_SUFF(pDevIns), pElem->aSegsIn[i].addr,
+            PDMDevHlpPhysWrite(pState->CTX_SUFF(pDevIns), pElem->aSegsIn[i].addr + cbReserved,
                                pElem->aSegsIn[i].pv, cbSegLen);
+            cbReserved = 0;
         }
         uOffset += cbSegLen;
     }
 
+    Assert((uReserved + uOffset) == uLen || pElem->nIn == 0);
     Log2(("%s vqueuePut: %s used_idx=%u guest_used_idx=%u id=%u len=%u\n", INSTANCE(pState),
           QUEUENAME(pState, pQueue), pQueue->uNextUsedIndex, vringReadUsedIndex(pState, &pQueue->VRing), pElem->uIndex, uLen));

trunk/src/VBox/Devices/VirtIO/Virtio.h

@@ -305 +305 @@
 
 bool vqueueGet(PVPCISTATE pState, PVQUEUE pQueue, PVQUEUEELEM pElem);
-void vqueuePut(PVPCISTATE pState, PVQUEUE pQueue, PVQUEUEELEM pElem, uint32_t uLen);
+void vqueuePut(PVPCISTATE pState, PVQUEUE pQueue, PVQUEUEELEM pElem, uint32_t uLen, uint32_t uReserved = 0);
 void vqueueNotify(PVPCISTATE pState, PVQUEUE pQueue);
 void vqueueSync(PVPCISTATE pState, PVQUEUE pQueue);