Changeset 14494 in vbox for trunk/src

Timestamp:

Nov 23, 2008 10:49:36 PM (16 years ago)

Author:

vboxsync

Message:

#1865: PGMR0DynMap - retry with smaller segments if one big one is rejected.

File:

• trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp (modified) (21 diffs)

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

@@ -44 +44 @@
 /** The max size of the mapping cache (in pages). */
 #define PGMR0DYNMAP_MAX_PAGES               ((8*_1M) >> PAGE_SHIFT)
-/* * The max segment size. */
-/** @todo #define PGMR0DYNMAP_SEG_MAX_PAGES           (_1M >> PAGE_SHIFT) */
+/** The small segment size that is adopted on out-of-memory conditions with a
+ * single big segment. */
+#define PGMR0DYNMAP_SMALL_SEG_PAGES         128
 /** The number of pages we reserve per CPU. */
 #define PGMR0DYNMAP_PAGES_PER_CPU           64
@@ -140 +141 @@
     /** The current load. */
     uint32_t                    cLoad;
-    /** The max load.
+    /** The max load ever.
      * This is maintained to get trigger adding of more mapping space. */
     uint32_t                    cMaxLoad;
@@ -203 +204 @@
 static void pgmR0DynMapReleasePage(PPGMR0DYNMAP pThis, uint32_t iPage, uint32_t cRefs);
 static int  pgmR0DynMapSetup(PPGMR0DYNMAP pThis);
-static int  pgmR0DynMapGrow(PPGMR0DYNMAP pThis);
+static int  pgmR0DynMapExpand(PPGMR0DYNMAP pThis);
 static void pgmR0DynMapTearDown(PPGMR0DYNMAP pThis);
 
@@ -320 +321 @@
      */
     VMCPUID idCpu = pVM->cCPUs;
+    AssertReturn(idCpu > 0 && idCpu <= VMCPU_MAX_CPU_COUNT, VERR_INTERNAL_ERROR);
     while (idCpu-- > 0)
     {
@@ -341 +343 @@
 
     /*
-     * Reference and if necessary setup or grow the cache.
+     * Reference and if necessary setup or expand the cache.
      */
     PPGMR0DYNMAP pThis = g_pPGMR0DynMap;
@@ -352 +354 @@
         rc = pgmR0DynMapSetup(pThis);
     else if (pThis->cMaxLoad > PGMR0DYNMAP_CALC_OVERLOAD(pThis->cPages))
-        rc = pgmR0DynMapGrow(pThis);
-    if (RT_FAILURE(rc))
+        rc = pgmR0DynMapExpand(pThis);
+    if (RT_SUCCESS(rc))
+        pVM->pgm.s.pvR0DynMapUsed = pThis;
+    else
         pThis->cUsers--;
 
@@ -402 +406 @@
                 while (j-- > 0)
                 {
-                    int32_t cRefs = pSet->aEntries[j].cRefs;
+                    int32_t  cRefs = pSet->aEntries[j].cRefs;
                     uint32_t iPage = pSet->aEntries[j].iPage;
                     LogRel(("PGMR0DynMapTermVM: %d dangling refs to %#x\n", cRefs, iPage));
@@ -408 +412 @@
                         pgmR0DynMapReleasePage(pThis, iPage, cRefs);
                     else
-                        AssertMsgFailed(("cRefs=%d iPage=%#x cPages=%u\n", cRefs, iPage, pThis->cPages));
+                        AssertLogRelMsgFailed(("cRefs=%d iPage=%#x cPages=%u\n", cRefs, iPage, pThis->cPages));
 
                     pSet->aEntries[j].iPage = UINT16_MAX;
@@ -415 +419 @@
                 pSet->cEntries = PGMMAPSET_CLOSED;
             }
+            else
+                AssertMsg(j == PGMMAPSET_CLOSED, ("cEntries=%#x\n", j));
 
             j = RT_ELEMENTS(pSet->aEntries);
@@ -433 +439 @@
     }
     else
-        AssertMsgFailed(("pvR0DynMapUsed=%p pThis=%p\n", pVM->pgm.s.pvR0DynMapUsed, pThis));
+        AssertLogRelMsgFailed(("pvR0DynMapUsed=%p pThis=%p\n", pVM->pgm.s.pvR0DynMapUsed, pThis));
 
     RTSemFastMutexRelease(pThis->hInitLock);
@@ -445 +451 @@
  * @returns Number of pages.
  * @param   pThis       The dynamic mapping cache instance.
- */
-static uint32_t pgmR0DynMapCalcNewSize(PPGMR0DYNMAP pThis)
-{
-    /*
-     * cCpus * PGMR0DYNMAP_PAGES_PER_CPU.
-     */
-    RTCPUID     cCpus = RTMpGetCount();
-    uint32_t    cPages = cCpus * PGMR0DYNMAP_PAGES_PER_CPU;
+ * @param   pcMinPages  The minimal size in pages.
+ */
+static uint32_t pgmR0DynMapCalcNewSize(PPGMR0DYNMAP pThis, uint32_t *pcMinPages)
+{
+    Assert(pThis->cPages <= PGMR0DYNMAP_MAX_PAGES);
+
+    /* cCpus * PGMR0DYNMAP_PAGES_PER_CPU (/2). */
+    RTCPUID     cCpus     = RTMpGetCount();
+    uint32_t    cPages    = cCpus * PGMR0DYNMAP_PAGES_PER_CPU;
+    uint32_t    cMinPages = cCpus * (PGMR0DYNMAP_PAGES_PER_CPU / 2);
 
     /* adjust against cMaxLoad. */
@@ -462 +470 @@
         cPages += PGMR0DYNMAP_PAGES_PER_CPU;
 
-    /* adjust against max size. */
+    if (pThis->cMaxLoad > cMinPages)
+        cMinPages = pThis->cMaxLoad;
+
+    /* adjust against max and current size. */
+    if (cPages < pThis->cPages)
+        cPages = pThis->cPages;
     if (cPages > PGMR0DYNMAP_MAX_PAGES)
         cPages = PGMR0DYNMAP_MAX_PAGES;
 
+    if (cMinPages < pThis->cPages)
+        cMinPages = pThis->cPages;
+    if (cMinPages > PGMR0DYNMAP_MAX_PAGES)
+        cMinPages = PGMR0DYNMAP_MAX_PAGES;
+
+    *pcMinPages = cMinPages;
     return cPages;
 }
@@ -577 +596 @@
  * and restarting from CR3 for every change.
  *
- * @returns VBox status code, VERR_TRY_AGAIN if we changed any mappings and had
+ * @returns VBox status code, VINF_TRY_AGAIN if we changed any mappings and had
  *          to re-enable interrupts.
  * @param   pThis       The dynamic mapping cache instance.
@@ -589 +608 @@
                                         PPGMR0DYNMAPSEG pSeg, uint32_t cMaxPTs, void **ppvPTE)
 {
+    Assert(!(ASMGetFlags() & X86_EFL_IF));
+
     void           *pvEntry = NULL;
     X86PGPAEUINT    uEntry = ASMGetCR3();
@@ -612 +633 @@
             if (RT_SUCCESS(rc))
             {
-                rc = RTR0MemObjMapKernel(&pPgLvl->a[i].hMapObj, pPgLvl->a[i].hMemObj, &pPgLvl->a[i].u.pv, 0, RTMEM_PROT_WRITE | RTMEM_PROT_READ);
+                rc = RTR0MemObjMapKernel(&pPgLvl->a[i].hMapObj, pPgLvl->a[i].hMemObj, &pPgLvl->a[i].u.pv, 0 /* cbAlignment */,
+                                         RTMEM_PROT_WRITE | RTMEM_PROT_READ);
                 if (RT_SUCCESS(rc))
                 {
@@ -619 +641 @@
                         pSeg->ahMemObjPTs[pSeg->cPTs++] = pPgLvl->a[i].hMemObj;
                     ASMIntDisable();
-                    return VERR_TRY_AGAIN;
+                    return VINF_TRY_AGAIN;
                 }
 
@@ -627 +649 @@
                 pPgLvl->a[i].hMemObj = NIL_RTR0MEMOBJ;
             pPgLvl->a[i].HCPhys = NIL_RTHCPHYS;
-            AssertReturn(rc != VERR_TRY_AGAIN, VERR_INTERNAL_ERROR);
             return rc;
         }
@@ -739 +760 @@
                 rc = pgmR0DynMapPagingArrayMapPte(pThis, &PgLvl, pbPage, pSeg, cMaxPTs,
                                                   &pThis->paPages[iPage].uPte.pv);
-            while (rc == VERR_TRY_AGAIN);
+            while (rc == VINF_TRY_AGAIN);
             if (RT_FAILURE(rc))
                 break;
-            rc = VINF_SUCCESS;
 
             /* Save the PTE. */
@@ -802 +822 @@
      * Calc the size and add a segment of that size.
      */
-    uint32_t cPages = pgmR0DynMapCalcNewSize(pThis);
+    uint32_t cMinPages;
+    uint32_t cPages = pgmR0DynMapCalcNewSize(pThis, &cMinPages);
     AssertReturn(cPages, VERR_INTERNAL_ERROR);
-    return pgmR0DynMapAddSeg(pThis, cPages);
+    int rc = pgmR0DynMapAddSeg(pThis, cPages);
+    if (rc == VERR_NO_MEMORY)
+    {
+        /*
+         * Try adding smaller segments.
+         */
+        do
+            rc = pgmR0DynMapAddSeg(pThis, PGMR0DYNMAP_SMALL_SEG_PAGES);
+        while (RT_SUCCESS(rc) && pThis->cPages < cPages);
+        if (rc == VERR_NO_MEMORY && pThis->cPages >= cMinPages)
+            rc = VINF_SUCCESS;
+        if (rc == VERR_NO_MEMORY)
+        {
+            if (pThis->cPages)
+                pgmR0DynMapTearDown(pThis);
+            rc = VERR_PGM_DYNMAP_SETUP_ERROR;
+        }
+    }
+    Assert(ASMGetFlags() & X86_EFL_IF);
+    return rc;
 }
 
@@ -814 +854 @@
  * @param   pThis       The dynamic mapping cache instance.
  */
-static int pgmR0DynMapGrow(PPGMR0DYNMAP pThis)
+static int pgmR0DynMapExpand(PPGMR0DYNMAP pThis)
 {
     /*
      * Calc the new target size and add a segment of the appropriate size.
      */
-    uint32_t cPages = pgmR0DynMapCalcNewSize(pThis);
+    uint32_t cMinPages;
+    uint32_t cPages = pgmR0DynMapCalcNewSize(pThis, &cMinPages);
     if (pThis->cPages >= cPages)
         return VINF_SUCCESS;
 
     uint32_t cAdd = cPages - pThis->cPages;
-    return pgmR0DynMapAddSeg(pThis, cAdd);
+    int rc = pgmR0DynMapAddSeg(pThis, cAdd);
+    if (rc == VERR_NO_MEMORY)
+    {
+        /*
+         * Try adding smaller segments.
+         */
+        do
+            rc = pgmR0DynMapAddSeg(pThis, PGMR0DYNMAP_SMALL_SEG_PAGES);
+        while (RT_SUCCESS(rc) && pThis->cPages < cPages);
+        if (rc == VERR_NO_MEMORY && pThis->cPages >= cMinPages)
+            rc = VINF_SUCCESS;
+        if (rc == VERR_NO_MEMORY)
+            rc = VERR_PGM_DYNMAP_EXPAND_ERROR;
+    }
+    Assert(ASMGetFlags() & X86_EFL_IF);
+    return rc;
 }
 
@@ -912 +968 @@
             pSeg->ahMemObjPTs[iPT] = NIL_RTR0MEMOBJ;
         }
-        rc = RTR0MemObjFree(pSeg->hMemObj,   true /* fFreeMappings */); AssertRC(rc);
+        rc = RTR0MemObjFree(pSeg->hMemObj, true /* fFreeMappings */); AssertRC(rc);
         pSeg->hMemObj   = NIL_RTR0MEMOBJ;
         pSeg->pNext     = NULL;