Changeset 14517 in vbox

Timestamp:

Nov 24, 2008 1:41:39 PM (16 years ago)

Author:

vboxsync

Message:

PGMR0DynMap: fixes

File:

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

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

@@ -215 +215 @@
 VMMR0DECL(int) PGMR0DynMapInit(void)
 {
-#ifndef DEBUG_bird
-    return VINF_SUCCESS;
-#else
     Assert(!g_pPGMR0DynMap);
 
@@ -264 +261 @@
     RTMemFree(pThis);
     return rc;
-#endif
 }
 
@@ -273 +269 @@
 VMMR0DECL(void) PGMR0DynMapTerm(void)
 {
-#ifdef DEBUG_bird
     /*
      * Destroy the cache.
@@ -302 +297 @@
         RTMemFree(pThis);
     }
-#endif
 }
 
@@ -453 +447 @@
     /* cCpus * PGMR0DYNMAP_PAGES_PER_CPU (/2). */
     RTCPUID     cCpus     = RTMpGetCount();
+    AssertReturn(cCpus > 0 && cCpus <= RTCPUSET_MAX_CPUS, 0);
     uint32_t    cPages    = cCpus * PGMR0DYNMAP_PAGES_PER_CPU;
     uint32_t    cMinPages = cCpus * (PGMR0DYNMAP_PAGES_PER_CPU / 2);
@@ -461 +456 @@
         pThis->cMaxLoad = 0;
 
-    while (pThis->cMaxLoad < PGMR0DYNMAP_CALC_OVERLOAD(cPages))
+    while (pThis->cMaxLoad > PGMR0DYNMAP_CALC_OVERLOAD(cPages))
         cPages += PGMR0DYNMAP_PAGES_PER_CPU;
 
@@ -478 +473 @@
         cMinPages = PGMR0DYNMAP_MAX_PAGES;
 
+    Assert(cMinPages);
     *pcMinPages = cMinPages;
     return cPages;
@@ -627 +623 @@
             if (RT_SUCCESS(rc))
             {
-                rc = RTR0MemObjMapKernel(&pPgLvl->a[i].hMapObj, pPgLvl->a[i].hMemObj, &pPgLvl->a[i].u.pv, 0 /* cbAlignment */,
+                rc = RTR0MemObjMapKernel(&pPgLvl->a[i].hMapObj, pPgLvl->a[i].hMemObj,
+                                         (void *)-1 /* pvFixed */, 0 /* cbAlignment */,
                                          RTMEM_PROT_WRITE | RTMEM_PROT_READ);
                 if (RT_SUCCESS(rc))
                 {
+                    pPgLvl->a[i].u.pv   = RTR0MemObjAddress(pPgLvl->a[i].hMapObj);
+                    AssertMsg(((uintptr_t)pPgLvl->a[i].u.pv & ~(uintptr_t)PAGE_OFFSET_MASK), ("%p\n", pPgLvl->a[i].u.pv));
                     pPgLvl->a[i].HCPhys = HCPhys;
                     if (i + 1 == pPgLvl->cLevels)
@@ -855 +854 @@
     uint32_t cMinPages;
     uint32_t cPages = pgmR0DynMapCalcNewSize(pThis, &cMinPages);
+    AssertReturn(cPages, VERR_INTERNAL_ERROR);
     if (pThis->cPages >= cPages)
         return VINF_SUCCESS;