Changeset 28054 in vbox for trunk

Timestamp:

Apr 7, 2010 5:22:17 PM (15 years ago)

Author:

vboxsync

Message:

DrvNAT: Handle GSO SGs.

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (6 diffs)

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

@@ -31 +31 @@
 #include <VBox/pdmdrv.h>
 #include <VBox/pdmnetifs.h>
+#include <VBox/pdmnetinline.h>
 #include <iprt/assert.h>
 #include <iprt/file.h>
@@ -387 +388 @@
     if (pSgBuf->pvAllocator)
     {
+        Assert(!pSgBuf->pvUser);
         slirp_ext_m_free(pThis->pNATState, (struct mbuf *)pSgBuf->pvAllocator);
         pSgBuf->pvAllocator = NULL;
+    }
+    else if (pSgBuf->pvUser)
+    {
+        RTMemFree(pSgBuf->aSegs[0].pvSeg);
+        pSgBuf->aSegs[0].pvSeg = NULL;
+        RTMemFree(pSgBuf->pvUser);
+        pSgBuf->pvUser = NULL;
     }
     RTMemFree(pSgBuf);
@@ -406 +415 @@
     {
         struct mbuf *m = (struct mbuf *)pSgBuf->pvAllocator;
-        pSgBuf->pvAllocator = NULL;
-        slirp_input(pThis->pNATState, m, pSgBuf->cbUsed);
+        if (m)
+        {
+            /*
+             * A normal frame.
+             */
+            pSgBuf->pvAllocator = NULL;
+            slirp_input(pThis->pNATState, m, pSgBuf->cbUsed);
+        }
+        else
+        {
+            /*
+             * GSO frame, need to segment it.
+             */
+            /** @todo Make the NAT engine grok large frames?  Could be more efficient... */
+            uint8_t const  *pbFrame = (uint8_t const *)pSgBuf->aSegs[0].pvSeg;
+            PCPDMNETWORKGSO pGso    = (PCPDMNETWORKGSO)pSgBuf->pvUser;
+            uint32_t const  cSegs   = PDMNetGsoCalcSegmentCount(pGso, pSgBuf->cbUsed);  Assert(cSegs > 1);
+            for (size_t iSeg = 0; iSeg < cSegs; iSeg++)
+            {
+                size_t cbSeg;
+                void  *pvSeg;
+                m = slirp_ext_m_get(pThis->pNATState, pGso->cbHdrs + pGso->cbMaxSeg, &pvSeg, &cbSeg);
+                if (!m)
+                    break;
+
+                uint32_t cbPayload;
+                uint32_t offPayload = PDMNetGsoCarveSegment(pGso, pbFrame, pSgBuf->cbUsed,
+                                                            iSeg, cSegs, (uint8_t *)pvSeg, &cbPayload);
+                memcpy((uint8_t *)pvSeg + pGso->cbHdrs, pbFrame + offPayload, cbPayload);
+
+                slirp_input(pThis->pNATState, m, cbPayload + pGso->cbHdrs);
+            }
+        }
     }
     drvNATFreeSgBuf(pThis, pSgBuf);
@@ -421 +461 @@
 {
     PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkUp);
-AssertReturn(!pGso, VERR_NOT_IMPLEMENTED); /** @todo GSO buffer allocation. */
 
     /*
@@ -438 +477 @@
     if (!pSgBuf)
         return VERR_NO_MEMORY;
-    pSgBuf->pvAllocator = slirp_ext_m_get(pThis->pNATState, cbMin,
-                                          &pSgBuf->aSegs[0].pvSeg, &pSgBuf->aSegs[0].cbSeg);
-    if (!pSgBuf->pvAllocator)
-    {
-        RTMemFree(pSgBuf);
-        /** @todo Implement the VERR_TRY_AGAIN sematics. */
-        return VERR_NO_MEMORY;
+    if (!pGso)
+    {
+        pSgBuf->pvUser      = NULL;
+        pSgBuf->pvAllocator = slirp_ext_m_get(pThis->pNATState, cbMin,
+                                              &pSgBuf->aSegs[0].pvSeg, &pSgBuf->aSegs[0].cbSeg);
+        if (!pSgBuf->pvAllocator)
+        {
+            RTMemFree(pSgBuf);
+            /** @todo Implement the VERR_TRY_AGAIN semantics. */
+            return VERR_NO_MEMORY;
+        }
+    }
+    else
+    {
+        pSgBuf->pvUser      = RTMemDup(pGso, sizeof(*pGso));
+        pSgBuf->pvAllocator = NULL;
+        pSgBuf->aSegs[0].cbSeg = RT_ALIGN_Z(cbMin, 16);
+        pSgBuf->aSegs[0].pvSeg = RTMemAlloc(pSgBuf->aSegs[0].cbSeg);
+        if (!pSgBuf->pvUser || !pSgBuf->aSegs[0].pvSeg)
+        {
+            RTMemFree(pSgBuf->aSegs[0].pvSeg);
+            RTMemFree(pSgBuf->pvUser);
+            RTMemFree(pSgBuf);
+            /** @todo Implement the VERR_TRY_AGAIN semantics. */
+            return VERR_NO_MEMORY;
+        }
     }
 
@@ -453 +511 @@
     pSgBuf->cbUsed      = 0;
     pSgBuf->cbAvailable = pSgBuf->aSegs[0].cbSeg;
-    pSgBuf->pvUser      = NULL;
     pSgBuf->cSegs       = 1;
 
+#if 1 /* poison */
+    memset(pSgBuf->aSegs[0].pvSeg, 'F', pSgBuf->aSegs[0].cbSeg);
+#endif
     *ppSgBuf = pSgBuf;
     return VINF_SUCCESS;