Changeset 5283

Timestamp:

10/13/07 01:21:09 (1 year ago)

Author:

vboxsync

Message:

internal networking fixes.

Files:

• trunk/include/VBox/intnet.h (modified) (8 diffs)
• trunk/src/VBox/Devices/Network/DrvIntNet.cpp (modified) (9 diffs)
• trunk/src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (11 diffs)
• trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/PDMDriver.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)

trunk/include/VBox/intnet.h

@@ -20 +20 @@
-#include <VBox/types.h>
-#include <VBox/stam.h>
+#include <VBox/sup.h>
-#include <iprt/assert.h>
-#include <iprt/asm.h>
@@ -25 +26 @@
-__BEGIN_DECLS
-
+
+/** Pointer to an internal network ring-0 instance. */
+typedef struct INTNET *PINTNET;
-
-/**
@@ -164 +168 @@
-    Assert(pHdr->u16Type == INTNETHDR_TYPE_FRAME);
-    Assert(off < pBuf->cbBuf);
-
+=
-#endif
-    NOREF(pBuf);
@@ -198 +202 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    /** The network name. (input) */
-    char            szNetwork[INTNET_MAX_NETWORK_NAME];
@@ -215 +220 @@
-    /** The handle to the network interface. (output) */
-    INTNETIFHANDLE  hIf;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** The handle to the network interface. */
-    INTNETIFHANDLE  hIf;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** Handle to the interface. */
-
+        
-    /** The pointer to the ring3 buffer. (output) */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** Handle to the interface. */
-    INTNETIFHANDLE  hIf;
-    /** The new promiscuous mode. */
-    bool            fPromiscuous;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** Handle to the interface. */
-    INTNETIFHANDLE  hIf;
-
-
-
-
-
+
-/** Pointer to an INTNETR0IfSend() argument package. */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** Handle to the interface. */
-    INTNETIFHANDLE  hIf;
-    /** The number of milliseconds to wait. */
-
-
-
-
+
+
+
+
+
+
-
-
@@ -298 +322 @@
- * @{
- */
-
-/** Pointer to an internal network ring-0 instance. */
-typedef struct INTNET *PINTNET;
-
-/**
@@ -358 +379 @@
- * @param   ppRing3Buf  Where to store the address of the ring-3 mapping.
- */
-PINTNETBUF
+R3PTRTYPE(PINTNETBUF)
-
-/**
@@ -396 +417 @@
- *                      used if indefinite wait is desired.
- */
-nsigned
+int32_t
-
-/** @} */

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

@@ -113 +113 @@
-
-/**
+ * Writes a frame packet to the buffer.
+ *
+ * @returns VBox status code.
+ * @param   pBuf        The buffer.
+ * @param   pRingBuf    The ring buffer to read from.
+ * @param   pvFrame     The frame to write.
+ * @param   cbFrame     The size of the frame.
+ * @remark  This is the same as INTNETRingWriteFrame
+ */
+static int drvIntNetRingWriteFrame(PINTNETBUF pBuf, PINTNETRINGBUF pRingBuf, const void *pvFrame, uint32_t cbFrame)
+{
+    /*
+     * Validate input.
+     */
+    Assert(pBuf);
+    Assert(pRingBuf);
+    Assert(pvFrame);
+    Assert(cbFrame >= sizeof(PDMMAC) * 2);
+    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)));
+
+    const uint32_t cb = RT_ALIGN_32(cbFrame, sizeof(INTNETHDR));
+    if (offRead <= offWrite)
+    {
+        /*
+         * 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);
+
+            memcpy(pHdr + 1, pvFrame, cbFrame);
+
+            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;
+
+            memcpy(pvFrameOut, pvFrame, cbFrame);
+
+            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);
+
+        memcpy(pHdr + 1, pvFrame, cbFrame);
+
+        offWrite += cb + sizeof(INTNETHDR);
+        ASMAtomicXchgU32(&pRingBuf->offWrite, offWrite);
+        Log2(("WriteFrame: offWrite: %#x -> %#x (3)\n", pRingBuf->offWrite, offWrite));
+        return VINF_SUCCESS;
+    }
+
+    /* (it didn't fit) */
+    /** @todo stats */
+    return VERR_BUFFER_OVERFLOW;
+}
+
+
+/**
- * Send data to the network.
- *
@@ -136 +229 @@
-#endif
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    STAM_PROFILE_STOP(&pThis->StatTransmit, a);
@@ -162 +273 @@
-{
-    PDRVINTNET pThis = PDMINETWORKCONNECTOR_2_DRVINTNET(pInterface);
-
-
-
-
-
+
+
+
+
+
+
+
-    AssertRC(rc);
-}
@@ -368 +481 @@
-            return VERR_STATE_CHANGED;
-        }
-
-
-
+
+
+
+
+
-        STAM_PROFILE_ADV_STOP(&pThis->StatReceive, a);
-Args, sizeof(WaitArgs
+Req, sizeof(WaitReq
-        if (    VBOX_FAILURE(rc)
-            &&  rc != VERR_TIMEOUT
@@ -547 +662 @@
-    if (pThis->hIf != INTNET_HANDLE_INVALID)
-    {
-
-
+
+
+
+
-        pThis->hIf = INTNET_HANDLE_INVALID;
-Args, sizeof(CloseArgs
+Req, sizeof(CloseReq
-        AssertRC(rc);
-    }
@@ -638 +755 @@
-     * Read the configuration.
-     */
-
-
-
+
+
+
+
+
+
-    if (VBOX_FAILURE(rc))
-        return PDMDRV_SET_ERROR(pDrvIns, rc,
-                                N_("Configuration error: Failed to get the \"Network\" value"));
-Args
-
-Args
+Req
+
+Req
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-Args
+Req
-    else if (VBOX_FAILURE(rc))
-        return PDMDRV_SET_ERROR(pDrvIns, rc,
-                                N_("Configuration error: Failed to get the \"ReceiveBufferSize\" value"));
-
-Args
+Req
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-Args
+Req
-    else if (VBOX_FAILURE(rc))
-        return PDMDRV_SET_ERROR(pDrvIns, rc,
-                                N_("Configuration error: Failed to get the \"SendBufferSize\" value"));
-
-
+
+
+
+
+
+
+
-    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
-Args
+Req
-    else if (VBOX_FAILURE(rc))
-        return PDMDRV_SET_ERROR(pDrvIns, rc,
@@ -680 +805 @@
-     * Create the interface.
-     */
-Args
-Args, sizeof(OpenArgs
+Req
+Req, sizeof(OpenReq
-    if (VBOX_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("Failed to open/create the internal network '%s'"), pThis->szNetwork);
-Args
-Args
+Req
+Req
-    Log(("IntNet%d: hIf=%RX32 '%s'\n", pDrvIns->iInstance, pThis->hIf, pThis->szNetwork));
-
@@ -692 +817 @@
-     * Get default buffer.
-     */
-
-
-
-
+
+
+
+
+
+
-    if (VBOX_FAILURE(rc))
-        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
-                                   N_("Failed to get ring-3 buffer for the newly created interface to '%s'"), pThis->szNetwork);
-Args
-Args
+Req
+Req
-
-    /*
@@ -737 +864 @@
-#endif
-
-Args.cbRecv, OpenArgs.cbSend, OpenArgs
+Req.cbRecv, OpenReq.cbSend, OpenReq
-
-    return rc;

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

@@ -60 +60 @@
-    PINTNETBUF              pIntBuf;
-    /** Pointer to ring-3 mapping of the current exchange buffer. */
-PINTNETBUF           
+R3PTRTYPE(PINTNETBUF)
-    /** Pointer to the default exchange buffer for the interface. */
-    PINTNETBUF              pIntBufDefault;
-    /** Pointer to ring-3 mapping of the default exchange buffer. */
-PINTNETBUF           
+R3PTRTYPE(PINTNETBUF)
-    /** Event semaphore which a receiver thread will sleep on while waiting for data to arrive. */
-    RTSEMEVENT              Event;
@@ -625 +625 @@
-     * Process the send buffer.
-     */
-
-
-
+
+
+
+
+
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        }
+        /* else: ignore the frame */
+
+        /* Skip to the next frame. */
+        INTNETRingSkipFrame(pIf->pIntBuf, &pIf->pIntBuf->Send);
-    }
-
-    return RTSemFastMutexRelease(pIf->pNetwork->FastMutex);
+}
+
+
+/**
+ * VMMR0 request wrapper for INTNETR0IfSend.
+ *
+ * @returns see INTNETR0IfSend.
+ * @param   pIntNet         The internal networking instance.
+ * @param   pReq            The request packet.
+ */
+INTNETR0DECL(int) INTNETR0IfSendReq(PINTNET pIntNet, PINTNETIFSENDREQ pReq)
+{
+    if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
+        return VERR_INVALID_PARAMETER;
+    return INTNETR0IfSend(pIntNet, pReq->hIf, NULL, 0);
-}
-
@@ -660 +668 @@
- * @param   ppRing3Buf  Where to store the address of the ring-3 mapping.
- */
-PINTNETBUF
+R3PTRTYPE(PINTNETBUF)
-{
-    LogFlow(("INTNETR0IfGetRing3Buffer: pIntNet=%p hIf=%RX32 ppRing3Buf=%p\n", pIntNet, hIf, ppRing3Buf));
@@ -687 +695 @@
-    LogFlow(("INTNETR0IfGetRing3Buffer: returns %Vrc *ppRing3Buf=%p\n", rc, *ppRing3Buf));
-    return rc;
+}
+
+
+/**
+ * VMMR0 request wrapper for INTNETR0IfGetRing3Buffer.
+ *
+ * @returns see INTNETR0IfGetRing3Buffer.
+ * @param   pIntNet         The internal networking instance.
+ * @param   pReq            The request packet.
+ */
+INTNETR0DECL(int) INTNETR0IfGetRing3BufferReq(PINTNET pIntNet, PINTNETIFGETRING3BUFFERREQ pReq)
+{
+    if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
+        return VERR_INVALID_PARAMETER;
+    return INTNETR0IfGetRing3Buffer(pIntNet, pReq->hIf, &pReq->pRing3Buf);
-}
-
@@ -799 +822 @@
-
-/**
+ * VMMR0 request wrapper for INTNETR0IfSetPromiscuousMode.
+ *
+ * @returns see INTNETR0IfSetPromiscuousMode.
+ * @param   pIntNet         The internal networking instance.
+ * @param   pReq            The request packet.
+ */
+INTNETR0DECL(int) INTNETR0IfSetPromiscuousModeReq(PINTNET pIntNet, PINTNETIFSETPROMISCUOUSMODEREQ pReq)
+{
+    if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
+        return VERR_INVALID_PARAMETER;
+    return INTNETR0IfSetPromiscuousMode(pIntNet, pReq->hIf, pReq->fPromiscuous);
+}
+
+
+/**
- * Wait for the interface to get signaled.
- * The interface will be signaled when is put into the receive buffer.
@@ -808 +846 @@
- *                      used if indefinite wait is desired.
- */
-nsigned
+int32_t
-{
-    LogFlow(("INTNETR0IfWait: pIntNet=%p hIf=%RX32 cMillies=%u\n", pIntNet, hIf, cMillies));
@@ -844 +882 @@
-     */
-    ASMAtomicIncU32(&pIf->cSleepers);
-
+NoResume
-    if (pIf->Event == Event)
-    {
@@ -859 +897 @@
-
-/**
+ * VMMR0 request wrapper for INTNETR0IfWait.
+ *
+ * @returns see INTNETR0IfWait.
+ * @param   pIntNet         The internal networking instance.
+ * @param   pReq            The request packet.
+ */
+INTNETR0DECL(int) INTNETR0IfWaitReq(PINTNET pIntNet, PINTNETIFWAITREQ pReq)
+{
+    if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
+        return VERR_INVALID_PARAMETER;
+    return INTNETR0IfWait(pIntNet, pReq->hIf, pReq->cMillies);
+}
+
+
+/**
- * Close an interface.
- *
@@ -880 +933 @@
-    LogFlow(("INTNETR0IfClose: returns %Vrc\n", rc));
-    return rc;
+}
+
+
+/**
+ * VMMR0 request wrapper for INTNETR0IfCloseReq.
+ *
+ * @returns see INTNETR0IfClose.
+ * @param   pIntNet         The internal networking instance.
+ * @param   pReq            The request packet.
+ */
+INTNETR0DECL(int) INTNETR0IfCloseReq(PINTNET pIntNet, PINTNETIFCLOSEREQ pReq)
+{
+    if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
+        return VERR_INVALID_PARAMETER;
+    return INTNETR0IfClose(pIntNet, pReq->hIf);
-}
-
@@ -978 +1046 @@
-        SUPR0MemFree(pIf->pSession, (RTHCUINTPTR)pIf->pIntBufDefault);
-        pIf->pIntBufDefault = NULL;
-
-
+
-        pIf->pIntBuf = NULL;
+        pIf->pIntBufR3 = 0;
-    }
-
@@ -1419 +1487 @@
-
-/**
+ * VMMR0 request wrapper for GMMR0MapUnmapChunk.
+ *
+ * @returns see GMMR0MapUnmapChunk.
+ * @param   pIntNet         The internal networking instance.
+ * @param   pSession        The session handle.
+ * @param   pReq            The request packet.
+ */
+INTNETR0DECL(int) INTNETR0OpenReq(PINTNET pIntNet, PSUPDRVSESSION pSession, PINTNETOPENREQ pReq)
+{
+    if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
+        return VERR_INVALID_PARAMETER;
+    return INTNETR0Open(pIntNet, pSession, &pReq->szNetwork[0], pReq->cbSend, pReq->cbRecv, pReq->fRestrictAccess, &pReq->hIf);
+}
+
+
+/**
- * Destroys an instance of the Ring-0 internal networking service.
- *

trunk/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp

@@ -202 +202 @@
-
-
-128
+384
-
-/**
@@ -229 +229 @@
-        const unsigned cb = iFrame % 1519 + 12 + sizeof(unsigned);
-        *puFrame = iFrame;
+#if 0
-        int rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, abBuf, cb);
+#else
+        int rc = INTNETRingWriteFrame(pArgs->pBuf, &pArgs->pBuf->Send, abBuf, cb);
+        if (RT_SUCCESS(rc))
+            rc = INTNETR0IfSend(pArgs->pIntNet, pArgs->hIf, NULL, 0);
+#endif
-        if (VBOX_FAILURE(rc))
-        {
-            g_cErrors++;
-\n", cb, rc
+ (%d)\n", cb, rc, INTNETRingGetWritable(&pArgs->pBuf->Send)
-        }
-        cbSent += cb;
@@ -384 +390 @@
-     */
-    INTNETIFHANDLE hIf0 = INTNET_HANDLE_INVALID;
-
+*2 + 4
-    if (VBOX_SUCCESS(rc))
-    {
@@ -390 +396 @@
-        {
-            INTNETIFHANDLE hIf1 = INTNET_HANDLE_INVALID;
-
+*2 + 4
-            if (VBOX_SUCCESS(rc))
-            {

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -991 +991 @@
-    if (    uOperation >= VMMR0_DO_SRV_START
-        &&  uOperation <  VMMR0_DO_SRV_END)
-
-
-
-
-
-
-
-
+
-    else
-    {

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -832 +832 @@
-
-
- 0//def VBOX_WITH_INTERNAL_NETWORKING - currently busted
-
-Services
+def VBOX_WITH_INTERNAL_NETWORKING
+
+Requests to the internal networking service
-         */
-        case VMMR0_DO_INTNET_OPEN:
+            if (!pVM || u64Arg)
+                return VERR_INVALID_PARAMETER;
+            if (!g_pIntNet)
+                return VERR_NOT_SUPPORTED;
+            return INTNETR0OpenReq(g_pIntNet, pVM->pSession, (PINTNETOPENREQ)pReqHdr);
+
-        case VMMR0_DO_INTNET_IF_CLOSE:
+            if (!pVM || u64Arg)
+                return VERR_INVALID_PARAMETER;
+            if (!g_pIntNet)
+                return VERR_NOT_SUPPORTED;
+            return INTNETR0IfCloseReq(g_pIntNet, (PINTNETIFCLOSEREQ)pReqHdr);
+
-        case VMMR0_DO_INTNET_IF_GET_RING3_BUFFER:
+            if (!pVM || u64Arg)
+                return VERR_INVALID_PARAMETER;
+            if (!g_pIntNet)
+                return VERR_NOT_SUPPORTED;
+            return INTNETR0IfGetRing3BufferReq(g_pIntNet, (PINTNETIFGETRING3BUFFERREQ)pReqHdr);
+
-        case VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE:
+            if (!pVM || u64Arg)
+                return VERR_INVALID_PARAMETER;
+            if (!g_pIntNet)
+                return VERR_NOT_SUPPORTED;
+            return INTNETR0IfSetPromiscuousModeReq(g_pIntNet, (PINTNETIFSETPROMISCUOUSMODEREQ)pReqHdr);
+
-        case VMMR0_DO_INTNET_IF_SEND:
+            if (!pVM || u64Arg)
+                return VERR_INVALID_PARAMETER;
+            if (!g_pIntNet)
+                return VERR_NOT_SUPPORTED;
+            return INTNETR0IfSendReq(g_pIntNet, (PINTNETIFSENDREQ)pReqHdr);
+
-        case VMMR0_DO_INTNET_IF_WAIT:
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            if (!g_pIntNet)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-#endif /* VBOX_WITH_INTERNAL_NETWORKING */
-