Changeset 14822 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 30, 2008 5:36:38 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

40148

Message:

PGMR0DynMap: Fixed bug in previous pgmR0DynMapPageSlow bug fix. Bad index calculation. it was responsible for guest & host stability issues (wrong page & zone/heap corruption).

File:

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

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

@@ -75 +75 @@
 #if 0
 /* Assertions causes panics if preemption is disabled, this can be used to work aroudn that. */
-#define RTSpinlockAcquire(a,b) do {} while (0)
-#define RTSpinlockRelease(a,b) do {} while (0)
+//#define RTSpinlockAcquire(a,b) do {} while (0)
+//#define RTSpinlockRelease(a,b) do {} while (0)
 #endif
 
@@ -318 +318 @@
         g_pPGMR0DynMap = NULL;
 
+        /* This should *never* happen, but in case it does try not to leak memory. */
         AssertLogRelMsg(!pThis->cUsers && !pThis->paPages && !pThis->pvSavedPTEs && !pThis->cPages,
                         ("cUsers=%d paPages=%p pvSavedPTEs=%p cPages=%#x\n",
                          pThis->cUsers, pThis->paPages, pThis->pvSavedPTEs, pThis->cPages));
+        if (pThis->paPages)
+            pgmR0DynMapTearDown(pThis);
 
         /* Free the associated resources. */
@@ -363 +366 @@
      * Do we need the cache? Skip the last bit if we don't.
      */
-#if 1
     if (!VMMIsHwVirtExtForced(pVM))
         return VINF_SUCCESS;
-#endif
 
     /*
@@ -1066 +1067 @@
             while (!ASMAtomicCmpXchgExU32(&paPages[iPage].uPte.pLegacy->u, uNew, uOld, &uOld))
                 AssertMsgFailed(("uOld=%#x uOld2=%#x uNew=%#x\n", uOld, uOld2, uNew));
+            Assert(paPages[iPage].uPte.pLegacy->u == paSavedPTEs[iPage]);
         }
     }
@@ -1078 +1080 @@
             while (!ASMAtomicCmpXchgExU64(&paPages[iPage].uPte.pPae->u, uNew, uOld, &uOld))
                 AssertMsgFailed(("uOld=%#llx uOld2=%#llx uNew=%#llx\n", uOld, uOld2, uNew));
+            Assert(paPages[iPage].uPte.pPae->u == paSavedPTEs[iPage]);
         }
     }
@@ -1120 +1123 @@
     pThis->cPages = 0;
     pThis->cLoad = 0;
+    pThis->cGuardPages = 0;
 }
 
@@ -1175 +1179 @@
         iFreePage = iPage;
     else if (!paPages[(iPage + 1) % cPages].cRefs)
-        iFreePage = iPage + 1;
+        iFreePage   = (iPage + 1) % cPages;
     else if (!paPages[(iPage + 2) % cPages].cRefs)
-        iFreePage = iPage + 2;
+        iFreePage   = (iPage + 2) % cPages;
     else if (!paPages[(iPage + 3) % cPages].cRefs)
-        iFreePage = iPage + 3;
+        iFreePage   = (iPage + 3) % cPages;
     else if (!paPages[(iPage + 4) % cPages].cRefs)
-        iFreePage = iPage + 4;
+        iFreePage   = (iPage + 4) % cPages;
     else
     {
@@ -1201 +1205 @@
         }
     }
+    Assert(iFreePage < cPages);
 
     /*
@@ -1217 +1222 @@
         while (!ASMAtomicCmpXchgExU32(&paPages[iFreePage].uPte.pLegacy->u, uNew, uOld, &uOld))
             AssertMsgFailed(("uOld=%#x uOld2=%#x uNew=%#x\n", uOld, uOld2, uNew));
+        Assert(paPages[iPage].uPte.pLegacy->u == uNew);
     }
     else
@@ -1227 +1233 @@
         while (!ASMAtomicCmpXchgExU64(&paPages[iFreePage].uPte.pPae->u, uNew, uOld, &uOld))
             AssertMsgFailed(("uOld=%#llx uOld2=%#llx uNew=%#llx\n", uOld, uOld2, uNew));
+        Assert(paPages[iPage].uPte.pPae->u == uNew);
         /*Log6(("pgmR0DynMapPageSlow: #%x - %RHp %p %#llx\n", iFreePage, HCPhys, paPages[iFreePage].pvPage, uNew));*/
     }