Changeset 42062 in vbox

Timestamp:

Jul 9, 2012 3:10:00 PM (13 years ago)

Author:

vboxsync

Message:

NetShaper: R0 support (#5582)

Location:

trunk

Files:

• include/VBox/vmm/pdmnetshaper.h (modified) (3 diffs)
• include/VBox/vmm/pdmnetshaperint.h (added)
• src/VBox/Devices/Makefile.kmk (modified) (1 diff)
• src/VBox/Devices/Network/DrvNetShaper.cpp (modified) (29 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• src/VBox/VMM/VMMR0/PDMNetShaperR0.cpp (added)
• src/VBox/VMM/VMMR3/PDMNetShaper.cpp (modified) (15 diffs)

trunk/include/VBox/vmm/pdmnetshaper.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2011-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -42 +42 @@
 {
     /** [R3] Pointer to the next group in the list. */
-    struct PDMNSFILTER      *pNext;
+    struct PDMNSFILTER              *pNext;
     /** [R3] Pointer to the bandwidth group. */
-    struct PDMNSBWGROUP     *pBwGroupR3;
+    struct PDMNSBWGROUP             *pBwGroupR3;
+    /** [R0] Pointer to the bandwidth group. */
+    R0PTRTYPE(struct PDMNSBWGROUP *) pBwGroupR0;
     /** Becomes true when filter fails to obtain bandwidth. */
-    bool                     fChoked;
-    /** The driver this filter is aggregated into. */
-    PPDMINETWORKDOWN         pIDrvNet;
+    bool                             fChoked;
+    /** [R3] The driver this filter is aggregated into. */
+    PPDMINETWORKDOWN                 pIDrvNet;
 } PDMNSFILTER;
 
@@ -61 +63 @@
 typedef struct PDMNETSHAPER *PPDMNETSHAPER;
 
+
+/**
+ * Obtain bandwidth in a bandwidth group (R0 version).
+ *
+ * @returns VBox status code.
+ * @param   pFilter         Pointer to the filter that allocates bandwidth.
+ * @param   cbTransfer      Number of bytes to allocate.
+ */
+VMMR0DECL(bool) PDMR0NsAllocateBandwidth(PPDMNSFILTER pFilter, uint32_t cbTransfer);
 
 /**

trunk/src/VBox/Devices/Makefile.kmk

@@ -973 +973 @@
  endif
 
+ ifdef VBOX_WITH_NETSHAPER
+  VBoxDDR0_DEFS         += VBOX_WITH_NETSHAPER
+  VBoxDDR0_SOURCES      += \
+        Network/DrvNetShaper.cpp
+ endif
+
  ifdef VBOX_WITH_HGSMI
   VBoxDDR0_DEFS         += VBOX_WITH_HGSMI

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2011-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46 +46 @@
 typedef struct DRVNETSHAPER
 {
+    /** Pointer to the driver instance. */
+    PPDMDRVINS              pDrvInsR3;
     /** The network interface. */
-    PDMINETWORKUP           INetworkUp;
+    PDMINETWORKUP           INetworkUpR3;
+    /** The connector that's attached to us. */
+    PPDMINETWORKUP          pIBelowNetR3;
+
+    /** Pointer to the driver instance. */
+    PPDMDRVINSR0            pDrvInsR0;
+    /** The network interface. */
+    PDMINETWORKUPR0         INetworkUpR0;
+    /** The connector that's attached to us. */
+    PPDMINETWORKUPR0        pIBelowNetR0;
+
+    /** Ring-3 base interface for the ring-0 context. */
+    PDMIBASER0              IBaseR0;
+    /** Ring-3 base interface for the raw-mode context. */
+    PDMIBASERC              IBaseRC;
+
+    /** For when we're the leaf driver. */
+    PDMCRITSECT             XmitLock;
+
     /** The network interface. */
     PDMINETWORKDOWN         INetworkDown;
@@ -57 +77 @@
     /** The config port interface we're attached to. */
     PPDMINETWORKCONFIG      pIAboveConfig;
-    /** The connector that's attached to us. */
-    PPDMINETWORKUP          pIBelowNet;
+    /** The filter that represents us at bandwidth group. */
+    PDMNSFILTER             Filter;
     /** The name of bandwidth group we are attached to. */
     char *                  pszBwGroup;
-    /** The filter that represents us at bandwidth group. */
-    PDMNSFILTER             Filter;
-    /** Pointer to the driver instance. */
-    PPDMDRVINS              pDrvIns;
-    /** For when we're the leaf driver. */
-    RTCRITSECT              XmitLock;
 
     /** TX: Total number of bytes to allocate. */
@@ -88 +102 @@
  * @interface_method_impl{PDMINETWORKUP,pfnBeginXmit}
  */
-static DECLCALLBACK(int) drvNetShaperUp_BeginXmit(PPDMINETWORKUP pInterface, bool fOnWorkerThread)
-{
-    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkUp);
-    if (RT_UNLIKELY(!pThis->pIBelowNet))
-    {
-        int rc = RTCritSectTryEnter(&pThis->XmitLock);
+PDMBOTHCBDECL(int) drvNetShaperUp_BeginXmit(PPDMINETWORKUP pInterface, bool fOnWorkerThread)
+{
+    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, CTX_SUFF(INetworkUp));
+    if (RT_UNLIKELY(!pThis->CTX_SUFF(pIBelowNet)))
+    {
+        int rc = PDMCritSectTryEnter(&pThis->XmitLock);
         if (RT_UNLIKELY(rc == VERR_SEM_BUSY))
             rc = VERR_TRY_AGAIN;
         return rc;
     }
-    return pThis->pIBelowNet->pfnBeginXmit(pThis->pIBelowNet, fOnWorkerThread);
+    return pThis->CTX_SUFF(pIBelowNet)->pfnBeginXmit(pThis->CTX_SUFF(pIBelowNet), fOnWorkerThread);
 }
 
@@ -105 +119 @@
  * @interface_method_impl{PDMINETWORKUP,pfnAllocBuf}
  */
-static DECLCALLBACK(int) drvNetShaperUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin,
+PDMBOTHCBDECL(int) drvNetShaperUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin,
                                                   PCPDMNETWORKGSO pGso, PPPDMSCATTERGATHER ppSgBuf)
 {
-    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkUp);
-    if (RT_UNLIKELY(!pThis->pIBelowNet))
+    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, CTX_SUFF(INetworkUp));
+    if (RT_UNLIKELY(!pThis->CTX_SUFF(pIBelowNet)))
         return VERR_NET_DOWN;
     //LogFlow(("drvNetShaperUp_AllocBuf: cb=%d\n", cbMin));
     STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesRequested, cbMin);
     STAM_REL_COUNTER_INC(&pThis->StatXmitPktsRequested);
+#ifdef IN_RING3
     if (!PDMR3NsAllocateBandwidth(&pThis->Filter, cbMin))
     {
@@ -120 +135 @@
         return VERR_TRY_AGAIN;
     }
+#endif
+#ifdef IN_RING0
+    if (!PDMR0NsAllocateBandwidth(&pThis->Filter, cbMin))
+    {
+        STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesDenied, cbMin);
+        STAM_REL_COUNTER_INC(&pThis->StatXmitPktsDenied);
+        return VERR_TRY_AGAIN;
+    }
+#endif
     STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesGranted, cbMin);
     STAM_REL_COUNTER_INC(&pThis->StatXmitPktsGranted);
     //LogFlow(("drvNetShaperUp_AllocBuf: got cb=%d\n", cbMin));
-    return pThis->pIBelowNet->pfnAllocBuf(pThis->pIBelowNet, cbMin, pGso, ppSgBuf);
+    return pThis->CTX_SUFF(pIBelowNet)->pfnAllocBuf(pThis->CTX_SUFF(pIBelowNet), cbMin, pGso, ppSgBuf);
 }
 
@@ -130 +154 @@
  * @interface_method_impl{PDMINETWORKUP,pfnFreeBuf}
  */
-static DECLCALLBACK(int) drvNetShaperUp_FreeBuf(PPDMINETWORKUP pInterface, PPDMSCATTERGATHER pSgBuf)
-{
-    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkUp);
-    if (RT_UNLIKELY(!pThis->pIBelowNet))
+PDMBOTHCBDECL(int) drvNetShaperUp_FreeBuf(PPDMINETWORKUP pInterface, PPDMSCATTERGATHER pSgBuf)
+{
+    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, CTX_SUFF(INetworkUp));
+    if (RT_UNLIKELY(!pThis->CTX_SUFF(pIBelowNet)))
         return VERR_NET_DOWN;
-    return pThis->pIBelowNet->pfnFreeBuf(pThis->pIBelowNet, pSgBuf);
+    return pThis->CTX_SUFF(pIBelowNet)->pfnFreeBuf(pThis->CTX_SUFF(pIBelowNet), pSgBuf);
 }
 
@@ -142 +166 @@
  * @interface_method_impl{PDMINETWORKUP,pfnSendBuf}
  */
-static DECLCALLBACK(int) drvNetShaperUp_SendBuf(PPDMINETWORKUP pInterface, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread)
-{
-    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkUp);
-    if (RT_UNLIKELY(!pThis->pIBelowNet))
+PDMBOTHCBDECL(int) drvNetShaperUp_SendBuf(PPDMINETWORKUP pInterface, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread)
+{
+    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, CTX_SUFF(INetworkUp));
+    if (RT_UNLIKELY(!pThis->CTX_SUFF(pIBelowNet)))
         return VERR_NET_DOWN;
 
-    return pThis->pIBelowNet->pfnSendBuf(pThis->pIBelowNet, pSgBuf, fOnWorkerThread);
+    return pThis->CTX_SUFF(pIBelowNet)->pfnSendBuf(pThis->CTX_SUFF(pIBelowNet), pSgBuf, fOnWorkerThread);
 }
 
@@ -155 +179 @@
  * @interface_method_impl{PDMINETWORKUP,pfnEndXmit}
  */
-static DECLCALLBACK(void) drvNetShaperUp_EndXmit(PPDMINETWORKUP pInterface)
+PDMBOTHCBDECL(void) drvNetShaperUp_EndXmit(PPDMINETWORKUP pInterface)
 {
     //LogFlow(("drvNetShaperUp_EndXmit:\n"));
-    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkUp);
-    if (RT_LIKELY(pThis->pIBelowNet))
-        pThis->pIBelowNet->pfnEndXmit(pThis->pIBelowNet);
+    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, CTX_SUFF(INetworkUp));
+    if (RT_LIKELY(pThis->CTX_SUFF(pIBelowNet)))
+        pThis->CTX_SUFF(pIBelowNet)->pfnEndXmit(pThis->CTX_SUFF(pIBelowNet));
     else
-        RTCritSectLeave(&pThis->XmitLock);
+        PDMCritSectLeave(&pThis->XmitLock);
 }
 
@@ -169 +193 @@
  * @interface_method_impl{PDMINETWORKUP,pfnSetPromiscuousMode}
  */
-static DECLCALLBACK(void) drvNetShaperUp_SetPromiscuousMode(PPDMINETWORKUP pInterface, bool fPromiscuous)
+PDMBOTHCBDECL(void) drvNetShaperUp_SetPromiscuousMode(PPDMINETWORKUP pInterface, bool fPromiscuous)
 {
     LogFlow(("drvNetShaperUp_SetPromiscuousMode: fPromiscuous=%d\n", fPromiscuous));
-    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkUp);
-    if (pThis->pIBelowNet)
-        pThis->pIBelowNet->pfnSetPromiscuousMode(pThis->pIBelowNet, fPromiscuous);
-}
-
-
+    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, CTX_SUFF(INetworkUp));
+    if (pThis->CTX_SUFF(pIBelowNet))
+        pThis->CTX_SUFF(pIBelowNet)->pfnSetPromiscuousMode(pThis->CTX_SUFF(pIBelowNet), fPromiscuous);
+}
+
+
+#ifdef IN_RING3
 /**
  * @interface_method_impl{PDMINETWORKUP,pfnNotifyLinkChanged}
  */
-static DECLCALLBACK(void) drvNetShaperUp_NotifyLinkChanged(PPDMINETWORKUP pInterface, PDMNETWORKLINKSTATE enmLinkState)
+static DECLCALLBACK(void) drvR3NetShaperUp_NotifyLinkChanged(PPDMINETWORKUP pInterface, PDMNETWORKLINKSTATE enmLinkState)
 {
     LogFlow(("drvNetShaperUp_NotifyLinkChanged: enmLinkState=%d\n", enmLinkState));
-    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkUp);
-    if (pThis->pIBelowNet)
-        pThis->pIBelowNet->pfnNotifyLinkChanged(pThis->pIBelowNet, enmLinkState);
-}
-
+    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, CTX_SUFF(INetworkUp));
+    if (pThis->pIBelowNetR3)
+        pThis->pIBelowNetR3->pfnNotifyLinkChanged(pThis->pIBelowNetR3, enmLinkState);
+}
 
 /**
  * @interface_method_impl{PDMINETWORKDOWN,pfnWaitReceiveAvail}
  */
-static DECLCALLBACK(int) drvNetShaperDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
+static DECLCALLBACK(int) drvR3NetShaperDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
 {
     PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkDown);
@@ -203 +227 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnReceive}
  */
-static DECLCALLBACK(int) drvNetShaperDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
+static DECLCALLBACK(int) drvR3NetShaperDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
 {
     PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkDown);
@@ -213 +237 @@
  * @interface_method_impl{PDMINETWORKDOWN,pfnXmitPending}
  */
-static DECLCALLBACK(void) drvNetShaperDown_XmitPending(PPDMINETWORKDOWN pInterface)
+static DECLCALLBACK(void) drvR3NetShaperDown_XmitPending(PPDMINETWORKDOWN pInterface)
 {
     PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkDown);
@@ -229 +253 @@
  * @thread  EMT
  */
-static DECLCALLBACK(int) drvNetShaperDownCfg_GetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
+static DECLCALLBACK(int) drvR3NetShaperDownCfg_GetMac(PPDMINETWORKCONFIG pInterface, PRTMAC pMac)
 {
     PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkConfig);
@@ -242 +266 @@
  * @thread  EMT
  */
-static DECLCALLBACK(PDMNETWORKLINKSTATE) drvNetShaperDownCfg_GetLinkState(PPDMINETWORKCONFIG pInterface)
+static DECLCALLBACK(PDMNETWORKLINKSTATE) drvR3NetShaperDownCfg_GetLinkState(PPDMINETWORKCONFIG pInterface)
 {
     PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkConfig);
@@ -256 +280 @@
  * @thread  EMT
  */
-static DECLCALLBACK(int) drvNetShaperDownCfg_SetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
+static DECLCALLBACK(int) drvR3NetShaperDownCfg_SetLinkState(PPDMINETWORKCONFIG pInterface, PDMNETWORKLINKSTATE enmState)
 {
     PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, INetworkConfig);
@@ -264 +288 @@
 
 /**
+ * @interface_method_impl{PDMIBASER0,pfnQueryInterface}
+ */
+static DECLCALLBACK(RTR0PTR) drvR3NetShaperIBaseR0_QueryInterface(PPDMIBASER0 pInterface, const char *pszIID)
+{
+    PDRVNETSHAPER pThis = RT_FROM_MEMBER(pInterface, DRVNETSHAPER, IBaseR0);
+    PDMIBASER0_RETURN_INTERFACE(pThis->pDrvInsR3, pszIID, PDMINETWORKUP, &pThis->INetworkUpR0);
+    return NIL_RTR0PTR;
+}
+
+/**
+ * @interface_method_impl{PDMIBASERC,pfnQueryInterface}
+ */
+static DECLCALLBACK(RTRCPTR) drvR3NetShaperIBaseRC_QueryInterface(PPDMIBASERC pInterface, const char *pszIID)
+{
+    return NIL_RTRCPTR;
+}
+
+/**
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-static DECLCALLBACK(void *) drvNetShaperQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+static DECLCALLBACK(void *) drvR3NetShaperIBase_QueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS     pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
     PDRVNETSHAPER  pThis   = PDMINS_2_DATA(pDrvIns, PDRVNETSHAPER);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKUP, &pThis->INetworkUp);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASER0, &pThis->IBaseR0);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASERC, &pThis->IBaseRC);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKUP, &pThis->INetworkUpR3);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKDOWN, &pThis->INetworkDown);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMINETWORKCONFIG, &pThis->INetworkConfig);
@@ -281 +325 @@
  * @interface_method_impl{PDMDRVREG,pfnDetach}
  */
-static DECLCALLBACK(void) drvNetShaperDetach(PPDMDRVINS pDrvIns, uint32_t fFlags)
+static DECLCALLBACK(void) drvR3NetShaperDetach(PPDMDRVINS pDrvIns, uint32_t fFlags)
 {
     PDRVNETSHAPER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSHAPER);
 
     LogFlow(("drvNetShaperDetach: pDrvIns: %p, fFlags: %u\n", pDrvIns, fFlags));
-    RTCritSectEnter(&pThis->XmitLock);
-    pThis->pIBelowNet = NULL;
-    RTCritSectLeave(&pThis->XmitLock);
+    PDMCritSectEnter(&pThis->XmitLock, VERR_IGNORED);
+    pThis->pIBelowNetR3 = NULL;
+    pThis->pIBelowNetR0 = NIL_RTR0PTR;
+    PDMCritSectLeave(&pThis->XmitLock);
 }
 
@@ -295 +340 @@
  * @interface_method_impl{PDMDRVREG,pfnAttach}
  */
-static DECLCALLBACK(int) drvNetShaperAttach(PPDMDRVINS pDrvIns, uint32_t fFlags)
+static DECLCALLBACK(int) drvR3NetShaperAttach(PPDMDRVINS pDrvIns, uint32_t fFlags)
 {
     PDRVNETSHAPER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSHAPER);
     LogFlow(("drvNetShaperAttach/#%#x: fFlags=%#x\n", pDrvIns->iInstance, fFlags));
-    RTCritSectEnter(&pThis->XmitLock);
+    PDMCritSectEnter(&pThis->XmitLock, VERR_IGNORED);
 
     /*
@@ -309 +354 @@
         || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
     {
-        pThis->pIBelowNet = NULL;
+        pThis->pIBelowNetR3 = NULL;
+        pThis->pIBelowNetR0 = NIL_RTR0PTR;
         rc = VINF_SUCCESS;
     }
     else if (RT_SUCCESS(rc))
     {
-        pThis->pIBelowNet = PDMIBASE_QUERY_INTERFACE(pBaseDown, PDMINETWORKUP);
-        if (pThis->pIBelowNet)
+        pThis->pIBelowNetR3 = PDMIBASE_QUERY_INTERFACE(pBaseDown, PDMINETWORKUP);
+        if (pThis->pIBelowNetR3)
+        {
+            PPDMIBASER0 pBaseR0  = PDMIBASE_QUERY_INTERFACE(pBaseDown, PDMIBASER0);
+            pThis->pIBelowNetR0 = pBaseR0 ? pBaseR0->pfnQueryInterface(pBaseR0, PDMINETWORKUP_IID) : NIL_RTR0PTR;
             rc = VINF_SUCCESS;
+        }
         else
         {
@@ -326 +376 @@
         AssertMsgFailed(("Failed to attach to driver below! rc=%Rrc\n", rc));
 
-    RTCritSectLeave(&pThis->XmitLock);
+    PDMCritSectLeave(&pThis->XmitLock);
     return VINF_SUCCESS;
 }
@@ -334 +384 @@
  * @interface_method_impl{PDMDRVREG,pfnDestruct}
  */
-static DECLCALLBACK(void) drvNetShaperDestruct(PPDMDRVINS pDrvIns)
+static DECLCALLBACK(void) drvR3NetShaperDestruct(PPDMDRVINS pDrvIns)
 {
     PDRVNETSHAPER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSHAPER);
@@ -341 +391 @@
     PDMDrvHlpNetShaperDetach(pDrvIns, &pThis->Filter);
 
-    if (RTCritSectIsInitialized(&pThis->XmitLock))
-        RTCritSectDelete(&pThis->XmitLock);
+    if (PDMCritSectIsInitialized(&pThis->XmitLock))
+        PDMR3CritSectDelete(&pThis->XmitLock);
 }
 
@@ -350 +400 @@
  *                       PDMDRVREG,pfnDestruct}
  */
-static DECLCALLBACK(int) drvNetShaperConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
+static DECLCALLBACK(int) drvR3NetShaperConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
     PDRVNETSHAPER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSHAPER);
@@ -359 +409 @@
      * Init the static parts.
      */
+    pThis->pDrvInsR3                                = pDrvIns;
+    pThis->pDrvInsR0                                = PDMDRVINS_2_R0PTR(pDrvIns);
     /* IBase */
-    pDrvIns->IBase.pfnQueryInterface                = drvNetShaperQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface                = drvR3NetShaperIBase_QueryInterface;
+    pThis->IBaseR0.pfnQueryInterface                = drvR3NetShaperIBaseR0_QueryInterface;
+    pThis->IBaseRC.pfnQueryInterface                = drvR3NetShaperIBaseRC_QueryInterface;
     /* INetworkUp */
-    pThis->INetworkUp.pfnBeginXmit                  = drvNetShaperUp_BeginXmit;
-    pThis->INetworkUp.pfnAllocBuf                   = drvNetShaperUp_AllocBuf;
-    pThis->INetworkUp.pfnFreeBuf                    = drvNetShaperUp_FreeBuf;
-    pThis->INetworkUp.pfnSendBuf                    = drvNetShaperUp_SendBuf;
-    pThis->INetworkUp.pfnEndXmit                    = drvNetShaperUp_EndXmit;
-    pThis->INetworkUp.pfnSetPromiscuousMode         = drvNetShaperUp_SetPromiscuousMode;
-    pThis->INetworkUp.pfnNotifyLinkChanged          = drvNetShaperUp_NotifyLinkChanged;
+    pThis->INetworkUpR3.pfnBeginXmit                = drvNetShaperUp_BeginXmit;
+    pThis->INetworkUpR3.pfnAllocBuf                 = drvNetShaperUp_AllocBuf;
+    pThis->INetworkUpR3.pfnFreeBuf                  = drvNetShaperUp_FreeBuf;
+    pThis->INetworkUpR3.pfnSendBuf                  = drvNetShaperUp_SendBuf;
+    pThis->INetworkUpR3.pfnEndXmit                  = drvNetShaperUp_EndXmit;
+    pThis->INetworkUpR3.pfnSetPromiscuousMode       = drvNetShaperUp_SetPromiscuousMode;
+    pThis->INetworkUpR3.pfnNotifyLinkChanged        = drvR3NetShaperUp_NotifyLinkChanged;
+    /*
+     * Resolve the ring-0 context interface addresses.
+     */
+    int rc = pDrvIns->pHlpR3->pfnLdrGetR0InterfaceSymbols(pDrvIns, &pThis->INetworkUpR0,
+                                                          sizeof(pThis->INetworkUpR0),
+                                                          "drvNetShaperUp_", PDMINETWORKUP_SYM_LIST);
+    AssertLogRelRCReturn(rc, rc);
     /* INetworkDown */
-    pThis->INetworkDown.pfnWaitReceiveAvail         = drvNetShaperDown_WaitReceiveAvail;
-    pThis->INetworkDown.pfnReceive                  = drvNetShaperDown_Receive;
-    pThis->INetworkDown.pfnXmitPending              = drvNetShaperDown_XmitPending;
+    pThis->INetworkDown.pfnWaitReceiveAvail         = drvR3NetShaperDown_WaitReceiveAvail;
+    pThis->INetworkDown.pfnReceive                  = drvR3NetShaperDown_Receive;
+    pThis->INetworkDown.pfnXmitPending              = drvR3NetShaperDown_XmitPending;
     /* INetworkConfig */
-    pThis->INetworkConfig.pfnGetMac                 = drvNetShaperDownCfg_GetMac;
-    pThis->INetworkConfig.pfnGetLinkState           = drvNetShaperDownCfg_GetLinkState;
-    pThis->INetworkConfig.pfnSetLinkState           = drvNetShaperDownCfg_SetLinkState;
+    pThis->INetworkConfig.pfnGetMac                 = drvR3NetShaperDownCfg_GetMac;
+    pThis->INetworkConfig.pfnGetLinkState           = drvR3NetShaperDownCfg_GetLinkState;
+    pThis->INetworkConfig.pfnSetLinkState           = drvR3NetShaperDownCfg_SetLinkState;
 
     /*
      * Create the locks.
      */
-    int rc = RTCritSectInit(&pThis->XmitLock);
+    rc = PDMDrvHlpCritSectInit(pDrvIns, &pThis->XmitLock, RT_SRC_POS, "NetShaper");
     AssertRCReturn(rc, rc);
 
@@ -439 +500 @@
     if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
         || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
-        pThis->pIBelowNet = NULL;
+    {
+        pThis->pIBelowNetR3 = NULL;
+        pThis->pIBelowNetR0 = NIL_RTR0PTR;
+    }
     else if (RT_SUCCESS(rc))
     {
-        pThis->pIBelowNet = PDMIBASE_QUERY_INTERFACE(pBaseDown, PDMINETWORKUP);
-        if (!pThis->pIBelowNet)
+        pThis->pIBelowNetR3 = PDMIBASE_QUERY_INTERFACE(pBaseDown, PDMINETWORKUP);
+        if (!pThis->pIBelowNetR3)
         {
             AssertMsgFailed(("Configuration error: the driver below didn't export the network connector interface!\n"));
             return VERR_PDM_MISSING_INTERFACE_BELOW;
         }
+        PPDMIBASER0 pBaseR0  = PDMIBASE_QUERY_INTERFACE(pBaseDown, PDMIBASER0);
+        pThis->pIBelowNetR0 = pBaseR0 ? pBaseR0->pfnQueryInterface(pBaseR0, PDMINETWORKUP_IID) : NIL_RTR0PTR;
     }
     else
@@ -484 +550 @@
     "",
     /* szR0Mod */
-    "",
+    "VBoxDDR0.r0",
     /* pszDescription */
     "Network Shaper Filter Driver",
     /* fFlags */
-    PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT,
+    PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT | PDM_DRVREG_FLAGS_R0,
     /* fClass. */
     PDM_DRVREG_CLASS_NETWORK,
@@ -496 +562 @@
     sizeof(DRVNETSHAPER),
     /* pfnConstruct */
-    drvNetShaperConstruct,
+    drvR3NetShaperConstruct,
     /* pfnDestruct */
-    drvNetShaperDestruct,
+    drvR3NetShaperDestruct,
     /* pfnRelocate */
     NULL,
@@ -512 +578 @@
     NULL,
     /* pfnAttach */
-    drvNetShaperAttach,
+    drvR3NetShaperAttach,
     /* pfnDetach */
-    drvNetShaperDetach,
+    drvR3NetShaperDetach,
     /* pfnPowerOff */
     NULL,
@@ -522 +588 @@
     PDM_DRVREG_VERSION
 };
-
+#endif /* IN_RING3 */

trunk/src/VBox/VMM/Makefile.kmk

@@ -543 +543 @@
         VMMAll/IEMAllAImplC.cpp
  endif
+ ifdef VBOX_WITH_NETSHAPER
+  VMMR0_SOURCES += \
+        VMMR0/PDMNetShaperR0.cpp
+ endif
  VMMR0_SOURCES.amd64 = \
         VMMR0/VMMR0JmpA-amd64.asm

trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2011-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
 
 #include <VBox/vmm/pdmnetshaper.h>
+#include <VBox/vmm/pdmnetshaperint.h>
 
 
@@ -48 +49 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-
-/**
- * Bandwidth group instance data
- */
-typedef struct PDMNSBWGROUP
-{
-    /** Pointer to the next group in the list. */
-    struct PDMNSBWGROUP                        *pNext;
-    /** Pointer to the shared UVM structure. */
-    struct PDMNETSHAPER                        *pShaper;
-    /** Critical section protecting all members below. */
-    RTCRITSECT               cs;
-    /** Pointer to the first filter attached to this group. */
-    struct PDMNSFILTER                         *pFiltersHead;
-    /** Bandwidth group name. */
-    char                                       *pszName;
-    /** Maximum number of bytes filters are allowed to transfer. */
-    volatile uint64_t                           cbTransferPerSecMax;
-    /** Number of bytes we are allowed to transfer in one burst. */
-    volatile uint32_t                           cbBucketSize;
-    /** Number of bytes we were allowed to transfer at the last update. */
-    volatile uint32_t                           cbTokensLast;
-    /** Timestamp of the last update */
-    volatile uint64_t                           tsUpdatedLast;
-    /** Reference counter - How many filters are associated with this group. */
-    volatile uint32_t                           cRefs;
-} PDMNSBWGROUP;
-/** Pointer to a bandwidth group. */
-typedef PDMNSBWGROUP *PPDMNSBWGROUP;
 
 /**
@@ -157 +129 @@
     pBwGroup->cbBucketSize        = RT_MAX(PDM_NETSHAPER_MIN_BUCKET_SIZE,
                                            cbTransferPerSecMax * PDM_NETSHAPER_MAX_LATENCY / 1000);
-    LogFlowFunc(("New rate limit is %d bytes per second, adjusted bucket size to %d bytes\n",
+    LogFlowFunc(("New rate limit is %llu bytes per second, adjusted bucket size to %d bytes\n",
                  pBwGroup->cbTransferPerSecMax, pBwGroup->cbBucketSize));
 }
@@ -163 +135 @@
 static int pdmNsBwGroupCreate(PPDMNETSHAPER pShaper, const char *pcszBwGroup, uint64_t cbTransferPerSecMax)
 {
-    LogFlowFunc(("pShaper=%#p pcszBwGroup=%#p{%s} cbTransferPerSecMax=%u\n",
+    LogFlowFunc(("pShaper=%#p pcszBwGroup=%#p{%s} cbTransferPerSecMax=%llu\n",
                  pShaper, pcszBwGroup, pcszBwGroup, cbTransferPerSecMax));
 
@@ -174 +146 @@
     if (!pBwGroup)
     {
-        rc = MMR3HeapAllocZEx(pShaper->pVM, MM_TAG_PDM_NET_SHAPER,
-                              sizeof(PDMNSBWGROUP),
-                              (void **)&pBwGroup);
+        rc = MMHyperAlloc(pShaper->pVM, sizeof(PDMNSBWGROUP), 64,
+                          MM_TAG_PDM_NET_SHAPER, (void **)&pBwGroup);
         if (RT_SUCCESS(rc))
         {
-            rc = RTCritSectInit(&pBwGroup->cs);
+            rc = PDMR3CritSectInit(pShaper->pVM, &pBwGroup->cs, RT_SRC_POS, "BWGRP");
             if (RT_SUCCESS(rc))
             {
@@ -198 +169 @@
                     return VINF_SUCCESS;
                 }
-                RTCritSectDelete(&pBwGroup->cs);
+                PDMR3CritSectDelete(&pBwGroup->cs);
             }
-            MMR3HeapFree(pBwGroup);
+            MMHyperFree(pShaper->pVM, pBwGroup);
         }
         else
@@ -215 +186 @@
 {
     Assert(pBwGroup->cRefs == 0);
-    if (RTCritSectIsInitialized(&pBwGroup->cs))
-        RTCritSectDelete(&pBwGroup->cs);
+    if (PDMCritSectIsInitialized(&pBwGroup->cs))
+        PDMR3CritSectDelete(&pBwGroup->cs);
 }
 
@@ -267 +238 @@
 {
     PPDMNSBWGROUP pBwGroup = pFilter->pBwGroupR3;
-    int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
+    int rc = PDMCritSectEnter(&pBwGroup->cs, VERR_SEM_BUSY); AssertRC(rc);
 
     pFilter->pNext = pBwGroup->pFiltersHead;
     pBwGroup->pFiltersHead = pFilter;
 
-    rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
+    rc = PDMCritSectLeave(&pBwGroup->cs); AssertRC(rc);
 }
 
@@ -286 +257 @@
     AssertPtr(pBwGroup->pShaper);
     Assert(RTCritSectIsOwner(&pBwGroup->pShaper->cs));
-    int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
+    int rc = PDMCritSectEnter(&pBwGroup->cs, VERR_SEM_BUSY); AssertRC(rc);
 
     if (pFilter == pBwGroup->pFiltersHead)
@@ -301 +272 @@
     }
 
-    rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
+    rc = PDMCritSectLeave(&pBwGroup->cs); AssertRC(rc);
 }
 
@@ -333 +304 @@
         {
             pBwGroupOld = ASMAtomicXchgPtrT(&pFilter->pBwGroupR3, pBwGroupNew, PPDMNSBWGROUP);
+            ASMAtomicWritePtr(&pFilter->pBwGroupR0, MMHyperR3ToR0(pVM, pBwGroupNew));
             if (pBwGroupOld)
                 pdmNsBwGroupUnref(pBwGroupOld);
@@ -367 +339 @@
 VMMR3DECL(bool) PDMR3NsAllocateBandwidth(PPDMNSFILTER pFilter, uint32_t cbTransfer)
 {
-    AssertPtrReturn(pFilter, true);
-    if (!VALID_PTR(pFilter->pBwGroupR3))
-        return true;
-
-    PPDMNSBWGROUP pBwGroup = ASMAtomicReadPtrT(&pFilter->pBwGroupR3, PPDMNSBWGROUP);
-    int rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
-    bool fAllowed = true;
-    if (pBwGroup->cbTransferPerSecMax)
-    {
-        /* Re-fill the bucket first */
-        uint64_t tsNow = RTTimeSystemNanoTS();
-        uint32_t uTokensAdded = (tsNow - pBwGroup->tsUpdatedLast)*pBwGroup->cbTransferPerSecMax/(1000*1000*1000);
-        uint32_t uTokens = RT_MIN(pBwGroup->cbBucketSize, uTokensAdded + pBwGroup->cbTokensLast);
-
-        if (cbTransfer > uTokens)
-        {
-            fAllowed = false;
-            ASMAtomicWriteBool(&pFilter->fChoked, true);
-        }
-        else
-        {
-            pBwGroup->tsUpdatedLast = tsNow;
-            pBwGroup->cbTokensLast = uTokens - cbTransfer;
-        }
-        Log2((LOG_FN_FMT "BwGroup=%#p{%s} cbTransfer=%u uTokens=%u uTokensAdded=%u fAllowed=%RTbool\n",
-              __PRETTY_FUNCTION__, pBwGroup, pBwGroup->pszName, cbTransfer, uTokens, uTokensAdded, fAllowed));
-    }
-    else
-        Log2((LOG_FN_FMT "BwGroup=%#p{%s} disabled fAllowed=%RTbool\n",
-              __PRETTY_FUNCTION__, pBwGroup, pBwGroup->pszName, fAllowed));
-
-    rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
-    return fAllowed;
+    return pdmNsAllocateBandwidth(pFilter, cbTransfer);
 }
 
@@ -413 +353 @@
         if (pBwGroup)
         {
-            rc = RTCritSectEnter(&pBwGroup->cs); AssertRC(rc);
+            rc = PDMCritSectEnter(&pBwGroup->cs, VERR_SEM_BUSY); AssertRC(rc);
             pdmNsBwGroupSetLimit(pBwGroup, cbTransferPerSecMax);
             /* Drop extra tokens */
             if (pBwGroup->cbTokensLast > pBwGroup->cbBucketSize)
                 pBwGroup->cbTokensLast = pBwGroup->cbBucketSize;
-            rc = RTCritSectLeave(&pBwGroup->cs); AssertRC(rc);
+            rc = PDMCritSectLeave(&pBwGroup->cs); AssertRC(rc);
         }
         rc = RTCritSectLeave(&pShaper->cs); AssertRC(rc);
@@ -486 +426 @@
         pBwGroup = pBwGroup->pNext;
         pdmNsBwGroupTerminate(pFree);
-        MMR3HeapFree(pFree);
+        MMHyperFree(pVM, pFree);
     }