Changeset 14494

Timestamp:

11/23/08 23:49:36 (2 months ago)

Author:

vboxsync

Message:

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

Files:

• trunk/include/VBox/err.h (modified) (1 diff)
• trunk/include/iprt/err.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp (modified) (21 diffs)

trunk/include/VBox/err.h

@@ -419 +419 @@
-/** The auto usage cache for the dynamic mapping set is full. */
-#define VERR_PGM_DYNMAP_FULL_SET                (-1630)
+/** The initialization of the dynamic mapping cache failed. */
+#define VERR_PGM_DYNMAP_SETUP_ERROR             (-1631)
+/** The expanding of the dynamic mapping cache failed. */
+#define VERR_PGM_DYNMAP_EXPAND_ERROR            (-1632)
-
-/** @} */

trunk/include/iprt/err.h

@@ -409 +409 @@
-/** Retry the operation. */
-#define VERR_TRY_AGAIN                      (-52)
+/** Retry the operation. */
+#define VINF_TRY_AGAIN                      52
-/** Generic parse error. */
-#define VERR_PARSE_ERROR                    (-53)

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 number of pages we reserve per CPU. */
-#define PGMR0DYNMAP_PAGES_PER_CPU           64
@@ -140 +141 @@
-    /** The current load. */
-    uint32_t                    cLoad;
-
+ 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);
-Grow
+Expand
-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 @@
-
-    /*
-grow
+expand
-     */
-    PPGMR0DYNMAP pThis = g_pPGMR0DynMap;
@@ -352 +354 @@
-        rc = pgmR0DynMapSetup(pThis);
-    else if (pThis->cMaxLoad > PGMR0DYNMAP_CALC_OVERLOAD(pThis->cPages))
-
-
+
+
+
+
-        pThis->cUsers--;
-
@@ -402 +406 @@
-                while (j-- > 0)
-                {
-
+ 
-                    uint32_t iPage = pSet->aEntries[j].iPage;
-                    LogRel(("PGMR0DynMapTermVM: %d dangling refs to %#x\n", cRefs, iPage));
@@ -408 +412 @@
-                        pgmR0DynMapReleasePage(pThis, iPage, cRefs);
-                    else
-
+LogRel
-
-                    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
-
+LogRel
-
-    RTSemFastMutexRelease(pThis->hInitLock);
@@ -445 +451 @@
- * @returns Number of pages.
- * @param   pThis       The dynamic mapping cache instance.
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    /* adjust against cMaxLoad. */
@@ -462 +470 @@
-        cPages += PGMR0DYNMAP_PAGES_PER_CPU;
-
-
+
+
+
+
+
+
-    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.
- *
-ERR
+INF
- *          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))
-            {
-
+
+
-                if (RT_SUCCESS(rc))
-                {
@@ -619 +641 @@
-                        pSeg->ahMemObjPTs[pSeg->cPTs++] = pPgLvl->a[i].hMemObj;
-                    ASMIntDisable();
-ERR
+INF
-                }
-
@@ -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);
-ERR
+INF
-            if (RT_FAILURE(rc))
-                break;
-            rc = VINF_SUCCESS;
-
-            /* Save the PTE. */
@@ -802 +822 @@
-     * Calc the size and add a segment of that size.
-     */
-
+
+
-    AssertReturn(cPages, VERR_INTERNAL_ERROR);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -814 +854 @@
- * @param   pThis       The dynamic mapping cache instance.
- */
-Grow
+Expand
-{
-    /*
-     * Calc the new target size and add a segment of the appropriate size.
-     */
-
+
+
-    if (pThis->cPages >= cPages)
-        return VINF_SUCCESS;
-
-    uint32_t cAdd = cPages - pThis->cPages;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -912 +968 @@
-            pSeg->ahMemObjPTs[iPT] = NIL_RTR0MEMOBJ;
-        }
-  
+
-        pSeg->hMemObj   = NIL_RTR0MEMOBJ;
-        pSeg->pNext     = NULL;