Changeset 92389 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Nov 12, 2021 8:53:46 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: PGMR0PhysAllocateHandyPages should no longer need to deal with quota issues as we reserve RAM + handy pages. bugref:10093

File:

• trunk/src/VBox/VMM/VMMR0/PGMR0.cpp (modified) (2 diffs)

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

@@ -151 +151 @@
      * Check for error injection.
      */
-    if (RT_UNLIKELY(pGVM->pgm.s.fErrInjHandyPages))
+    if (RT_LIKELY(!pGVM->pgm.s.fErrInjHandyPages))
+    { /* likely */ }
+    else
         return VERR_NO_MEMORY;
 
@@ -180 +182 @@
     else
     {
-        if (    (   rc == VERR_GMM_HIT_GLOBAL_LIMIT
-                 || rc == VERR_GMM_HIT_VM_ACCOUNT_LIMIT)
-            &&  iFirst < PGM_HANDY_PAGES_MIN)
-        {
-
-#ifdef VBOX_STRICT
-            /* We're ASSUMING that GMM has updated all the entires before failing us. */
-            uint32_t i;
-            for (i = iFirst; i < RT_ELEMENTS(pGVM->pgm.s.aHandyPages); i++)
-            {
-                Assert(pGVM->pgm.s.aHandyPages[i].idPage       == NIL_GMM_PAGEID);
-                Assert(pGVM->pgm.s.aHandyPages[i].idSharedPage == NIL_GMM_PAGEID);
-                Assert(pGVM->pgm.s.aHandyPages[i].HCPhysGCPhys == NIL_GMMPAGEDESC_PHYS);
-                Assert(pGVM->pgm.s.aHandyPages[i].fZeroed      == false);
-            }
-#endif
-
-            /*
-             * Reduce the number of pages until we hit the minimum limit.
-             */
-            do
-            {
-                cPages >>= 1;
-                if (cPages + iFirst < PGM_HANDY_PAGES_MIN)
-                    cPages = PGM_HANDY_PAGES_MIN - iFirst;
-                rc = GMMR0AllocateHandyPages(pGVM, idCpu, 0, cPages, &pGVM->pgm.s.aHandyPages[iFirst]);
-            } while (   (   rc == VERR_GMM_HIT_GLOBAL_LIMIT
-                         || rc == VERR_GMM_HIT_VM_ACCOUNT_LIMIT)
-                     && cPages + iFirst > PGM_HANDY_PAGES_MIN);
-            if (RT_SUCCESS(rc))
-            {
-#ifdef VBOX_STRICT
-                i = iFirst + cPages;
-                while (i-- > 0)
-                {
-                    Assert(pGVM->pgm.s.aHandyPages[i].idPage != NIL_GMM_PAGEID);
-                    Assert(pGVM->pgm.s.aHandyPages[i].idPage <= GMM_PAGEID_LAST);
-                    Assert(pGVM->pgm.s.aHandyPages[i].idSharedPage == NIL_GMM_PAGEID);
-                    Assert(pGVM->pgm.s.aHandyPages[i].HCPhysGCPhys != NIL_GMMPAGEDESC_PHYS);
-                    Assert(!(pGVM->pgm.s.aHandyPages[i].HCPhysGCPhys & ~X86_PTE_PAE_PG_MASK));
-                }
-
-                for (i = cPages + iFirst; i < RT_ELEMENTS(pGVM->pgm.s.aHandyPages); i++)
-                {
-                    Assert(pGVM->pgm.s.aHandyPages[i].idPage       == NIL_GMM_PAGEID);
-                    Assert(pGVM->pgm.s.aHandyPages[i].idSharedPage == NIL_GMM_PAGEID);
-                    Assert(pGVM->pgm.s.aHandyPages[i].HCPhysGCPhys == NIL_GMMPAGEDESC_PHYS);
-                    Assert(pGVM->pgm.s.aHandyPages[i].fZeroed      == false);
-                }
-#endif
-
-                pGVM->pgm.s.cHandyPages = iFirst + cPages;
-            }
-        }
-
-        if (RT_FAILURE(rc))
-        {
-            LogRel(("PGMR0PhysAllocateHandyPages: rc=%Rrc iFirst=%d cPages=%d\n", rc, iFirst, cPages));
-            VM_FF_SET(pGVM, VM_FF_PGM_NO_MEMORY);
-        }
+        LogRel(("PGMR0PhysAllocateHandyPages: rc=%Rrc iFirst=%d cPages=%d\n", rc, iFirst, cPages));
+        VM_FF_SET(pGVM, VM_FF_PGM_NO_MEMORY);
     }