Changeset 92390 in vbox

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

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PGMR0.cpp (modified) (5 diffs)
• VMMR3/PGMPhys.cpp (modified) (5 diffs)

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

@@ -133 +133 @@
  * @param   pGVM        The global (ring-0) VM structure.
  * @param   idCpu       The ID of the calling EMT.
+ * @param   fRing3      Set if the caller is ring-3.  Determins whether to
+ *                      return VINF_EM_NO_MEMORY or not.
  *
  * @thread  EMT(idCpu)
@@ -139 +141 @@
  *          must clear the new pages.
  */
-VMMR0_INT_DECL(int) PGMR0PhysAllocateHandyPages(PGVM pGVM, VMCPUID idCpu)
+int pgmR0PhysAllocateHandyPages(PGVM pGVM, VMCPUID idCpu, bool fRing3)
 {
     /*
@@ -145 +147 @@
      */
     AssertReturn(idCpu < pGVM->cCpus, VERR_INVALID_CPU_ID); /* caller already checked this, but just to be sure. */
-    AssertReturn(pGVM->aCpus[idCpu].hEMT == RTThreadNativeSelf(), VERR_NOT_OWNER);
+    Assert(pGVM->aCpus[idCpu].hEMT == RTThreadNativeSelf());
     PGM_LOCK_ASSERT_OWNER_EX(pGVM, &pGVM->aCpus[idCpu]);
 
@@ -159 +161 @@
      * Try allocate a full set of handy pages.
      */
-    uint32_t iFirst = pGVM->pgm.s.cHandyPages;
-    AssertReturn(iFirst <= RT_ELEMENTS(pGVM->pgm.s.aHandyPages), VERR_PGM_HANDY_PAGE_IPE);
-    uint32_t cPages = RT_ELEMENTS(pGVM->pgm.s.aHandyPages) - iFirst;
+    uint32_t const iFirst = pGVM->pgm.s.cHandyPages;
+    AssertMsgReturn(iFirst <= RT_ELEMENTS(pGVM->pgm.s.aHandyPages), ("%#x\n", iFirst), VERR_PGM_HANDY_PAGE_IPE);
+
+    uint32_t const cPages = RT_ELEMENTS(pGVM->pgm.s.aHandyPages) - iFirst;
     if (!cPages)
         return VINF_SUCCESS;
+
     int rc = GMMR0AllocateHandyPages(pGVM, idCpu, cPages, cPages, &pGVM->pgm.s.aHandyPages[iFirst]);
     if (RT_SUCCESS(rc))
     {
+        uint32_t const cHandyPages = RT_ELEMENTS(pGVM->pgm.s.aHandyPages); /** @todo allow allocating less... */
+        pGVM->pgm.s.cHandyPages = cHandyPages;
+        VM_FF_CLEAR(pGVM, VM_FF_PGM_NEED_HANDY_PAGES);
+        VM_FF_CLEAR(pGVM, VM_FF_PGM_NO_MEMORY);
+
 #ifdef VBOX_STRICT
-        for (uint32_t i = 0; i < RT_ELEMENTS(pGVM->pgm.s.aHandyPages); i++)
+        for (uint32_t i = 0; i < cHandyPages; i++)
         {
             Assert(pGVM->pgm.s.aHandyPages[i].idPage != NIL_GMM_PAGEID);
@@ -178 +187 @@
 #endif
 
-        pGVM->pgm.s.cHandyPages = RT_ELEMENTS(pGVM->pgm.s.aHandyPages);
+        /*
+         * Clear the pages.
+         */
+        for (uint32_t iPage = iFirst; iPage < cHandyPages; iPage++)
+        {
+            PGMMPAGEDESC pPage = &pGVM->pgm.s.aHandyPages[iPage];
+            if (!pPage->fZeroed)
+            {
+                void *pv = NULL;
+#ifdef VBOX_WITH_LINEAR_HOST_PHYS_MEM
+                rc = SUPR0HCPhysToVirt(pPage->HCPhysGCPhys, &pv);
+#else
+                rc = GMMR0PageIdToVirt(pGVM, pPage->idPage, &pv);
+#endif
+                AssertMsgRCReturn(rc, ("idPage=%#x HCPhys=%RHp rc=%Rrc\n", pPage->idPage, pPage->HCPhysGCPhys, rc), rc);
+
+                ASMMemZeroPage(pv);
+                pPage->fZeroed = true;
+            }
+#ifdef VBOX_STRICT
+            else
+            {
+                void *pv = NULL;
+# ifdef VBOX_WITH_LINEAR_HOST_PHYS_MEM
+                rc = SUPR0HCPhysToVirt(pPage->HCPhysGCPhys, &pv);
+# else
+                rc = GMMR0PageIdToVirt(pGVM, pPage->idPage, &pv);
+# endif
+                AssertMsgRCReturn(rc, ("idPage=%#x HCPhys=%RHp rc=%Rrc\n", pPage->idPage, pPage->HCPhysGCPhys, rc), rc);
+                AssertReturn(ASMMemIsZeroPage(pv), VERR_PGM_HANDY_PAGE_IPE);
+            }
+#endif
+            Log3(("PGMR0PhysAllocateHandyPages: idPage=%#x HCPhys=%RGp\n", pPage->idPage, pPage->HCPhysGCPhys));
+        }
     }
     else
     {
-        LogRel(("PGMR0PhysAllocateHandyPages: rc=%Rrc iFirst=%d cPages=%d\n", rc, iFirst, cPages));
+        /*
+         * We should never get here unless there is a genuine shortage of
+         * memory (or some internal error). Flag the error so the VM can be
+         * suspended ASAP and the user informed. If we're totally out of
+         * handy pages we will return failure.
+         */
+        /* Report the failure. */
+        LogRel(("PGM: Failed to procure handy pages; rc=%Rrc cHandyPages=%#x\n"
+                "     cAllPages=%#x cPrivatePages=%#x cSharedPages=%#x cZeroPages=%#x\n",
+                rc, pGVM->pgm.s.cHandyPages,
+                pGVM->pgm.s.cAllPages, pGVM->pgm.s.cPrivatePages, pGVM->pgm.s.cSharedPages, pGVM->pgm.s.cZeroPages));
+
+        GMMMEMSTATSREQ Stats = { { SUPVMMR0REQHDR_MAGIC, sizeof(Stats) }, 0, 0, 0, 0, 0 };
+        if (RT_SUCCESS(GMMR0QueryMemoryStatsReq(pGVM, idCpu, &Stats)))
+            LogRel(("GMM: Statistics:\n"
+                    "     Allocated pages: %RX64\n"
+                    "     Free      pages: %RX64\n"
+                    "     Shared    pages: %RX64\n"
+                    "     Maximum   pages: %RX64\n"
+                    "     Ballooned pages: %RX64\n",
+                    Stats.cAllocPages, Stats.cFreePages, Stats.cSharedPages, Stats.cMaxPages, Stats.cBalloonedPages));
+
+        if (   rc != VERR_NO_MEMORY
+            && rc != VERR_NO_PHYS_MEMORY
+            && rc != VERR_LOCK_FAILED)
+            for (uint32_t iPage = 0; iPage < RT_ELEMENTS(pGVM->pgm.s.aHandyPages); iPage++)
+                LogRel(("PGM: aHandyPages[#%#04x] = {.HCPhysGCPhys=%RHp, .idPage=%#08x, .idSharedPage=%#08x}\n",
+                        iPage, pGVM->pgm.s.aHandyPages[iPage].HCPhysGCPhys, pGVM->pgm.s.aHandyPages[iPage].idPage,
+                        pGVM->pgm.s.aHandyPages[iPage].idSharedPage));
+
+        /* Set the FFs and adjust rc. */
+        VM_FF_SET(pGVM, VM_FF_PGM_NEED_HANDY_PAGES);
         VM_FF_SET(pGVM, VM_FF_PGM_NO_MEMORY);
+        if (!fRing3)
+            if (   rc == VERR_NO_MEMORY
+                || rc == VERR_NO_PHYS_MEMORY
+                || rc == VERR_LOCK_FAILED
+                || rc == VERR_MAP_FAILED)
+                rc = VINF_EM_NO_MEMORY;
     }
 
     LogFlow(("PGMR0PhysAllocateHandyPages: cPages=%d rc=%Rrc\n", cPages, rc));
+    return rc;
+}
+
+
+/**
+ * Worker function for PGMR3PhysAllocateHandyPages / VMMR0_DO_PGM_ALLOCATE_HANDY_PAGES.
+ *
+ * @returns The following VBox status codes.
+ * @retval  VINF_SUCCESS on success. FF cleared.
+ * @retval  VINF_EM_NO_MEMORY if we're out of memory. The FF is set in this case.
+ *
+ * @param   pGVM        The global (ring-0) VM structure.
+ * @param   idCpu       The ID of the calling EMT.
+ *
+ * @thread  EMT(idCpu)
+ *
+ * @remarks Must be called from within the PGM critical section. The caller
+ *          must clear the new pages.
+ */
+VMMR0_INT_DECL(int) PGMR0PhysAllocateHandyPages(PGVM pGVM, VMCPUID idCpu)
+{
+    /*
+     * Validate inputs.
+     */
+    AssertReturn(idCpu < pGVM->cCpus, VERR_INVALID_CPU_ID); /* caller already checked this, but just to be sure. */
+    AssertReturn(pGVM->aCpus[idCpu].hEMT == RTThreadNativeSelf(), VERR_NOT_OWNER);
+
+    /*
+     * Enter the PGM lock and call the worker.
+     */
+    int rc = PGM_LOCK(pGVM);
+    if (RT_SUCCESS(rc))
+    {
+        rc = pgmR0PhysAllocateHandyPages(pGVM, idCpu, true /*fRing3*/);
+        PGM_UNLOCK(pGVM);
+    }
     return rc;
 }

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)