Changeset 92390 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Nov 12, 2021 9:24:33 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Moved the zeroing and failure reporting from PGMR3PhysAllocateHandyPages and into PGMR0PhysAllocateHandyPages. bugref:10093

File:

• trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (modified) (5 diffs)

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

@@ -5843 +5843 @@
     AssertMsgReturn(iClear <= RT_ELEMENTS(pVM->pgm.s.aHandyPages), ("%d", iClear), VERR_PGM_HANDY_PAGE_IPE);
     Log(("PGMR3PhysAllocateHandyPages: %d -> %d\n", iClear, RT_ELEMENTS(pVM->pgm.s.aHandyPages)));
-    int rcAlloc = VINF_SUCCESS;
-    int rcSeed  = VINF_SUCCESS;
     int rc = VMMR3CallR0(pVM, VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES, 0, NULL);
     /** @todo we should split this up into an allocate and flush operation. sometimes you want to flush and not allocate more (which will trigger the vm account limit error) */
@@ -5858 +5856 @@
         AssertMsg(rc == VINF_SUCCESS, ("%Rrc\n", rc));
         Assert(pVM->pgm.s.cHandyPages > 0);
-        VM_FF_CLEAR(pVM, VM_FF_PGM_NEED_HANDY_PAGES);
-        VM_FF_CLEAR(pVM, VM_FF_PGM_NO_MEMORY);
-
 #ifdef VBOX_STRICT
         uint32_t i;
@@ -5881 +5876 @@
         }
 #endif
-        /*
-         * Clear the pages.
-         */
-        while (iClear < pVM->pgm.s.cHandyPages)
-        {
-            PGMMPAGEDESC pPage = &pVM->pgm.s.aHandyPages[iClear];
-            if (!pPage->fZeroed)
-            {
-                void *pv;
-                rc = pgmPhysPageMapByPageID(pVM, pPage->idPage, pPage->HCPhysGCPhys, &pv);
-                AssertLogRelMsgBreak(RT_SUCCESS(rc),
-                                     ("%u/%u: idPage=%#x HCPhysGCPhys=%RHp rc=%Rrc\n",
-                                      iClear, pVM->pgm.s.cHandyPages, pPage->idPage, pPage->HCPhysGCPhys, rc));
-                ASMMemZeroPage(pv);
-                pPage->fZeroed = true;
-            }
-#ifdef VBOX_STRICT
-            else
-            {
-                void *pv;
-                rc = pgmPhysPageMapByPageID(pVM, pPage->idPage, pPage->HCPhysGCPhys, &pv);
-                AssertLogRelMsgBreak(RT_SUCCESS(rc),
-                                     ("%u/%u: idPage=%#x HCPhysGCPhys=%RHp rc=%Rrc\n",
-                                      iClear, pVM->pgm.s.cHandyPages, pPage->idPage, pPage->HCPhysGCPhys, rc));
-                Assert(ASMMemIsZeroPage(pv));
-            }
-#endif
-            iClear++;
-            Log3(("PGMR3PhysAllocateHandyPages: idPage=%#x HCPhys=%RGp\n", pPage->idPage, pPage->HCPhysGCPhys));
-        }
     }
     else
     {
-        uint64_t cAllocPages, cMaxPages, cBalloonPages;
-
         /*
          * We should never get here unless there is a genuine shortage of
@@ -5923 +5886 @@
          */
         /* Report the failure. */
-        LogRel(("PGM: Failed to procure handy pages; rc=%Rrc rcAlloc=%Rrc rcSeed=%Rrc cHandyPages=%#x\n"
+        LogRel(("PGM: Failed to procure handy pages; rc=%Rrc cHandyPages=%#x\n"
                 "     cAllPages=%#x cPrivatePages=%#x cSharedPages=%#x cZeroPages=%#x\n",
-                rc, rcAlloc, rcSeed,
-                pVM->pgm.s.cHandyPages,
-                pVM->pgm.s.cAllPages,
-                pVM->pgm.s.cPrivatePages,
-                pVM->pgm.s.cSharedPages,
-                pVM->pgm.s.cZeroPages));
-
-        if (GMMR3QueryMemoryStats(pVM, &cAllocPages, &cMaxPages, &cBalloonPages) == VINF_SUCCESS)
-        {
-            LogRel(("GMM: Statistics:\n"
-                    "     Allocated pages: %RX64\n"
-                    "     Maximum   pages: %RX64\n"
-                    "     Ballooned pages: %RX64\n", cAllocPages, cMaxPages, cBalloonPages));
-        }
+                rc, pVM->pgm.s.cHandyPages,
+                pVM->pgm.s.cAllPages, pVM->pgm.s.cPrivatePages, pVM->pgm.s.cSharedPages, pVM->pgm.s.cZeroPages));
 
         if (   rc != VERR_NO_MEMORY
             && rc != VERR_NO_PHYS_MEMORY
             && rc != VERR_LOCK_FAILED)
-        {
             for (uint32_t i = 0; i < RT_ELEMENTS(pVM->pgm.s.aHandyPages); i++)
             {
@@ -5964 +5914 @@
                 }
             }
-        }
 
         if (rc == VERR_NO_MEMORY)