Changeset 11416 in vbox

Timestamp:

Aug 14, 2008 8:34:45 AM (17 years ago)

Author:

vboxsync

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

34732

Message:

InvalidatePage: check 4 PDPEs for PAE guest mode. (shouldn't be necessary though)

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -883 +883 @@
     PX86PDEPAE      pPdeDst   = &pVM->pgm.s.CTXMID(ap,PaePDs[0])->a[iPDDst];
     PX86PDPT        pPdptDst  = pVM->pgm.s.CTXMID(p,PaePDPT);   NOREF(pPdptDst);
+
+    /* If the shadow PDPE isn't present, then skip the invalidate. */
+    if (!pPdptDst->a[iPdpte].n.u1Present)
+    {
+        Assert(!(pPdptDst->a[iPdpte].u & PGM_PLXFLAGS_MAPPING));
+        STAM_COUNTER_INC(&pVM->pgm.s.CTXMID(Stat,InvalidatePageSkipped));
+        return VINF_SUCCESS;
+    }
+
 # else /* PGM_SHW_TYPE == PGM_TYPE_AMD64 */
     /* PML4 */
@@ -935 +944 @@
 #  if PGM_GST_TYPE == PGM_TYPE_PAE
     PX86PDPAE       pPDSrc      = pgmGstGetPaePDPtr(&pVM->pgm.s, GCPtrPage, &iPDSrc);
+    X86PDPE         PdpeSrc     = CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[iPdpte];
 #  else /* AMD64 */
     PX86PML4E       pPml4eSrc;
@@ -1069 +1079 @@
 
 # if PGM_GST_TYPE == PGM_TYPE_PAE
-
+    /* Note: This shouldn't actually be necessary as we monitor the PDPT page for changes. */
+    if (!pPDSrc)
+    {
+        /* Guest PDPE not present */
+        PX86PDPAE  pPDPAE  = pVM->pgm.s.CTXMID(ap,PaePDs)[0]; /* root of the 2048 PDE array */
+        PX86PDEPAE pPDEDst = &pPDPAE->a[iPdpte * X86_PG_PAE_ENTRIES];
+        PPGMPOOL   pPool   = pVM->pgm.s.CTXSUFF(pPool);
+
+        Assert(!(CTXSUFF(pVM->pgm.s.pGstPaePDPT)->a[iPdpte].n.u1Present));
+        LogFlow(("InvalidatePage: guest PDPE %d not present; clear shw pdpe\n", iPdpte));
+            /* for each page directory entry */
+            for (unsigned iPD = 0; iPD < X86_PG_PAE_ENTRIES; iPD++)
+            {
+                if (   pPDEDst[iPD].n.u1Present
+                    && !(pPDEDst[iPD].u & PGM_PDFLAGS_MAPPING))
+                {
+                pgmPoolFreeByPage(pPool, pgmPoolGetPage(pPool, pPDEDst[iPD].u & SHW_PDE_PG_MASK), SHW_POOL_ROOT_IDX, iPdpte * X86_PG_PAE_ENTRIES + iPD);
+                pPDEDst[iPD].u = 0;
+                }
+            }
+        if (!(pPdptDst->a[iPdpte].u & PGM_PLXFLAGS_MAPPING))
+                pPdptDst->a[iPdpte].n.u1Present = 0;
+        PGM_INVL_GUEST_TLBS();
+    }
+    Assert((PdpeSrc.u & X86_PDPE_PG_MASK) == pVM->pgm.s.aGCPhysGstPaePDsMonitored[iPdpte]);
 # endif