Changeset 90265 in vbox for trunk/src/VBox

Timestamp:

Jul 20, 2021 8:12:41 PM (4 years ago)

Author:

vboxsync

Message:

VMMDev: Reduce the HGCM accounting categories to the same three as we use in HGCM for connections and pending calls. bugref:9379

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (3 diffs)
• VMMDevHGCM.cpp (modified) (1 diff)
• VMMDevState.h (modified) (2 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -4657 +4657 @@
      * memory as a rough hint of how much we can handle.
      */
-    /** @todo If we reduced the number of categories here, we could alot more to
-     *        each... */
     uint64_t cbDefaultBudget = 0;
     if (RT_FAILURE(RTSystemQueryTotalRam(&cbDefaultBudget)))
-        cbDefaultBudget = 16 * _1G64;
+        cbDefaultBudget = 8 * _1G64;
     LogFunc(("RTSystemQueryTotalRam -> %'RU64 (%RX64)\n", cbDefaultBudget, cbDefaultBudget));
 # if ARCH_BITS == 32
@@ -4667 +4665 @@
 # endif
     cbDefaultBudget /= 8;                               /* One eighth of physical memory ... */
-    cbDefaultBudget /= RT_ELEMENTS(pThisCC->aHgcmAcc);  /* over 8 accounting categories. (8GiB -> 64MiB) */
-    cbDefaultBudget  = RT_MIN(cbDefaultBudget, _512M);  /* max 512MiB */
-    cbDefaultBudget  = RT_MAX(cbDefaultBudget, _32M);   /* min  32MiB */
+    cbDefaultBudget /= RT_ELEMENTS(pThisCC->aHgcmAcc);  /* over 3 accounting categories. (8GiB -> 341MiB) */
+    cbDefaultBudget  = RT_MIN(cbDefaultBudget, _1G);    /* max 1024MiB */
+    cbDefaultBudget  = RT_MAX(cbDefaultBudget, _32M);   /* min   32MiB */
     rc = pHlp->pfnCFGMQueryU64Def(pCfg, "HGCMHeapBudgetDefault", &cbDefaultBudget, cbDefaultBudget);
     if (RT_FAILURE(rc))
@@ -4677 +4675 @@
     static const struct { const char *pszName; unsigned idx; } s_aCfgHeapBudget[] =
     {
-        { "HGCMHeapBudgetLegacy",       VMMDEV_REQUESTOR_USR_NOT_GIVEN  },
-        { "HGCMHeapBudgetVBoxGuest",    VMMDEV_REQUESTOR_USR_DRV        },
-        { "HGCMHeapBudgetOtherDrv",     VMMDEV_REQUESTOR_USR_DRV_OTHER  },
-        { "HGCMHeapBudgetRoot",         VMMDEV_REQUESTOR_USR_ROOT       },
-        { "HGCMHeapBudgetSystem",       VMMDEV_REQUESTOR_USR_SYSTEM     },
-        { "HGCMHeapBudgetReserved1",    VMMDEV_REQUESTOR_USR_RESERVED1  },
-        { "HGCMHeapBudgetUser",         VMMDEV_REQUESTOR_USR_USER       },
-        { "HGCMHeapBudgetGuest",        VMMDEV_REQUESTOR_USR_GUEST      },
+        { "HGCMHeapBudgetKernel",       VMMDEV_HGCM_CATEGORY_KERNEL },
+        { "HGCMHeapBudgetRoot",         VMMDEV_HGCM_CATEGORY_ROOT   },
+        { "HGCMHeapBudgetUser",         VMMDEV_HGCM_CATEGORY_USER   },
     };
     AssertCompile(RT_ELEMENTS(s_aCfgHeapBudget) == RT_ELEMENTS(pThisCC->aHgcmAcc));

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -281 +281 @@
                                          uint32_t cbRequest, uint32_t cParms, uint32_t fRequestor)
 {
-    /* For heap accounting. */
-    uintptr_t const idxHeapAcc = fRequestor != VMMDEV_REQUESTOR_LEGACY
-                               ? fRequestor & VMMDEV_REQUESTOR_USR_MASK
-                               : VMMDEV_REQUESTOR_USR_NOT_GIVEN;
+    /*
+     * Pick the heap accounting category.
+     *
+     * Initial idea was to just use what VMMDEV_REQUESTOR_USR_MASK yields directly,
+     * but there are so many unused categories then (DRV, RESERVED1, GUEST).  Better
+     * to have fewer and more heap available in each.
+     */
+    uintptr_t idxHeapAcc;
+    if (fRequestor != VMMDEV_REQUESTOR_LEGACY)
+        switch (fRequestor & VMMDEV_REQUESTOR_USR_MASK)
+        {
+            case VMMDEV_REQUESTOR_USR_NOT_GIVEN:
+            case VMMDEV_REQUESTOR_USR_DRV:
+            case VMMDEV_REQUESTOR_USR_DRV_OTHER:
+                idxHeapAcc = VMMDEV_HGCM_CATEGORY_KERNEL;
+                break;
+            case VMMDEV_REQUESTOR_USR_ROOT:
+            case VMMDEV_REQUESTOR_USR_SYSTEM:
+                idxHeapAcc = VMMDEV_HGCM_CATEGORY_ROOT;
+                break;
+            default:
+                AssertFailed(); RT_FALL_THRU();
+            case VMMDEV_REQUESTOR_USR_RESERVED1:
+            case VMMDEV_REQUESTOR_USR_USER:
+            case VMMDEV_REQUESTOR_USR_GUEST:
+                idxHeapAcc = VMMDEV_HGCM_CATEGORY_USER;
+                break;
+        }
+    else
+        idxHeapAcc = VMMDEV_HGCM_CATEGORY_KERNEL;
+
 #if 1
     /*

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -355 +355 @@
 
 
+/** @name VMMDev/HGCM accounting categories (indexes into VMMDEVR3::aHgcmAcc)
+ * @{  */
+/** Legacy, VMMDEV_REQUESTOR_USR_NOT_GIVEN, VMMDEV_REQUESTOR_USR_DRV,
+ *  VMMDEV_REQUESTOR_USR_DRV_OTHER. */
+#define VMMDEV_HGCM_CATEGORY_KERNEL   0
+/** VMMDEV_REQUESTOR_USR_ROOT, VMMDEV_REQUESTOR_USR_SYSTEM   */
+#define VMMDEV_HGCM_CATEGORY_ROOT     1
+/** VMMDEV_REQUESTOR_USR_RESERVED1, VMMDEV_REQUESTOR_USR_USER,
+ *  VMMDEV_REQUESTOR_USR_GUEST */
+#define VMMDEV_HGCM_CATEGORY_USER     2
+/** Array size. */
+#define VMMDEV_HGCM_CATEGORY_MAX      3
+/** @} */
+
 /**
  * State structure for the VMM device, ring-3 edition.
@@ -412 +426 @@
         /** Total number of message. */
         STAMCOUNTER                 cTotalMessages;
-    } aHgcmAcc[VMMDEV_REQUESTOR_USR_MASK + 1];
+    } aHgcmAcc[VMMDEV_HGCM_CATEGORY_MAX];
     STAMPROFILE                     StatHgcmCmdArrival;
     STAMPROFILE                     StatHgcmCmdCompletion;