Changeset 26574 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Feb 16, 2010 12:44:10 PM (15 years ago)

Author:

vboxsync

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

57756

Message:

Networking: Preparing to make the driver return a send buffer to the device emulation.

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• VBoxNetARP.cpp (modified) (2 diffs)
• VBoxNetInt.cpp (deleted)
• VBoxNetIntIf.cpp (modified) (2 diffs)
• VBoxNetLib.h (modified) (1 diff)
• VBoxNetUDP.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp

@@ -26 +26 @@
 #include "VBoxNetLib.h"
 #include <iprt/string.h>
+#include <VBox/intnetinline.h>
 #include <VBox/log.h>
 
@@ -45 +46 @@
      * Valid IntNet Ethernet frame?
      */
-    PCINTNETHDR pHdr = (PINTNETHDR)((uintptr_t)pBuf + pBuf->Recv.offRead);
-    if (pHdr->u16Type != INTNETHDR_TYPE_FRAME)
+    PCINTNETHDR pHdr = INTNETRingGetNextFrameToRead(&pBuf->Recv);
+    if (   !pHdr
+        || pHdr->u16Type != INTNETHDR_TYPE_FRAME)
         return false;
 
-    size_t      cbFrame = pHdr->cbFrame;
-    const void *pvFrame = INTNETHdrGetFramePtr(pHdr, pBuf);
+    size_t          cbFrame = pHdr->cbFrame;
+    const void     *pvFrame = INTNETHdrGetFramePtr(pHdr, pBuf);
     PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pvFrame;
 

trunk/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp

@@ -26 +26 @@
 #include "VBoxNetLib.h"
 #include <VBox/intnet.h>
+#include <VBox/intnetinline.h>
 #include <VBox/sup.h>
 #include <VBox/vmm.h>
@@ -87 +88 @@
      * Validate input.
      */
-    Assert(pBuf);
-    Assert(pRingBuf);
-    uint32_t offWrite = pRingBuf->offWrite;
-    Assert(offWrite == RT_ALIGN_32(offWrite, sizeof(INTNETHDR)));
-    uint32_t offRead = pRingBuf->offRead;
-    Assert(offRead == RT_ALIGN_32(offRead, sizeof(INTNETHDR)));
+    AssertPtr(pBuf);
+    AssertPtr(pRingBuf);
     AssertPtr(paSegs);
     Assert(cSegs > 0);
 
-    /* Calc frame size. */
+    /*
+     * Calc frame size.
+     */
     uint32_t cbFrame = 0;
     for (size_t iSeg = 0; iSeg < cSegs; iSeg++)
         cbFrame += paSegs[iSeg].cb;
-
     Assert(cbFrame >= sizeof(RTMAC) * 2);
 
-
-    const uint32_t cb = RT_ALIGN_32(cbFrame, sizeof(INTNETHDR));
-    if (offRead <= offWrite)
+    /*
+     * Allocate a frame, copy the data and commit it.
+     */
+    PINTNETHDR pHdr;
+    void *pvFrame;
+    int rc = INTNETRingAllocateFrame(pRingBuf, cbFrame, &pHdr, &pvFrame);
+    if (RT_SUCCESS(rc))
     {
-        /*
-         * Try fit it all before the end of the buffer.
-         */
-        if (pRingBuf->offEnd - offWrite >= cb + sizeof(INTNETHDR))
-        {
-            PINTNETHDR pHdr = (PINTNETHDR)((uint8_t *)pBuf + offWrite);
-            pHdr->u16Type  = INTNETHDR_TYPE_FRAME;
-            pHdr->cbFrame  = cbFrame;
-            pHdr->offFrame = sizeof(INTNETHDR);
-
-            vboxnetIntIfCopySG(pHdr + 1, cSegs, paSegs);
-
-            offWrite += cb + sizeof(INTNETHDR);
-            Assert(offWrite <= pRingBuf->offEnd && offWrite >= pRingBuf->offStart);
-            if (offWrite >= pRingBuf->offEnd)
-                offWrite = pRingBuf->offStart;
-            Log2(("WriteFrame: offWrite: %#x -> %#x (1)\n", pRingBuf->offWrite, offWrite));
-            ASMAtomicXchgU32(&pRingBuf->offWrite, offWrite);
-            return VINF_SUCCESS;
-        }
-
-        /*
-         * Try fit the frame at the start of the buffer.
-         * (The header fits before the end of the buffer because of alignment.)
-         */
-        AssertMsg(pRingBuf->offEnd - offWrite >= sizeof(INTNETHDR), ("offEnd=%x offWrite=%x\n", pRingBuf->offEnd, offWrite));
-        if (offRead - pRingBuf->offStart > cb) /* not >= ! */
-        {
-            PINTNETHDR  pHdr = (PINTNETHDR)((uint8_t *)pBuf + offWrite);
-            void       *pvFrameOut = (PINTNETHDR)((uint8_t *)pBuf + pRingBuf->offStart);
-            pHdr->u16Type  = INTNETHDR_TYPE_FRAME;
-            pHdr->cbFrame  = cbFrame;
-            pHdr->offFrame = (intptr_t)pvFrameOut - (intptr_t)pHdr;
-
-            vboxnetIntIfCopySG(pvFrameOut, cSegs, paSegs);
-
-            offWrite = pRingBuf->offStart + cb;
-            ASMAtomicXchgU32(&pRingBuf->offWrite, offWrite);
-            Log2(("WriteFrame: offWrite: %#x -> %#x (2)\n", pRingBuf->offWrite, offWrite));
-            return VINF_SUCCESS;
-        }
-    }
-    /*
-     * The reader is ahead of the writer, try fit it into that space.
-     */
-    else if (offRead - offWrite > cb + sizeof(INTNETHDR)) /* not >= ! */
-    {
-        PINTNETHDR pHdr = (PINTNETHDR)((uint8_t *)pBuf + offWrite);
-        pHdr->u16Type  = INTNETHDR_TYPE_FRAME;
-        pHdr->cbFrame  = cbFrame;
-        pHdr->offFrame = sizeof(INTNETHDR);
-
-        vboxnetIntIfCopySG(pHdr + 1, cSegs, paSegs);
-
-        offWrite += cb + sizeof(INTNETHDR);
-        ASMAtomicXchgU32(&pRingBuf->offWrite, offWrite);
-        Log2(("WriteFrame: offWrite: %#x -> %#x (3)\n", pRingBuf->offWrite, offWrite));
+        vboxnetIntIfCopySG(pvFrame, cSegs, paSegs);
+        INTNETRingCommitFrame(pRingBuf, pHdr);
         return VINF_SUCCESS;
     }
 
-    /* (it didn't fit) */
-    /** @todo stats */
-    return VERR_BUFFER_OVERFLOW;
+    return rc;
 }
 

trunk/src/VBox/NetworkServices/NetLib/VBoxNetLib.h

@@ -51 +51 @@
 /** @}  */
 
-void *  VBoxNetUDPMatch(PCINTNETBUF pBuf, unsigned uDstPort, PCRTMAC pDstMac, uint32_t fFlags, PVBOXNETUDPHDRS pHdrs, size_t *pcb);
+void *  VBoxNetUDPMatch(PINTNETBUF pBuf, unsigned uDstPort, PCRTMAC pDstMac, uint32_t fFlags, PVBOXNETUDPHDRS pHdrs, size_t *pcb);
 int     VBoxNetUDPUnicast(PSUPDRVSESSION pSession, INTNETIFHANDLE hIf, PINTNETBUF pBuf,
                           RTNETADDRIPV4 SrcIPv4Addr, PCRTMAC SrcMacAddr, unsigned uSrcPort,

trunk/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp

@@ -29 +29 @@
 #include <iprt/rand.h>
 #include <VBox/log.h>
+#include <VBox/intnetinline.h>
 
 
@@ -46 +47 @@
  * @param   pcb             Where to return the size of the data on success.
  */
-void *VBoxNetUDPMatch(PCINTNETBUF pBuf, unsigned uDstPort, PCRTMAC pDstMac, uint32_t fFlags, PVBOXNETUDPHDRS pHdrs, size_t *pcb)
+void *VBoxNetUDPMatch(PINTNETBUF pBuf, unsigned uDstPort, PCRTMAC pDstMac, uint32_t fFlags, PVBOXNETUDPHDRS pHdrs, size_t *pcb)
 {
     /*
@@ -62 +63 @@
      * Valid IntNet Ethernet frame?
      */
-    PCINTNETHDR pHdr = (PINTNETHDR)((uintptr_t)pBuf + pBuf->Recv.offRead);
-    if (pHdr->u16Type != INTNETHDR_TYPE_FRAME)
-        return NULL;
-
-    size_t      cbFrame = pHdr->cbFrame;
-    const void *pvFrame = INTNETHdrGetFramePtr(pHdr, pBuf);
+    PCINTNETHDR pHdr = INTNETRingGetNextFrameToRead(&pBuf->Recv);
+    if (!pHdr || pHdr->u16Type != INTNETHDR_TYPE_FRAME)
+        return NULL;
+
+    size_t          cbFrame = pHdr->cbFrame;
+    const void     *pvFrame = INTNETHdrGetFramePtr(pHdr, pBuf);
     PCRTNETETHERHDR pEthHdr = (PCRTNETETHERHDR)pvFrame;
     if (pHdrs)