Changeset 93628 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 6, 2022 11:44:05 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PDMNetShaper,Main,DrvNetShaper: Moved the network shaper data off the hyper heap and into the VM structure. bugref:10093 bugref:5582

File:

• trunk/src/VBox/Devices/Network/DrvNetShaper.cpp (modified) (1 diff)

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

@@ -121 +121 @@
  */
 PDMBOTHCBDECL(int) drvNetShaperUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin,
-                                                  PCPDMNETWORKGSO pGso, PPPDMSCATTERGATHER ppSgBuf)
+                                           PCPDMNETWORKGSO pGso, PPPDMSCATTERGATHER ppSgBuf)
 {
     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);
-#if defined(IN_RING3) || defined(IN_RING0)
-    if (!PDMDrvHlpNetShaperAllocateBandwidth(pThis->CTX_SUFF(pDrvIns), &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->CTX_SUFF(pIBelowNet)->pfnAllocBuf(pThis->CTX_SUFF(pIBelowNet), cbMin, pGso, ppSgBuf);
+    if (pThis->CTX_SUFF(pIBelowNet))
+    {
+        //LogFlow(("drvNetShaperUp_AllocBuf: cb=%d\n", cbMin));
+        STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesRequested, cbMin);
+        STAM_REL_COUNTER_INC(&pThis->StatXmitPktsRequested);
+        if (!PDMDrvHlpNetShaperAllocateBandwidth(pThis->CTX_SUFF(pDrvIns), &pThis->Filter, cbMin))
+        {
+            STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesDenied, cbMin);
+            STAM_REL_COUNTER_INC(&pThis->StatXmitPktsDenied);
+            return VERR_TRY_AGAIN;
+        }
+        STAM_REL_COUNTER_ADD(&pThis->StatXmitBytesGranted, cbMin);
+        STAM_REL_COUNTER_INC(&pThis->StatXmitPktsGranted);
+        //LogFlow(("drvNetShaperUp_AllocBuf: got cb=%d\n", cbMin));
+        return pThis->CTX_SUFF(pIBelowNet)->pfnAllocBuf(pThis->CTX_SUFF(pIBelowNet), cbMin, pGso, ppSgBuf);
+    }
+    return VERR_NET_DOWN;
 }