Changeset 17611 in vbox for trunk

Timestamp:

Mar 10, 2009 10:15:50 AM (16 years ago)

Author:

vboxsync

Message:

Fixed PAE PDPT dereferencing.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -3499 +3499 @@
 }
 
-
-/**
- * Clear references to shadowed pages in a 64-bit page directory pointer table.
+/**
+ * Clear references to shadowed pages in a PAE page directory pointer table.
  *
  * @param   pPool       The pool.
@@ -3507 +3506 @@
  * @param   pShwPDPT   The shadow page directory pointer table (mapping of the page).
  */
-DECLINLINE(void) pgmPoolTrackDerefPDPT64Bit(PPGMPOOL pPool, PPGMPOOLPAGE pPage, PX86PDPT pShwPDPT)
-{
-    for (unsigned i = 0; i < RT_ELEMENTS(pShwPDPT->a); i++)
+DECLINLINE(void) pgmPoolTrackDerefPDPTPae(PPGMPOOL pPool, PPGMPOOLPAGE pPage, PX86PDPT pShwPDPT)
+{
+    for (unsigned i = 0; i < X86_PG_PAE_PDPE_ENTRIES; i++)
     {
         if (    pShwPDPT->a[i].n.u1Present
             &&  !(pShwPDPT->a[i].u & PGM_PLXFLAGS_MAPPING)
            )
+        {
+            PPGMPOOLPAGE pSubPage = (PPGMPOOLPAGE)RTAvloHCPhysGet(&pPool->HCPhysTree, pShwPDPT->a[i].u & X86_PDPE_PG_MASK);
+            if (pSubPage)
+                pgmPoolTrackFreeUser(pPool, pSubPage, pPage->idx, i);
+            else
+                AssertFatalMsgFailed(("%RX64\n", pShwPDPT->a[i].u & X86_PDPE_PG_MASK));
+        }
+    }
+}
+
+
+/**
+ * Clear references to shadowed pages in a 64-bit page directory pointer table.
+ *
+ * @param   pPool       The pool.
+ * @param   pPage       The page.
+ * @param   pShwPDPT   The shadow page directory pointer table (mapping of the page).
+ */
+DECLINLINE(void) pgmPoolTrackDerefPDPT64Bit(PPGMPOOL pPool, PPGMPOOLPAGE pPage, PX86PDPT pShwPDPT)
+{
+    for (unsigned i = 0; i < RT_ELEMENTS(pShwPDPT->a); i++)
+    {
+        Assert(!(pShwPDPT->a[i].u & PGM_PLXFLAGS_MAPPING));
+        if (pShwPDPT->a[i].n.u1Present)
         {
             PPGMPOOLPAGE pSubPage = (PPGMPOOLPAGE)RTAvloHCPhysGet(&pPool->HCPhysTree, pShwPDPT->a[i].u & X86_PDPE_PG_MASK);
@@ -3715 +3738 @@
         case PGMPOOLKIND_PAE_PDPT:
         case PGMPOOLKIND_PAE_PDPT_PHYS:
+            pgmPoolTrackDerefPDPTPae(pPool, pPage, (PX86PDPT)pvShw);
+            break;
+
         case PGMPOOLKIND_64BIT_PDPT_FOR_PHYS:
         case PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT: