Changeset 101096 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 12, 2023 10:59:30 PM (17 months ago)

Author:

vboxsync

Message:

VMM/IEM: Fixed a bug in the TB allocator pruning code and another one wrt initial chunk allocations. bugref:10369

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllThrdRecompiler.cpp (modified) (3 diffs)
• VMMR3/IEMR3.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllThrdRecompiler.cpp

@@ -788 +788 @@
         pTbAllocator->cTotalTbs       += cTbsPerChunk;
 
-        if (idxChunk * cTbsPerChunk >= cInitialTbs)
+        if ((idxChunk + 1) * cTbsPerChunk >= cInitialTbs)
             break;
     }
@@ -1003 +1003 @@
     STAM_PROFILE_START(&pTbAllocator->StatPrune, a);
     uint32_t const msNow          = pVCpu->iem.s.msRecompilerPollNow;
+    uint32_t const cTbsToPrune    = 128;
+    uint32_t const cTbsPerGroup   = 4;
     uint32_t       cFreedTbs      = 0;
 #ifdef IEMTB_SIZE_IS_POWER_OF_TWO
-    uint32_t       idxTbPruneFrom = pTbAllocator->iPruneFrom & ~(uint32_t)3;
+    uint32_t       idxTbPruneFrom = pTbAllocator->iPruneFrom & ~(uint32_t)(cTbsToPrune - 1); /* Stay within a chunk! */
 #else
     uint32_t       idxTbPruneFrom = pTbAllocator->iPruneFrom;
 #endif
-    if (idxTbPruneFrom > pTbAllocator->cMaxTbs)
+    if (idxTbPruneFrom >= pTbAllocator->cMaxTbs)
         idxTbPruneFrom = 0;
-    for (uint32_t i = 0; i < 128; i += 4, idxTbPruneFrom += 4)
+    for (uint32_t i = 0; i < cTbsToPrune; i += cTbsPerGroup, idxTbPruneFrom += cTbsPerGroup)
     {
         uint32_t idxChunk   = IEMTBALLOC_IDX_TO_CHUNK(pTbAllocator, idxTbPruneFrom);
@@ -1017 +1019 @@
         PIEMTB   pTb        = &pTbAllocator->aChunks[idxChunk].paTbs[idxInChunk];
         uint32_t cMsAge     = msNow - pTb->msLastUsed;
-        for (uint32_t j = 1, idxChunk2 = idxChunk, idxInChunk2 = idxInChunk + 1; j < 4; j++, idxInChunk2++)
+        for (uint32_t j = 1, idxChunk2 = idxChunk, idxInChunk2 = idxInChunk + 1; j < cTbsPerGroup; j++, idxInChunk2++)
         {
 #ifndef IEMTB_SIZE_IS_POWER_OF_TWO

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

@@ -116 +116 @@
 
 #ifdef VBOX_WITH_IEM_RECOMPILER
-    /** @cfgm{/IEM/InitialTbCount, uint32_t, 32768}
-     * Initial (minimum) number of TBs per EMT in ring-3. */
-    uint32_t cInitialTbs = 0;
-    rc = CFGMR3QueryU32Def(pIem, "InitialTbCount", &cInitialTbs, _32K);
-    AssertLogRelRCReturn(rc, rc);
-    if (cInitialTbs < _16K || cInitialTbs > _8M)
-        return VMSetError(pVM, VERR_OUT_OF_RANGE, RT_SRC_POS,
-                          "InitialTbCount value %u (%#x) is out of range (min %u, max %u)", cInitialTbs, cInitialTbs, _16K, _8M);
-
     /** @cfgm{/IEM/MaxTbCount, uint32_t, 524288}
      * Max number of TBs per EMT. */
@@ -130 +121 @@
     rc = CFGMR3QueryU32Def(pIem, "MaxTbCount", &cMaxTbs, _512K);
     AssertLogRelRCReturn(rc, rc);
-    if (cMaxTbs < cInitialTbs || cMaxTbs > _8M)
+    if (cMaxTbs < _16K || cMaxTbs > _8M)
         return VMSetError(pVM, VERR_OUT_OF_RANGE, RT_SRC_POS,
-                          "MaxTbCount value %u (%#x) is out of range (min %u, max %u)", cMaxTbs, cMaxTbs, cInitialTbs, _8M);
+                          "MaxTbCount value %u (%#x) is out of range (min %u, max %u)", cMaxTbs, cMaxTbs, _16K, _8M);
+
+    /** @cfgm{/IEM/InitialTbCount, uint32_t, 32678}
+     * Initial (minimum) number of TBs per EMT in ring-3. */
+    uint32_t cInitialTbs = 0;
+    rc = CFGMR3QueryU32Def(pIem, "InitialTbCount", &cInitialTbs, RT_MIN(cMaxTbs, _32K));
+    AssertLogRelRCReturn(rc, rc);
+    if (cInitialTbs < _16K || cInitialTbs > _8M)
+        return VMSetError(pVM, VERR_OUT_OF_RANGE, RT_SRC_POS,
+                          "InitialTbCount value %u (%#x) is out of range (min %u, max %u)", cInitialTbs, cInitialTbs, _16K, _8M);
+
+    /* Check that the two values makes sense together. Expect user/api to do
+       the right thing or get lost. */
+    if (cInitialTbs > cMaxTbs)
+        return VMSetError(pVM, VERR_OUT_OF_RANGE, RT_SRC_POS,
+                          "InitialTbCount value %u (%#x) is higher than the MaxTbCount value %u (%#x)",
+                          cInitialTbs, cInitialTbs, cMaxTbs, cMaxTbs);
 #endif
 
@@ -285 +292 @@
 
         PIEMTBALLOCATOR const pTbAllocator = pVCpu->iem.s.pTbAllocatorR3;
-        STAMR3RegisterF(pVM, (void *)&pTbAllocator->StatAllocs,         STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,
-                        "Translation block allocations",                "/IEM/CPU%u/re/cTbAllocs", idCpu);
-        STAMR3RegisterF(pVM, (void *)&pTbAllocator->StatFrees,          STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,
-                        "Translation block frees",                      "/IEM/CPU%u/re/cTbFrees", idCpu);
+        STAMR3RegisterF(pVM, (void *)&pTbAllocator->StatAllocs,         STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS,
+                        "Translation block allocations",                "/IEM/CPU%u/re/cTbAllocCalls", idCpu);
+        STAMR3RegisterF(pVM, (void *)&pTbAllocator->StatFrees,          STAMTYPE_COUNTER,   STAMVISIBILITY_ALWAYS, STAMUNIT_CALLS,
+                        "Translation block frees",                      "/IEM/CPU%u/re/cTbFreeCalls", idCpu);
 # ifdef VBOX_WITH_STATISTICS
         STAMR3RegisterF(pVM, (void *)&pTbAllocator->StatPrune,          STAMTYPE_PROFILE,   STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL,