Changeset 17612 in vbox

Timestamp:

Mar 10, 2009 10:30:18 AM (16 years ago)

Author:

vboxsync

Message:

Always clear pdpt flag when freeing the hypervisor mappings

File:

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

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

@@ -296 +296 @@
                     }
                 }
-                AssertFatal(pShwPaePd);
+                Assert(pShwPaePd);
 
                 PPGMPOOLPAGE pPoolPagePd = pgmPoolGetPageByHCPhys(pVM, pShwPdpt->a[iPdPt].u & X86_PDPE_PG_MASK);
@@ -411 +411 @@
                 pShwPaePd = pgmShwGetPaePDPtr(&pVM->pgm.s, pShwPdpt, (iPdpt << X86_PDPT_SHIFT));
 
+                /* Clear the PGM_PDFLAGS_MAPPING flag for the page directory pointer entry. (legacy PAE guest mode) */
+                pShwPdpt->a[iPdpt].u &= ~PGM_PLXFLAGS_MAPPING;
+
                 if (pCurrentShwPdpt)
                 {
                     /* If the page directory of the old CR3 is reused in the new one, then don't clear the hypervisor mappings. */
                     if ((pCurrentShwPdpt->a[iPdpt].u & X86_PDPE_PG_MASK) == (pShwPdpt->a[iPdpt].u & X86_PDPE_PG_MASK))
+                    {
+                        LogFlow(("pgmMapClearShadowPDEs: Pdpe %d reused -> don't clear hypervisor mappings!\n", iPdpt));
                         break;
+                    }
                 }
                 AssertFatal(pShwPaePd);
@@ -427 +433 @@
                 Assert(!pShwPaePd->a[iPDE].n.u1Present || (pShwPaePd->a[iPDE].u & PGM_PDFLAGS_MAPPING));
                 pShwPaePd->a[iPDE].u = 0;
-                /* Clear the PGM_PDFLAGS_MAPPING flag for the page directory pointer entry. (legacy PAE guest mode) */
-                pShwPdpt->a[iPdpt].u &= ~PGM_PLXFLAGS_MAPPING;
 
                 PPGMPOOLPAGE pPoolPagePd = pgmPoolGetPageByHCPhys(pVM, pShwPdpt->a[iPdpt].u & X86_PDPE_PG_MASK);