Changeset 28711 in vbox

Timestamp:

Apr 25, 2010 7:01:24 PM (15 years ago)

Author:

vboxsync

Message:

IntNet,++: Implemented sending frames in ring-0 (disabled).

Location:

trunk

Files:

• include/VBox/intnet.h (modified) (3 diffs)
• include/VBox/vmm.h (modified) (1 diff)
• src/VBox/Devices/Network/DrvIntNet.cpp (modified) (21 diffs)
• src/VBox/Devices/Network/SrvIntNetR0.cpp (modified) (6 diffs)
• src/VBox/Devices/Network/testcase/tstIntNet-1.cpp (modified) (2 diffs)
• src/VBox/Devices/Network/testcase/tstIntNetR0.cpp (modified) (2 diffs)
• src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (2 diffs)
• src/VBox/NetworkServices/NetLib/VBoxNetBaseService.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/VMMR0.def (modified) (1 diff)

trunk/include/VBox/intnet.h

@@ -860 +860 @@
 /**
  * Request buffer for IntNetR0IfGetRing3BufferReq /
- * VMMR0_DO_INTNET_IF_GET_RING3_BUFFER.
+ * VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS.
  * @see IntNetR0IfGetRing3Buffer.
  */
-typedef struct INTNETIFGETRING3BUFFERREQ
+typedef struct INTNETIFGETBUFFERPTRSREQ
 {
     /** The request header. */
@@ -872 +872 @@
     /** Handle to the interface. */
     INTNETIFHANDLE  hIf;
-    /** The pointer to the ring3 buffer. (output) */
+    /** The pointer to the ring-3 buffer. (output) */
     R3PTRTYPE(PINTNETBUF)   pRing3Buf;
-} INTNETIFGETRING3BUFFERREQ;
+    /** The pointer to the ring-0 buffer. (output) */
+    R0PTRTYPE(PINTNETBUF)   pRing0Buf;
+} INTNETIFGETBUFFERPTRSREQ;
 /** Pointer to an IntNetR0IfGetRing3BufferReq /
- *  VMMR0_DO_INTNET_IF_GET_RING3_BUFFER request buffer. */
-typedef INTNETIFGETRING3BUFFERREQ *PINTNETIFGETRING3BUFFERREQ;
-
-INTNETR0DECL(int) IntNetR0IfGetRing3BufferReq(PSUPDRVSESSION pSession, PINTNETIFGETRING3BUFFERREQ pReq);
+ *  VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS request buffer. */
+typedef INTNETIFGETBUFFERPTRSREQ *PINTNETIFGETBUFFERPTRSREQ;
+
+INTNETR0DECL(int) IntNetR0IfGetBufferPtrsReq(PSUPDRVSESSION pSession, PINTNETIFGETBUFFERPTRSREQ pReq);
 
 
@@ -1007 +1009 @@
 INTNETR0DECL(uint32_t) IntNetR0GetNetworkCount(void);
 
-INTNETR0DECL(int) IntNetR0IfClose(             INTNETIFHANDLE hIf, PSUPDRVSESSION pSession);
-INTNETR0DECL(int) IntNetR0IfGetRing0Buffer(    INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PINTNETBUF *ppRing0Buf);
-INTNETR0DECL(int) IntNetR0IfGetRing3Buffer(    INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, R3PTRTYPE(PINTNETBUF) *ppRing3Buf);
-INTNETR0DECL(int) IntNetR0IfSetPromiscuousMode(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fPromiscuous);
-INTNETR0DECL(int) IntNetR0IfSetMacAddress(     INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PCRTMAC pMac);
-INTNETR0DECL(int) IntNetR0IfSetActive(         INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fActive);
-INTNETR0DECL(int) IntNetR0IfSend(              INTNETIFHANDLE hIf, PSUPDRVSESSION pSession);
-INTNETR0DECL(int) IntNetR0IfWait(              INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, uint32_t cMillies);
+INTNETR0DECL(int)       IntNetR0IfClose(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession);
+INTNETR0DECL(int)       IntNetR0IfGetBufferPtrs(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession,
+                                                R3PTRTYPE(PINTNETBUF) *ppRing3Buf, R0PTRTYPE(PINTNETBUF) *ppRing0Buf);
+INTNETR0DECL(int)       IntNetR0IfSetPromiscuousMode(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fPromiscuous);
+INTNETR0DECL(int)       IntNetR0IfSetMacAddress(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PCRTMAC pMac);
+INTNETR0DECL(int)       IntNetR0IfSetActive(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, bool fActive);
+INTNETR0DECL(int)       IntNetR0IfSend(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession);
+INTNETR0DECL(int)       IntNetR0IfWait(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, uint32_t cMillies);
 
 /** @} */

trunk/include/VBox/vmm.h

@@ -329 +329 @@
     /** Call IntNetR0IfClose(). */
     VMMR0_DO_INTNET_IF_CLOSE,
-    /** Call IntNetR0IfGetRing3Buffer(). */
-    VMMR0_DO_INTNET_IF_GET_RING3_BUFFER,
+    /** Call IntNetR0IfGetBufferPtrs(). */
+    VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS,
     /** Call IntNetR0IfSetPromiscuousMode(). */
     VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE,

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

@@ -85 +85 @@
      * Can (in theory at least) be NULL. */
     R3PTRTYPE(PPDMINETWORKCONFIG)   pIAboveConfigR3;
-    /** Pointer to the driver instance. */
+    /** Pointer to the driver instance (ring-3). */
     PPDMDRVINSR3                    pDrvInsR3;
-    /** Pointer to the communication buffer. */
+    /** Pointer to the communication buffer (ring-3). */
     R3PTRTYPE(PINTNETBUF)           pBufR3;
     /** Ring-3 base interface for the ring-0 context. */
@@ -97 +97 @@
     /** The network interface for the ring-0 context. */
     PDMINETWORKUPR0                 INetworkUpR0;
-    /** Pointer to the driver instance. */
+    /** Pointer to the driver instance (ring-0). */
     PPDMDRVINSR0                    pDrvInsR0;
-    RTR0PTR                         R0PtrAlignment;
+    /** Pointer to the communication buffer (ring-0). */
+    R0PTRTYPE(PINTNETBUF)           pBufR0;
 
     /** The network interface for the raw-mode context. */
@@ -132 +133 @@
     /** Set if the transmit thread the one busy transmitting. */
     bool volatile                   fXmitOnXmitThread;
+    /** The xmit thread should process the ring ASAP. */
+    bool                            fXmitProcessRing;
     /** Set if data transmission should start immediately and deactivate
      * as late as possible. */
     bool                            fActivateEarlyDeactivateLate;
     /** Padding. */
-    bool                            afReserved[HC_ARCH_BITS == 64 ? 4 : 4];
+    bool                            afReserved[HC_ARCH_BITS == 64 ? 3 : 3];
+    /** Scratch space for holding the ring-0 scatter / gather descriptor.
+     * The PDMSCATTERGATHER::fFlags member is used to indicate whether it is in
+     * use or not.  Always accessed while owning the XmitLock. */
+    union
+    {
+        PDMSCATTERGATHER            Sg;
+        uint8_t                     padding[8 * sizeof(RTUINTPTR)];
+    }                               u;
     /** The network name. */
     char                            szNetwork[INTNET_MAX_NETWORK_NAME];
@@ -144 +155 @@
     /** Number of GSO packets recevied. */
     STAMCOUNTER                     StatReceivedGso;
+    /** Number of packets send from ring-0. */
+    STAMCOUNTER                     StatSentR0;
 #ifdef VBOX_WITH_STATISTICS
     /** Profiling packet transmit runs. */
@@ -149 +162 @@
     /** Profiling packet receive runs. */
     STAMPROFILEADV                  StatReceive;
+    /** The number of times we've had to wake up the xmit thread to contine the
+     *  ring-0 job. */
+    STAMCOUNTER                     StatXmitWakeupR0;
+    /** The number of times we've had to wake up the xmit thread to contine the
+     *  ring-3 job. */
+    STAMCOUNTER                     StatXmitWakeupR3;
+    /** The times the xmit thread has been told to process the ring. */
+    STAMCOUNTER                     StatXmitProcessRing;
 #endif /* VBOX_WITH_STATISTICS */
 #ifdef LOG_ENABLED
@@ -225 +246 @@
 
 /**
+ * Helper for signalling the xmit thread.
+ *
+ * @returns VERR_TRY_AGAIN (convenience).
+ * @param   pThis               The instance data..
+ */
+DECLINLINE(int) drvIntNetSignalXmit(PDRVINTNET pThis)
+{
+    /// @todo if (!ASMAtomicXchgBool(&pThis->fXmitSignalled, true)) - needs careful optimizing.
+    {
+        int rc = SUPSemEventSignal(pThis->pSupDrvSession, pThis->hXmitEvt);
+        AssertRC(rc);
+        STAM_COUNTER_INC(&pThis->CTX_SUFF(StatXmitWakeup));
+    }
+    return VERR_TRY_AGAIN;
+}
+
+
+/**
+ * Helper for processing the ring-0 consumer side of the xmit ring.
+ *
+ * The caller MUST own the xmit lock.
+ *
+ * @returns Status code from IntNetR0IfSend, except for VERR_TRY_AGAIN.
+ * @param   pThis               The instance data..
+ */
+DECLINLINE(int) drvIntNetProcessXmit(PDRVINTNET pThis)
+{
+    Assert(PDMCritSectIsOwner(&pThis->XmitLock));
+
+#ifdef IN_RING3
+    INTNETIFSENDREQ SendReq;
+    SendReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    SendReq.Hdr.cbReq = sizeof(SendReq);
+    SendReq.pSession = NIL_RTR0PTR;
+    SendReq.hIf = pThis->hIf;
+    int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
+#else
+    int rc = IntNetR0IfSend(pThis->hIf, pThis->pSupDrvSession);
+    if (rc == VERR_TRY_AGAIN)
+    {
+        ASMAtomicUoWriteBool(&pThis->fXmitProcessRing, true);
+        drvIntNetSignalXmit(pThis);
+        rc = VINF_SUCCESS;
+    }
+#endif
+    return rc;
+}
+
+
+
+/**
  * @interface_method_impl{PDMINETWORKUP,pfnBeginXmit}
  */
@@ -230 +302 @@
 {
     PDRVINTNET pThis = RT_FROM_MEMBER(pInterface, DRVINTNET, CTX_SUFF(INetworkUp));
-#if !defined(IN_RING3)
-    int rc = VERR_SEM_BUSY;
+#ifndef IN_RING3
     Assert(!fOnWorkerThread);
-#elif 1
+#endif
+
     int rc = PDMCritSectTryEnter(&pThis->XmitLock);
-#else
-    int rc = fOnWorkerThread ? PDMCritSectTryEnter(&pThis->XmitLock) : VERR_SEM_BUSY;
-#endif
     if (RT_SUCCESS(rc))
     {
@@ -249 +318 @@
     {
         /** @todo Does this actually make sense if the other dude is an EMT and so
-         *        forth?  I seriously think this is ring-0 only... */
+         *        forth?  I seriously think this is ring-0 only...
+         * We might end up waking up the xmit thread unnecessarily here, even when in
+         * ring-0... This needs some more thought and opitmizations when the ring-0 bits
+         * are working. */
+#ifdef IN_RING3
         if (    !fOnWorkerThread
             /*&&  !ASMAtomicUoReadBool(&pThis->fXmitOnXmitThread)
@@ -258 +331 @@
         }
         rc = VERR_TRY_AGAIN;
+#else  /* IN_RING0 */
+        rc = drvIntNetSignalXmit(pThis);
+#endif /* IN_RING0 */
     }
     return rc;
@@ -274 +350 @@
     Assert(PDMCritSectIsOwner(&pThis->XmitLock));
 
+    /*
+     * Allocate a S/G descriptor.
+     * This shouldn't normally fail as the NICs usually won't allocate more
+     * than one buffer at a time and the SG gets freed on sending.
+     */
 #ifdef IN_RING3
-    /*
-     * Allocate a S/G buffer.
-     */
     PPDMSCATTERGATHER pSgBuf = (PPDMSCATTERGATHER)RTMemCacheAlloc(pThis->hSgCache);
-    if (pSgBuf)
-    {
-        PINTNETHDR pHdr;
+    if (!pSgBuf)
+        return VERR_NO_MEMORY;
+#else
+    PPDMSCATTERGATHER pSgBuf = &pThis->u.Sg;
+    if (RT_UNLIKELY(pSgBuf->fFlags != 0))
+        return drvIntNetSignalXmit(pThis);
+#endif
+
+    /*
+     * Allocate room in the ring buffer.
+     *
+     * In ring-3 we may have to process the xmit ring before there is
+     * sufficient buffer space since we might've stacked up a few frames to the
+     * trunk while in ring-0.  (There is not point of doing this in ring-0.)
+     */
+    PINTNETHDR pHdr;
+    if (pGso)
+        rc = INTNETRingAllocateGsoFrame(&pThis->CTX_SUFF(pBuf)->Send, (uint32_t)cbMin, pGso,
+                                        &pHdr, &pSgBuf->aSegs[0].pvSeg);
+    else
+        rc = INTNETRingAllocateFrame(&pThis->CTX_SUFF(pBuf)->Send, (uint32_t)cbMin,
+                                     &pHdr, &pSgBuf->aSegs[0].pvSeg);
+#ifdef IN_RING3
+    if (    RT_FAILURE(rc)
+        &&  pThis->CTX_SUFF(pBuf)->cbSend >= cbMin * 2 + sizeof(INTNETHDR))
+    {
+        drvIntNetProcessXmit(pThis);
         if (pGso)
-            rc = INTNETRingAllocateGsoFrame(&pThis->pBufR3->Send, (uint32_t)cbMin, pGso,
+            rc = INTNETRingAllocateGsoFrame(&pThis->CTX_SUFF(pBuf)->Send, (uint32_t)cbMin, pGso,
                                             &pHdr, &pSgBuf->aSegs[0].pvSeg);
         else
-            rc = INTNETRingAllocateFrame(&pThis->pBufR3->Send, (uint32_t)cbMin,
+            rc = INTNETRingAllocateFrame(&pThis->CTX_SUFF(pBuf)->Send, (uint32_t)cbMin,
                                          &pHdr, &pSgBuf->aSegs[0].pvSeg);
-
-#if 1 /** @todo implement VERR_TRY_AGAIN once this moves to EMT?  -- Not needed unless we make the consumer side (ring-0) asynchronous.  */
-        if (    RT_FAILURE(rc)
-            &&  pThis->pBufR3->cbSend >= cbMin * 2 + sizeof(INTNETHDR))
-        {
-            INTNETIFSENDREQ SendReq;
-            SendReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-            SendReq.Hdr.cbReq = sizeof(SendReq);
-            SendReq.pSession = NIL_RTR0PTR;
-            SendReq.hIf = pThis->hIf;
-            PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
-
-            if (pGso)
-                rc = INTNETRingAllocateGsoFrame(&pThis->pBufR3->Send, (uint32_t)cbMin, pGso,
-                                                &pHdr, &pSgBuf->aSegs[0].pvSeg);
-            else
-                rc = INTNETRingAllocateFrame(&pThis->pBufR3->Send, (uint32_t)cbMin,
-                                             &pHdr, &pSgBuf->aSegs[0].pvSeg);
-        }
+    }
 #endif
-        if (RT_SUCCESS(rc))
-        {
-            pSgBuf->fFlags          = PDMSCATTERGATHER_FLAGS_MAGIC | PDMSCATTERGATHER_FLAGS_OWNER_1;
-            pSgBuf->cbUsed          = 0;
-            pSgBuf->cbAvailable     = cbMin;
-            pSgBuf->pvAllocator     = pHdr;
-            pSgBuf->pvUser          = pGso ? (PPDMNETWORKGSO)pSgBuf->aSegs[0].pvSeg - 1 : NULL;
-            pSgBuf->cSegs           = 1;
-            pSgBuf->aSegs[0].cbSeg  = cbMin;
-
-            *ppSgBuf = pSgBuf;
-            return VINF_SUCCESS;
-        }
-
+    if (RT_SUCCESS(rc))
+    {
         /*
-         * Arm the try again stuff.
+         * Set up the S/G descriptor and return successfully.
          */
-/** @todo        if (pThis->pBufR3->cbSend >= cbMin * 2 + sizeof(INTNETHDR))
-            rc = VERR_TRY_AGAIN;
-        else */
-            rc = VERR_NO_MEMORY;
-
-        RTMemCacheFree(pThis->hSgCache, pSgBuf);
+        pSgBuf->fFlags          = PDMSCATTERGATHER_FLAGS_MAGIC | PDMSCATTERGATHER_FLAGS_OWNER_1;
+        pSgBuf->cbUsed          = 0;
+        pSgBuf->cbAvailable     = cbMin;
+        pSgBuf->pvAllocator     = pHdr;
+        pSgBuf->pvUser          = pGso ? (PPDMNETWORKGSO)pSgBuf->aSegs[0].pvSeg - 1 : NULL;
+        pSgBuf->cSegs           = 1;
+        pSgBuf->aSegs[0].cbSeg  = cbMin;
+
+        *ppSgBuf = pSgBuf;
+        return VINF_SUCCESS;
+    }
+
+#ifdef IN_RING3
+    /*
+     * If the above fails, then we're really out of space.  There are nobody
+     * competing with us here because of the xmit lock.
+     */
+    rc = VERR_NO_MEMORY;
+    RTMemCacheFree(pThis->hSgCache, pSgBuf);
+
+#else  /* IN_RING0 */
+    /*
+     * If the request is reasonable, kick the xmit thread and tell it to
+     * process the xmit ring ASAP.
+     */
+    if (pThis->CTX_SUFF(pBuf)->cbSend >= cbMin * 2 + sizeof(INTNETHDR))
+    {
+        pThis->fXmitProcessRing = true;
+        rc = drvIntNetSignalXmit(pThis);
     }
     else
         rc = VERR_NO_MEMORY;
-    /** @todo implement VERR_TRY_AGAIN  */
+    pSgBuf->fFlags = 0;
+#endif /* IN_RING0 */
     return rc;
-
-#else   /* !IN_RING3 */
-    rc = VERR_TRY_AGAIN;
-    return rc;
-#endif  /* !IN_RING3 */
 }
 
@@ -351 +442 @@
     PDRVINTNET  pThis = RT_FROM_MEMBER(pInterface, DRVINTNET, CTX_SUFF(INetworkUp));
     PINTNETHDR  pHdr  = (PINTNETHDR)pSgBuf->pvAllocator;
+#ifdef IN_RING0
+    Assert(pSgBuf == &pThis->u.Sg);
+#endif
     Assert(pSgBuf->fFlags == (PDMSCATTERGATHER_FLAGS_MAGIC | PDMSCATTERGATHER_FLAGS_OWNER_1));
     Assert(pSgBuf->cbUsed <= pSgBuf->cbAvailable);
@@ -357 +451 @@
     Assert(PDMCritSectIsOwner(&pThis->XmitLock));
 
-#ifdef IN_RING3
     /** @todo LATER: try unalloc the frame. */
     pHdr->u16Type = INTNETHDR_TYPE_PADDING;
-    INTNETRingCommitFrame(&pThis->pBufR3->Send, pHdr);
-
+    INTNETRingCommitFrame(&pThis->CTX_SUFF(pBuf)->Send, pHdr);
+
+#ifdef IN_RING3
     RTMemCacheFree(pThis->hSgCache, pSgBuf);
+#else
+    pSgBuf->fFlags = 0;
+#endif
     return VINF_SUCCESS;
-#else
-    return VERR_INTERNAL_ERROR_5;
-#endif
 }
 
@@ -386 +480 @@
         STAM_COUNTER_INC(&pThis->StatSentGso);
 
+    /*
+     * Commit the frame and push it thru the switch.
+     */
+    PINTNETHDR pHdr = (PINTNETHDR)pSgBuf->pvAllocator;
+    INTNETRingCommitFrameEx(&pThis->CTX_SUFF(pBuf)->Send, pHdr, pSgBuf->cbUsed);
+    int rc = drvIntNetProcessXmit(pThis);
+    STAM_PROFILE_STOP(&pThis->StatTransmit, a);
+
+    /*
+     * Free the descriptor and return.
+     */
 #ifdef IN_RING3
-    /*
-     * Commit the frame and push it thru the switch.
-     */
-    PINTNETHDR pHdr = (PINTNETHDR)pSgBuf->pvAllocator;
-    INTNETRingCommitFrameEx(&pThis->pBufR3->Send, pHdr, pSgBuf->cbUsed);
-
-    INTNETIFSENDREQ SendReq;
-    SendReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    SendReq.Hdr.cbReq = sizeof(SendReq);
-    SendReq.pSession = NIL_RTR0PTR;
-    SendReq.hIf = pThis->hIf;
-    PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SEND, &SendReq, sizeof(SendReq));
-
     RTMemCacheFree(pThis->hSgCache, pSgBuf);
-
-    STAM_PROFILE_STOP(&pThis->StatTransmit, a);
-    return VINF_SUCCESS;
 #else
-    return VERR_INTERNAL_ERROR_4;
+    STAM_REL_COUNTER_INC(&pThis->StatSentR0);
+    pSgBuf->fFlags = 0;
 #endif
+    return rc;
 }
 
@@ -427 +518 @@
 {
     PDRVINTNET pThis = RT_FROM_MEMBER(pInterface, DRVINTNET, CTX_SUFF(INetworkUp));
+
 #ifdef IN_RING3
     INTNETIFSETPROMISCUOUSMODEREQ Req;
@@ -435 +527 @@
     Req.fPromiscuous    = fPromiscuous;
     int rc = PDMDrvHlpSUPCallVMMR0Ex(pThis->pDrvInsR3, VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE, &Req, sizeof(Req));
+#else  /* IN_RING0 */
+    int rc = IntNetR0IfSetPromiscuousMode(pThis->hIf, pThis->pSupDrvSession, fPromiscuous);
+#endif /* IN_RING0 */
+
     LogFlow(("drvIntNetUp_SetPromiscuousMode: fPromiscuous=%RTbool\n", fPromiscuous));
     AssertRC(rc);
-#else
-    /** @todo  */
-    AssertFailed();
-#endif
 }
 
@@ -485 +577 @@
     {
         /*
+         * Transmit any pending packets.
+         */
+        /** @todo Optimize this. We shouldn't call pfnXmitPending unless asked for.
+         *        Also there is no need to call drvIntNetProcessXmit if we also
+         *        called pfnXmitPending and send one or more frames. */
+        if (ASMAtomicXchgBool(&pThis->fXmitProcessRing, false))
+        {
+            STAM_COUNTER_INC(&pThis->StatXmitProcessRing);
+            PDMCritSectEnter(&pThis->XmitLock, VERR_IGNORED);
+            drvIntNetProcessXmit(pThis);
+            PDMCritSectLeave(&pThis->XmitLock);
+        }
+
+        pThis->pIAboveNet->pfnXmitPending(pThis->pIAboveNet);
+
+        if (ASMAtomicXchgBool(&pThis->fXmitProcessRing, false))
+        {
+            STAM_COUNTER_INC(&pThis->StatXmitProcessRing);
+            PDMCritSectEnter(&pThis->XmitLock, VERR_IGNORED);
+            drvIntNetProcessXmit(pThis);
+            PDMCritSectLeave(&pThis->XmitLock);
+        }
+
+        /*
          * Block until we've got something to send or is supposed
          * to leave the running state.
@@ -493 +609 @@
             break;
 
-        /*
-         * Transmit any pending packets.
-         */
-        pThis->pIAboveNet->pfnXmitPending(pThis->pIAboveNet);
    }
 
@@ -551 +663 @@
      */
     STAM_PROFILE_ADV_START(&pThis->StatReceive, a);
-    PINTNETBUF      pBuf     = pThis->pBufR3;
+    PINTNETBUF      pBuf     = pThis->CTX_SUFF(pBuf);
     PINTNETRINGBUF  pRingBuf = &pBuf->Recv;
     for (;;)
@@ -1404 +1516 @@
      * Get default buffer.
      */
-    INTNETIFGETRING3BUFFERREQ GetRing3BufferReq;
-    GetRing3BufferReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    GetRing3BufferReq.Hdr.cbReq = sizeof(GetRing3BufferReq);
-    GetRing3BufferReq.pSession = NIL_RTR0PTR;
-    GetRing3BufferReq.hIf = pThis->hIf;
-    GetRing3BufferReq.pRing3Buf = NULL;
-    rc = PDMDrvHlpSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_GET_RING3_BUFFER, &GetRing3BufferReq, sizeof(GetRing3BufferReq));
+    INTNETIFGETBUFFERPTRSREQ GetBufferPtrsReq;
+    GetBufferPtrsReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    GetBufferPtrsReq.Hdr.cbReq = sizeof(GetBufferPtrsReq);
+    GetBufferPtrsReq.pSession = NIL_RTR0PTR;
+    GetBufferPtrsReq.hIf = pThis->hIf;
+    GetBufferPtrsReq.pRing3Buf = NULL;
+    GetBufferPtrsReq.pRing0Buf = NULL;
+    rc = PDMDrvHlpSUPCallVMMR0Ex(pDrvIns, VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS, &GetBufferPtrsReq, sizeof(GetBufferPtrsReq));
     if (RT_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);
-    AssertRelease(VALID_PTR(GetRing3BufferReq.pRing3Buf));
-    pThis->pBufR3 = GetRing3BufferReq.pRing3Buf;
+    AssertRelease(VALID_PTR(GetBufferPtrsReq.pRing3Buf));
+    pThis->pBufR3 = GetBufferPtrsReq.pRing3Buf;
+    pThis->pBufR0 = GetBufferPtrsReq.pRing0Buf;
 
     /*
@@ -1428 +1542 @@
     PDMDrvHlpSTAMRegCounter(pDrvIns, &pThis->StatReceivedGso,            "Packets/Received-Gso", STAMUNIT_COUNT, "The GSO portion of the received packets.");
     PDMDrvHlpSTAMRegCounter(pDrvIns, &pThis->StatSentGso,                "Packets/Sent-Gso",     STAMUNIT_COUNT, "The GSO portion of the sent packets.");
+    PDMDrvHlpSTAMRegCounter(pDrvIns, &pThis->StatSentR0,                 "Packets/Sent-R0",      STAMUNIT_COUNT, "The ring-0 portion of the sent packets.");
 
     PDMDrvHlpSTAMRegCounter(pDrvIns, &pThis->pBufR3->cStatLost,          "Packets/Lost",         STAMUNIT_COUNT, "Number of lost packets.");
@@ -1436 +1551 @@
     PDMDrvHlpSTAMRegProfileAdv(pDrvIns, &pThis->StatReceive,             "Receive",     STAMUNIT_TICKS_PER_CALL, "Profiling packet receive runs.");
     PDMDrvHlpSTAMRegProfile(pDrvIns, &pThis->StatTransmit,               "Transmit",    STAMUNIT_TICKS_PER_CALL, "Profiling packet transmit runs.");
+    PDMDrvHlpSTAMRegCounter(pDrvIns, &pThis->StatXmitWakeupR0,           "XmitWakeup-R0",        STAMUNIT_COUNT, "Xmit thread wakeups from ring-0.");
+    PDMDrvHlpSTAMRegCounter(pDrvIns, &pThis->StatXmitWakeupR3,           "XmitWakeup-R3",        STAMUNIT_COUNT, "Xmit thread wakeups from ring-3.");
+    PDMDrvHlpSTAMRegCounter(pDrvIns, &pThis->StatXmitProcessRing,        "XmitProcessRing",      STAMUNIT_COUNT, "Time xmit thread was told to process the ring.");
 #endif
 

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

@@ -3370 +3370 @@
  * @param   hIf             The interface handle.
  * @param   pSession        The caller's session.
- * @param   ppRing3Buf      Where to store the address of the ring-3 mapping.
- */
-INTNETR0DECL(int) IntNetR0IfGetRing3Buffer(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, R3PTRTYPE(PINTNETBUF) *ppRing3Buf)
-{
-    LogFlow(("IntNetR0IfGetRing3Buffer: hIf=%RX32 ppRing3Buf=%p\n", hIf, ppRing3Buf));
+ * @param   ppRing3Buf      Where to store the address of the ring-3 mapping
+ *                          (optional).
+ * @param   ppRing0Buf      Where to store the address of the ring-0 mapping
+ *                          (optional).
+ */
+INTNETR0DECL(int)       IntNetR0IfGetBufferPtrs(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession,
+                                                R3PTRTYPE(PINTNETBUF) *ppRing3Buf, R0PTRTYPE(PINTNETBUF) *ppRing0Buf)
+{
+    LogFlow(("IntNetR0IfGetBufferPtrs: hIf=%RX32 ppRing3Buf=%p ppRing0Buf=%p\n", hIf, ppRing3Buf, ppRing0Buf));
 
     /*
@@ -3383 +3387 @@
     AssertReturn(pIntNet->u32Magic, VERR_INVALID_MAGIC);
 
-    AssertPtrReturn(ppRing3Buf, VERR_INVALID_PARAMETER);
-    *ppRing3Buf = 0;
+    AssertPtrNullReturn(ppRing3Buf, VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(ppRing0Buf, VERR_INVALID_PARAMETER);
+    if (ppRing3Buf)
+        *ppRing3Buf = 0;
+    if (ppRing0Buf)
+        *ppRing0Buf = 0;
+
     PINTNETIF pIf = (PINTNETIF)RTHandleTableLookupWithCtx(pIntNet->hHtIfs, hIf, pSession);
     if (!pIf)
@@ -3397 +3406 @@
     if (RT_SUCCESS(rc))
     {
-        *ppRing3Buf = pIf->pIntBufR3;
+        if (ppRing3Buf)
+            *ppRing3Buf = pIf->pIntBufR3;
+        if (ppRing0Buf)
+            *ppRing0Buf = (R0PTRTYPE(PINTNETBUF))pIf->pIntBuf; /* tstIntNetR0 mess */
 
         rc = RTSemMutexRelease(pIntNet->hMtxCreateOpenDestroy);
@@ -3403 +3415 @@
 
     intnetR0IfRelease(pIf, pSession);
-    LogFlow(("IntNetR0IfGetRing3Buffer: returns %Rrc *ppRing3Buf=%p\n", rc, *ppRing3Buf));
+    LogFlow(("IntNetR0IfGetBufferPtrs: returns %Rrc *ppRing3Buf=%p *ppRing0Buf=%p\n",
+             rc, ppRing3Buf ? *ppRing3Buf : NULL, ppRing0Buf ? *ppRing0Buf : NULL));
     return rc;
 }
@@ -3409 +3422 @@
 
 /**
- * VMMR0 request wrapper for IntNetR0IfGetRing3Buffer.
+ * VMMR0 request wrapper for IntNetR0IfGetBufferPtrs.
  *
  * @returns see IntNetR0IfGetRing3Buffer.
@@ -3415 +3428 @@
  * @param   pReq            The request packet.
  */
-INTNETR0DECL(int) IntNetR0IfGetRing3BufferReq(PSUPDRVSESSION pSession, PINTNETIFGETRING3BUFFERREQ pReq)
+INTNETR0DECL(int) IntNetR0IfGetBufferPtrsReq(PSUPDRVSESSION pSession, PINTNETIFGETBUFFERPTRSREQ pReq)
 {
     if (RT_UNLIKELY(pReq->Hdr.cbReq != sizeof(*pReq)))
         return VERR_INVALID_PARAMETER;
-    return IntNetR0IfGetRing3Buffer(pReq->hIf, pSession, &pReq->pRing3Buf);
-}
-
-
-/**
- * Gets the ring-0 address of the current buffer.
- *
- * @returns VBox status code.
- * @param   hIf             The interface handle.
- * @param   pSession        The caller's session.
- * @param   ppRing0Buf      Where to store the address of the ring-3 mapping.
- */
-INTNETR0DECL(int) IntNetR0IfGetRing0Buffer(INTNETIFHANDLE hIf, PSUPDRVSESSION pSession, PINTNETBUF *ppRing0Buf)
-{
-    LogFlow(("IntNetR0IfGetRing0Buffer: hIf=%RX32 ppRing0Buf=%p\n", hIf, ppRing0Buf));
-
-    /*
-     * Validate input.
-     */
-    PINTNET pIntNet = g_pIntNet;
-    AssertPtrReturn(pIntNet, VERR_INVALID_PARAMETER);
-    AssertReturn(pIntNet->u32Magic, VERR_INVALID_MAGIC);
-
-    AssertPtrReturn(ppRing0Buf, VERR_INVALID_PARAMETER);
-    *ppRing0Buf = NULL;
-    PINTNETIF pIf = (PINTNETIF)RTHandleTableLookupWithCtx(pIntNet->hHtIfs, hIf, pSession);
-    if (!pIf)
-        return VERR_INVALID_HANDLE;
-
-    /*
-     * Grab the lock and get the data.
-     * ASSUMES that the handle isn't closed while we're here.
-     */
-    int rc = RTSemMutexRequest(pIntNet->hMtxCreateOpenDestroy, RT_INDEFINITE_WAIT);
-    if (RT_SUCCESS(rc))
-    {
-        *ppRing0Buf = pIf->pIntBuf;
-
-        rc = RTSemMutexRelease(pIntNet->hMtxCreateOpenDestroy);
-    }
-    intnetR0IfRelease(pIf, pSession);
-    LogFlow(("IntNetR0IfGetRing0Buffer: returns %Rrc *ppRing0Buf=%p\n", rc, *ppRing0Buf));
-    return rc;
+    return IntNetR0IfGetBufferPtrs(pReq->hIf, pSession, &pReq->pRing3Buf, &pReq->pRing0Buf);
 }
 

trunk/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp

@@ -821 +821 @@
          * Get the ring-3 address of the shared interface buffer.
          */
-        INTNETIFGETRING3BUFFERREQ GetRing3BufferReq;
-        GetRing3BufferReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-        GetRing3BufferReq.Hdr.cbReq = sizeof(GetRing3BufferReq);
-        GetRing3BufferReq.pSession = pSession;
-        GetRing3BufferReq.hIf = OpenReq.hIf;
-        GetRing3BufferReq.pRing3Buf = NULL;
-        rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_GET_RING3_BUFFER, 0, &GetRing3BufferReq.Hdr);
+        INTNETIFGETBUFFERPTRSREQ GetBufferPtrsReq;
+        GetBufferPtrsReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+        GetBufferPtrsReq.Hdr.cbReq = sizeof(GetBufferPtrsReq);
+        GetBufferPtrsReq.pSession = pSession;
+        GetBufferPtrsReq.hIf = OpenReq.hIf;
+        GetBufferPtrsReq.pRing3Buf = NULL;
+        GetBufferPtrsReq.pRing0Buf = NULL;
+        rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS, 0, &GetBufferPtrsReq.Hdr);
         if (RT_SUCCESS(rc))
         {
-            PINTNETBUF pBuf = GetRing3BufferReq.pRing3Buf;
+            PINTNETBUF pBuf = GetBufferPtrsReq.pRing3Buf;
             RTPrintf("tstIntNet-1: pBuf=%p cbBuf=%d cbSend=%d cbRecv=%d\n",
                      pBuf, pBuf->cbBuf, pBuf->cbSend, pBuf->cbRecv);
@@ -913 +914 @@
         else
         {
-            RTPrintf("tstIntNet-1: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_GET_RING3_BUFFER,) failed, rc=%Rrc\n", rc);
+            RTPrintf("tstIntNet-1: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS,) failed, rc=%Rrc\n", rc);
             g_cErrors++;
         }

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

@@ -410 +410 @@
                                          0/*fFlags*/, cbSend, cbRecv, &pThis->hIf0), rcCheck);
     RTTESTI_CHECK_RET(pThis->hIf0 != INTNET_HANDLE_INVALID, VERR_INTERNAL_ERROR);
-    RTTESTI_CHECK_RC_RET(IntNetR0IfGetRing0Buffer(pThis->hIf0, g_pSession, &pThis->pBuf0), VINF_SUCCESS, rcCheck);
+    RTTESTI_CHECK_RC_RET(IntNetR0IfGetBufferPtrs(pThis->hIf0, g_pSession, &pThis->pBuf0, NULL), VINF_SUCCESS, rcCheck);
     RTTESTI_CHECK_RET(pThis->pBuf0, VERR_INTERNAL_ERROR);
 
@@ -418 +418 @@
                                          0/*fFlags*/, cbSend, cbRecv, &pThis->hIf1), rcCheck);
     RTTESTI_CHECK_RET(pThis->hIf1 != INTNET_HANDLE_INVALID, VERR_INTERNAL_ERROR);
-    RTTESTI_CHECK_RC_RET(IntNetR0IfGetRing0Buffer(pThis->hIf1, g_pSession, &pThis->pBuf1), VINF_SUCCESS, rcCheck);
+    RTTESTI_CHECK_RC_RET(IntNetR0IfGetBufferPtrs(pThis->hIf1, g_pSession, &pThis->pBuf1, NULL), VINF_SUCCESS, rcCheck);
     RTTESTI_CHECK_RET(pThis->pBuf1, VERR_INTERNAL_ERROR);
 

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -912 +912 @@
          * Get the ring-3 address of the shared interface buffer.
          */
-        INTNETIFGETRING3BUFFERREQ GetRing3BufferReq;
-        GetRing3BufferReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-        GetRing3BufferReq.Hdr.cbReq = sizeof(GetRing3BufferReq);
-        GetRing3BufferReq.pSession = m_pSession;
-        GetRing3BufferReq.hIf = m_hIf;
-        GetRing3BufferReq.pRing3Buf = NULL;
-        rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_GET_RING3_BUFFER, 0, &GetRing3BufferReq.Hdr);
+        INTNETIFGETBUFFERPTRSREQ GetBufferPtrsReq;
+        GetBufferPtrsReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+        GetBufferPtrsReq.Hdr.cbReq = sizeof(GetBufferPtrsReq);
+        GetBufferPtrsReq.pSession = m_pSession;
+        GetBufferPtrsReq.hIf = m_hIf;
+        GetBufferPtrsReq.pRing3Buf = NULL;
+        GetBufferPtrsReq.pRing0Buf = NULL;
+        rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS, 0, &GetBufferPtrsReq.Hdr);
         if (RT_SUCCESS(rc))
         {
-            PINTNETBUF pBuf = GetRing3BufferReq.pRing3Buf;
+            PINTNETBUF pBuf = GetBufferPtrsReq.pRing3Buf;
             debugPrint(1, false, "pBuf=%p cbBuf=%d cbSend=%d cbRecv=%d",
                        pBuf, pBuf->cbBuf, pBuf->cbSend, pBuf->cbRecv);
@@ -943 +944 @@
         }
         else
-            RTStrmPrintf(g_pStdErr, "VBoxNetDHCP: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_GET_RING3_BUFFER,) failed, rc=%Rrc\n", rc);
+            RTStrmPrintf(g_pStdErr, "VBoxNetDHCP: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS,) failed, rc=%Rrc\n", rc);
     }
     else

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

@@ -264 +264 @@
      * Get the ring-3 address of the shared interface buffer.
      */
-    INTNETIFGETRING3BUFFERREQ GetRing3BufferReq;
-    GetRing3BufferReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    GetRing3BufferReq.Hdr.cbReq = sizeof(GetRing3BufferReq);
-    GetRing3BufferReq.pSession = m_pSession;
-    GetRing3BufferReq.hIf = m_hIf;
-    GetRing3BufferReq.pRing3Buf = NULL;
-    rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_GET_RING3_BUFFER, 0, &GetRing3BufferReq.Hdr);
-    if (RT_FAILURE(rc))
-    {
-        Log2(("VBoxNetBaseService: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_GET_RING3_BUFFER,) failed, rc=%Rrc\n", rc));
+    GetRing3BufferReq GetBufferPtrsReq;
+    GetBufferPtrsReq.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    GetBufferPtrsReq.Hdr.cbReq = sizeof(GetBufferPtrsReq);
+    GetBufferPtrsReq.pSession = m_pSession;
+    GetBufferPtrsReq.hIf = m_hIf;
+    GetBufferPtrsReq.pRing3Buf = NULL;
+    GetBufferPtrsReq.pRing0Buf = NULL;
+    rc = SUPR3CallVMMR0Ex(NIL_RTR0PTR, NIL_VMCPUID, VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS, 0, &GetBufferPtrsReq.Hdr);
+    if (RT_FAILURE(rc))
+    {
+        Log2(("VBoxNetBaseService: SUPR3CallVMMR0Ex(,VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS,) failed, rc=%Rrc\n", rc));
         goto bad;
     }
-    pBuf = GetRing3BufferReq.pRing3Buf;
+    pBuf = GetBufferPtrsReq.pRing3Buf;
     Log2(("pBuf=%p cbBuf=%d cbSend=%d cbRecv=%d\n",
                pBuf, pBuf->cbBuf, pBuf->cbSend, pBuf->cbRecv));

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

@@ -999 +999 @@
             return IntNetR0IfCloseReq(pSession, (PINTNETIFCLOSEREQ)pReqHdr);
 
-        case VMMR0_DO_INTNET_IF_GET_RING3_BUFFER:
-            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFGETRING3BUFFERREQ)pReqHdr)->pSession, pSession) || idCpu != NIL_VMCPUID)
-                return VERR_INVALID_PARAMETER;
-            return IntNetR0IfGetRing3BufferReq(pSession, (PINTNETIFGETRING3BUFFERREQ)pReqHdr);
+        case VMMR0_DO_INTNET_IF_GET_BUFFER_PTRS:
+            if (u64Arg || !pReqHdr || !vmmR0IsValidSession(pVM, ((PINTNETIFGETBUFFERPTRSREQ)pReqHdr)->pSession, pSession) || idCpu != NIL_VMCPUID)
+                return VERR_INVALID_PARAMETER;
+            return IntNetR0IfGetBufferPtrsReq(pSession, (PINTNETIFGETBUFFERPTRSREQ)pReqHdr);
 
         case VMMR0_DO_INTNET_IF_SET_PROMISCUOUS_MODE:

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

@@ -67 +67 @@
     VMSetErrorV
 
+    ; Internal Networking
+    IntNetR0Open
+    IntNetR0IfClose
+    IntNetR0IfGetRing0Buffer
+    IntNetR0IfGetRing3Buffer
+    IntNetR0IfSetPromiscuousMode
+    IntNetR0IfSetMacAddress
+    IntNetR0IfSetActive
+    IntNetR0IfSend
+    IntNetR0IfWait
+
     ; runtime
     RTAssertMsg1Weak