Changeset 28639 in vbox

Timestamp:

Apr 23, 2010 12:46:38 PM (15 years ago)

Author:

vboxsync

Message:

Keep track of page table entry indices and deal with multiple physical page references in one page table.

Location:

trunk/src/VBox/VMM

Files:

• PGMInline.h (modified) (1 diff)
• PGMInternal.h (modified) (7 diffs)
• PGMPool.cpp (modified) (2 diffs)
• VMMAll/PGMAllBth.h (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (23 diffs)

trunk/src/VBox/VMM/PGMInline.h

@@ -1511 +1511 @@
     {
         Assert(pPoolPage->idx == PGM_PAGE_GET_TD_IDX(pPhysPage));
+        /* Invalidate the tracking data. */
         PGM_PAGE_SET_TRACKING(pPhysPage, 0);
     }

trunk/src/VBox/VMM/PGMInternal.h

@@ -635 +635 @@
     /** The page state.
      * Only 3 bits are really needed for this. */
-    uint8_t     uStateY;
+    uint16_t    uStateY   : 3;
     /** The page type (PGMPAGETYPE).
      * Only 3 bits are really needed for this. */
-    uint8_t     uTypeY;
+    uint16_t    uTypeY    : 3;
+    /** PTE index for usage tracking (page pool). */
+    uint16_t    uPteIdx   : 10;
     /** Usage tracking (page pool). */
     uint16_t    u16TrackingY;
@@ -664 +666 @@
         (pPage)->uStateY             = 0; \
         (pPage)->uTypeY              = 0; \
+        (pPage)->uPteIdx             = 0; \
         (pPage)->u16MiscY.u          = 0; \
         (pPage)->u16TrackingY        = 0; \
@@ -681 +684 @@
         (pPage)->uStateY             = (_uState); \
         (pPage)->uTypeY              = (_uType); \
+        (pPage)->uPteIdx             = 0; \
         (pPage)->u16MiscY.u          = 0; \
         (pPage)->u16TrackingY        = 0; \
@@ -799 +803 @@
  */
 #define PGM_PAGE_SET_TYPE(pPage, _enmType)  do { (pPage)->uTypeY = (_enmType); } while (0)
+
+/**
+ * Gets the page table index
+ * @returns The page table index.
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ */
+#define PGM_PAGE_GET_PTE_INDEX(pPage)            (pPage)->uPteIdx
+
+/**
+ * Sets the page table index
+ * @param   pPage       Pointer to the physical guest page tracking structure.
+ * @param   iPte        New page table index.
+ */
+#define PGM_PAGE_SET_PTE_INDEX(pPage, _iPte)  do { (pPage)->uPteIdx = (_iPte); } while (0)
 
 /**
@@ -1698 +1716 @@
 /** The NIL index for the phys ext chain. */
 #define NIL_PGMPOOL_PHYSEXT_INDEX       ((uint16_t)0xffff)
+/** The NIL pte index for a phys ext chain slot. */
+#define NIL_PGMPOOL_PHYSEXT_IDX_PTE     ((uint16_t)0xffff)
 
 /**
  * Node in the chain of physical cross reference extents.
  * @todo Calling this an 'extent' is not quite right, find a better name.
+ * @todo find out the optimal size of the aidx array
  */
 #pragma pack(1)
@@ -1708 +1729 @@
     /** The index to the next item in the chain. NIL_PGMPOOL_PHYSEXT_INDEX is no next. */
     uint16_t            iNext;
+    /** Alignment. */
+    uint16_t            u16Align;
     /** The user page index. */
     uint16_t            aidx[3];
+    /** The page table index or NIL_PGMPOOL_PHYSEXT_IDX_PTE if unknown. */
+    uint16_t            apte[3];
 } PGMPOOLPHYSEXT, *PPGMPOOLPHYSEXT;
 typedef const PGMPOOLPHYSEXT *PCPGMPOOLPHYSEXT;
@@ -3408 +3433 @@
 }
 
-uint16_t        pgmPoolTrackPhysExtAddref(PVM pVM, uint16_t u16, uint16_t iShwPT);
+uint16_t        pgmPoolTrackPhysExtAddref(PVM pVM, PPGMPAGE pPhysPage, uint16_t u16, uint16_t iShwPT, uint16_t iPte);
 void            pgmPoolTrackPhysExtDerefGCPhys(PPGMPOOL pPool, PPGMPOOLPAGE pPoolPage, PPGMPAGE pPhysPage);
 void            pgmPoolMonitorChainChanging(PVMCPU pVCpu, PPGMPOOL pPool, PPGMPOOLPAGE pPage, RTGCPHYS GCPhysFault, CTXTYPE(RTGCPTR, RTHCPTR, RTGCPTR) pvAddress, unsigned cbWrite);

trunk/src/VBox/VMM/PGMPool.cpp

@@ -238 +238 @@
         paPhysExts[i].iNext = i + 1;
         paPhysExts[i].aidx[0] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[0] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
         paPhysExts[i].aidx[1] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[1] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
         paPhysExts[i].aidx[2] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[2] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
     }
     paPhysExts[cMaxPhysExts - 1].iNext = NIL_PGMPOOL_PHYSEXT_INDEX;
@@ -751 +754 @@
         paPhysExts[i].iNext = i + 1;
         paPhysExts[i].aidx[0] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[0] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
         paPhysExts[i].aidx[1] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[1] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
         paPhysExts[i].aidx[2] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[2] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
     }
     paPhysExts[cMaxPhysExts - 1].iNext = NIL_PGMPOOL_PHYSEXT_INDEX;

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

@@ -1369 +1369 @@
         STAM_COUNTER_INC(&pVM->pgm.s.StatTrackVirgin);
         u16 = PGMPOOL_TD_MAKE(1, pShwPage->idx);
+        /* Save the page table index. */
+        PGM_PAGE_SET_PTE_INDEX(pPage, iPTDst);
     }
     else
-        u16 = pgmPoolTrackPhysExtAddref(pVM, u16, pShwPage->idx);
+        u16 = pgmPoolTrackPhysExtAddref(pVM, pPage, u16, pShwPage->idx, iPTDst);
 
     /* write back */

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

@@ -2953 +2953 @@
  * @param   fFlushPTEs  Flush PTEs or allow them to be updated (e.g. in case of an RW bit change)
  * @param   iShw        The shadow page table.
+ * @param   iPte        Page table entry or NIL_PGMPOOL_PHYSEXT_IDX_PTE if unknown
  * @param   cRefs       The number of references made in that PT.
  */
-static bool pgmPoolTrackFlushGCPhysPTInt(PVM pVM, PCPGMPAGE pPhysPage, bool fFlushPTEs, uint16_t iShw, uint16_t cRefs)
-{
-    LogFlow(("pgmPoolTrackFlushGCPhysPT: pPhysPage=%RHp iShw=%d cRefs=%d\n", PGM_PAGE_GET_HCPHYS(pPhysPage), iShw, cRefs));
+static bool pgmPoolTrackFlushGCPhysPTInt(PVM pVM, PCPGMPAGE pPhysPage, bool fFlushPTEs, uint16_t iShw, uint16_t iPte, uint16_t cRefs)
+{
+    LogFlow(("pgmPoolTrackFlushGCPhysPT: pPhysPage=%RHp iShw=%d iPte=%d cRefs=%d\n", PGM_PAGE_GET_HCPHYS(pPhysPage), iShw, iPte, cRefs));
     PPGMPOOL pPool = pVM->pgm.s.CTX_SUFF(pPool);
     bool bRet = false;
@@ -2965 +2966 @@
      */
     Assert(cRefs == 1);
+    Assert(iPte != NIL_PGMPOOL_PHYSEXT_IDX_PTE);
     AssertFatalMsg(iShw < pPool->cCurPages && iShw != NIL_PGMPOOL_IDX, ("iShw=%d\n", iShw));
     PPGMPOOLPAGE pPage = &pPool->aPages[iShw];
@@ -3019 +3021 @@
             }
 
-            for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pPT->a); i++)
-                if ((pPT->a[i].u & (X86_PTE_PG_MASK | X86_PTE_P)) == u32)
-                {
-                    X86PTE Pte;
-
-                    Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pte=%RX32 cRefs=%#x\n", i, pPT->a[i], cRefs));
-                    Pte.u = (pPT->a[i].u & u32AndMask) | u32OrMask;
-                    if (Pte.u & PGM_PTFLAGS_TRACK_DIRTY)
-                        Pte.n.u1Write = 0;    /* need to disallow writes when dirty bit tracking is still active. */
-
-                    ASMAtomicWriteSize(&pPT->a[i].u, Pte.u);
-                    cRefs--;
-                    if (!cRefs)
-                        return bRet;
-                }
+            if ((pPT->a[iPte].u & (X86_PTE_PG_MASK | X86_PTE_P)) == u32)
+            {
+                X86PTE Pte;
+
+                Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pte=%RX32 cRefs=%#x\n", iPte, pPT->a[iPte], cRefs));
+                Pte.u = (pPT->a[iPte].u & u32AndMask) | u32OrMask;
+                if (Pte.u & PGM_PTFLAGS_TRACK_DIRTY)
+                    Pte.n.u1Write = 0;    /* need to disallow writes when dirty bit tracking is still active. */
+
+                ASMAtomicWriteSize(&pPT->a[iPte].u, Pte.u);
+                return bRet;
+            }
 #ifdef LOG_ENABLED
             Log(("cRefs=%d iFirstPresent=%d cPresent=%d\n", cRefs, pPage->iFirstPresent, pPage->cPresent));
@@ -3094 +3093 @@
             }
 
-            for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pPT->a); i++)
-                if ((pPT->a[i].u & (X86_PTE_PAE_PG_MASK | X86_PTE_P)) == u64)
-                {
-                    X86PTEPAE Pte;
-
-                    Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pte=%RX64 cRefs=%#x\n", i, pPT->a[i], cRefs));
-                    Pte.u = (pPT->a[i].u & u64AndMask) | u64OrMask;
-                    if (Pte.u & PGM_PTFLAGS_TRACK_DIRTY)
-                        Pte.n.u1Write = 0;    /* need to disallow writes when dirty bit tracking is still active. */
-
-                    ASMAtomicWriteSize(&pPT->a[i].u, Pte.u);
-                    cRefs--;
-                    if (!cRefs)
-                        return bRet;
-                }
+            if ((pPT->a[iPte].u & (X86_PTE_PAE_PG_MASK | X86_PTE_P)) == u64)
+            {
+                X86PTEPAE Pte;
+
+                Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pte=%RX64 cRefs=%#x\n", iPte, pPT->a[iPte], cRefs));
+                Pte.u = (pPT->a[iPte].u & u64AndMask) | u64OrMask;
+                if (Pte.u & PGM_PTFLAGS_TRACK_DIRTY)
+                    Pte.n.u1Write = 0;    /* need to disallow writes when dirty bit tracking is still active. */
+
+                ASMAtomicWriteSize(&pPT->a[iPte].u, Pte.u);
+                return bRet;
+            }
 #ifdef LOG_ENABLED
             Log(("cRefs=%d iFirstPresent=%d cPresent=%d\n", cRefs, pPage->iFirstPresent, pPage->cPresent));
@@ -3125 +3121 @@
             const uint64_t  u64 = PGM_PAGE_GET_HCPHYS(pPhysPage) | X86_PTE_P;
             PEPTPT          pPT = (PEPTPT)PGMPOOL_PAGE_2_PTR(pVM, pPage);
-            for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pPT->a); i++)
-                if ((pPT->a[i].u & (EPT_PTE_PG_MASK | X86_PTE_P)) == u64)
-                {
-                    Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pte=%RX64 cRefs=%#x\n", i, pPT->a[i], cRefs));
-                    STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
-                    pPT->a[i].u = 0;
-                    cRefs--;
-
-                    /* Update the counter as we're removing references. */
-                    Assert(pPage->cPresent);
-                    Assert(pPool->cPresent);
-                    pPage->cPresent--;
-                    pPool->cPresent--;
-
-                    if (!cRefs)
-                        return bRet;
-                }
+
+            if ((pPT->a[iPte].u & (EPT_PTE_PG_MASK | X86_PTE_P)) == u64)
+            {
+                Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pte=%RX64 cRefs=%#x\n", iPte, pPT->a[iPte], cRefs));
+                STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
+                pPT->a[iPte].u = 0;
+                cRefs--;
+
+                /* Update the counter as we're removing references. */
+                Assert(pPage->cPresent);
+                Assert(pPool->cPresent);
+                pPage->cPresent--;
+                pPool->cPresent--;
+                return bRet;
+            }
 #ifdef LOG_ENABLED
             Log(("cRefs=%d iFirstPresent=%d cPresent=%d\n", cRefs, pPage->iFirstPresent, pPage->cPresent));
@@ -3163 +3157 @@
             const uint64_t  u64 = PGM_PAGE_GET_HCPHYS(pPhysPage) | X86_PDE4M_P | X86_PDE4M_PS;
             PEPTPD          pPD = (PEPTPD)PGMPOOL_PAGE_2_PTR(pVM, pPage);
-            for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pPD->a); i++)
-                if ((pPD->a[i].u & (EPT_PDE2M_PG_MASK | X86_PDE4M_P | X86_PDE4M_PS)) == u64)
-                {
-                    Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pde=%RX64 cRefs=%#x\n", i, pPD->a[i], cRefs));
-                    STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
-                    pPD->a[i].u = 0;
-                    cRefs--;
-
-                    /* Update the counter as we're removing references. */
-                    Assert(pPage->cPresent);
-                    Assert(pPool->cPresent);
-                    pPage->cPresent--;
-                    pPool->cPresent--;
-
-                    if (!cRefs)
-                        return bRet;
-                }
+
+            if ((pPD->a[iPte].u & (EPT_PDE2M_PG_MASK | X86_PDE4M_P | X86_PDE4M_PS)) == u64)
+            {
+                Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pde=%RX64 cRefs=%#x\n", iPte, pPD->a[iPte], cRefs));
+                STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
+                pPD->a[iPte].u = 0;
+                cRefs--;
+
+                /* Update the counter as we're removing references. */
+                Assert(pPage->cPresent);
+                Assert(pPool->cPresent);
+                pPage->cPresent--;
+                pPool->cPresent--;
+
+                return bRet;
+            }
 # ifdef LOG_ENABLED
             Log(("cRefs=%d iFirstPresent=%d cPresent=%d\n", cRefs, pPage->iFirstPresent, pPage->cPresent));
@@ -3200 +3193 @@
             const uint64_t  u64 = PGM_PAGE_GET_HCPHYS(pPhysPage) | X86_PDE4M_P | X86_PDE4M_PS;
             PX86PD          pPD = (PX86PD)PGMPOOL_PAGE_2_PTR(pVM, pPage);
-            for (unsigned i = pPage->iFirstPresent; i < RT_ELEMENTS(pPD->a); i++)
-                if ((pPD->a[i].u & (X86_PDE2M_PAE_PG_MASK | X86_PDE4M_P | X86_PDE4M_PS)) == u64)
-                {
-                    Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pde=%RX64 cRefs=%#x\n", i, pPD->a[i], cRefs));
-                    STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
-                    pPD->a[i].u = 0;
-                    cRefs--;
-
-                    /* Update the counter as we're removing references. */
-                    Assert(pPage->cPresent);
-                    Assert(pPool->cPresent);
-                    pPage->cPresent--;
-                    pPool->cPresent--;
-
-                    if (!cRefs)
-                        return bRet;
-                }
+
+            if ((pPD->a[iPte].u & (X86_PDE2M_PAE_PG_MASK | X86_PDE4M_P | X86_PDE4M_PS)) == u64)
+            {
+                Log4(("pgmPoolTrackFlushGCPhysPTs: i=%d pde=%RX64 cRefs=%#x\n", iPte, pPD->a[iPte], cRefs));
+                STAM_COUNTER_INC(&pPool->StatTrackFlushEntry);
+                pPD->a[iPte].u = 0;
+                cRefs--;
+
+                /* Update the counter as we're removing references. */
+                Assert(pPage->cPresent);
+                Assert(pPool->cPresent);
+                pPage->cPresent--;
+                pPool->cPresent--;
+                return bRet;
+            }
 # ifdef LOG_ENABLED
             Log(("cRefs=%d iFirstPresent=%d cPresent=%d\n", cRefs, pPage->iFirstPresent, pPage->cPresent));
@@ -3256 +3247 @@
     Log2(("pgmPoolTrackFlushGCPhysPT: pPhysPage=%RHp iShw=%d cRefs=%d\n", PGM_PAGE_GET_HCPHYS(pPhysPage), iShw, cRefs));
     STAM_PROFILE_START(&pPool->StatTrackFlushGCPhysPT, f);
-    bool fKeptPTEs = pgmPoolTrackFlushGCPhysPTInt(pVM, pPhysPage, fFlushPTEs, iShw, cRefs);
+    bool fKeptPTEs = pgmPoolTrackFlushGCPhysPTInt(pVM, pPhysPage, fFlushPTEs, iShw, PGM_PAGE_GET_PTE_INDEX(pPhysPage), cRefs);
     if (!fKeptPTEs)
         PGM_PAGE_SET_TRACKING(pPhysPage, 0);
@@ -3290 +3281 @@
             if (pPhysExt->aidx[i] != NIL_PGMPOOL_IDX)
             {
-                bool fKeptPTEs = pgmPoolTrackFlushGCPhysPTInt(pVM, pPhysPage, fFlushPTEs, pPhysExt->aidx[i], 1);
+                bool fKeptPTEs = pgmPoolTrackFlushGCPhysPTInt(pVM, pPhysPage, fFlushPTEs, pPhysExt->aidx[i], pPhysExt->apte[i], 1);
                 if (!fKeptPTEs)
+                {
                     pPhysExt->aidx[i] = NIL_PGMPOOL_IDX;
+                    pPhysExt->apte[i] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
+                }
                 else
                     fKeepList = true;
@@ -3306 +3300 @@
         pPhysExt->iNext = pPool->iPhysExtFreeHead;
         pPool->iPhysExtFreeHead = iPhysExtStart;
+        /* Invalidate the tracking data. */
         PGM_PAGE_SET_TRACKING(pPhysPage, 0);
     }
@@ -3762 +3757 @@
     PPGMPOOLPHYSEXT pPhysExt = &pPool->CTX_SUFF(paPhysExts)[iPhysExt];
     for (unsigned i = 0; i < RT_ELEMENTS(pPhysExt->aidx); i++)
+    {
         pPhysExt->aidx[i] = NIL_PGMPOOL_IDX;
+        pPhysExt->apte[i] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
+    }
     pPhysExt->iNext = pPool->iPhysExtFreeHead;
     pPool->iPhysExtFreeHead = iPhysExt;
@@ -3786 +3784 @@
         pPhysExt = &pPool->CTX_SUFF(paPhysExts)[iPhysExt];
         for (unsigned i = 0; i < RT_ELEMENTS(pPhysExt->aidx); i++)
+        {
             pPhysExt->aidx[i] = NIL_PGMPOOL_IDX;
+            pPhysExt->apte[i] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
+        }
 
         /* next */
@@ -3805 +3806 @@
  * @param   iPhysExt    The physical extent index of the list head.
  * @param   iShwPT      The shadow page table index.
- *
- */
-static uint16_t pgmPoolTrackPhysExtInsert(PVM pVM, uint16_t iPhysExt, uint16_t iShwPT)
+ * @param   iPte        Page table entry
+ *
+ */
+static uint16_t pgmPoolTrackPhysExtInsert(PVM pVM, uint16_t iPhysExt, uint16_t iShwPT, uint16_t iPte)
 {
     Assert(PGMIsLockOwner(pVM));
@@ -3817 +3819 @@
     {
         paPhysExts[iPhysExt].aidx[2] = iShwPT;
+        paPhysExts[iPhysExt].apte[2] = iPte;
         STAM_COUNTER_INC(&pVM->pgm.s.StatTrackAliasedMany);
-        LogFlow(("pgmPoolTrackPhysExtInsert: %d:{,,%d}\n", iPhysExt, iShwPT));
+        LogFlow(("pgmPoolTrackPhysExtInsert: %d:{,,%d pte %d}\n", iPhysExt, iShwPT, iPte));
         return PGMPOOL_TD_MAKE(PGMPOOL_TD_CREFS_PHYSEXT, iPhysExt);
     }
@@ -3832 +3835 @@
             {
                 paPhysExts[iPhysExt].aidx[i] = iShwPT;
+                paPhysExts[iPhysExt].apte[i] = iPte;
                 STAM_COUNTER_INC(&pVM->pgm.s.StatTrackAliasedMany);
-                LogFlow(("pgmPoolTrackPhysExtInsert: %d:{%d} i=%d cMax=%d\n", iPhysExt, iShwPT, i, cMax));
+                LogFlow(("pgmPoolTrackPhysExtInsert: %d:{%d pte %d} i=%d cMax=%d\n", iPhysExt, iShwPT, iPte, i, cMax));
                 return PGMPOOL_TD_MAKE(PGMPOOL_TD_CREFS_PHYSEXT, iPhysExtStart);
             }
@@ -3856 +3860 @@
     pNew->iNext = iPhysExtStart;
     pNew->aidx[0] = iShwPT;
-    LogFlow(("pgmPoolTrackPhysExtInsert: added new extent %d:{%d}->%d\n", iPhysExt, iShwPT, iPhysExtStart));
+    pNew->apte[1] = iPte;
+    LogFlow(("pgmPoolTrackPhysExtInsert: added new extent %d:{%d pte %d}->%d\n", iPhysExt, iShwPT, iPte, iPhysExtStart));
     return PGMPOOL_TD_MAKE(PGMPOOL_TD_CREFS_PHYSEXT, iPhysExt);
 }
@@ -3867 +3872 @@
  *
  * @param   pVM         The VM handle.
+ * @param   pPhysPage   Pointer to the aPages entry in the ram range.
  * @param   u16         The ram range flags (top 16-bits).
  * @param   iShwPT      The shadow page table index.
- */
-uint16_t pgmPoolTrackPhysExtAddref(PVM pVM, uint16_t u16, uint16_t iShwPT)
+ * @param   iPte        Page table entry
+ */
+uint16_t pgmPoolTrackPhysExtAddref(PVM pVM, PPGMPAGE pPhysPage, uint16_t u16, uint16_t iShwPT, uint16_t iPte)
 {
     pgmLock(pVM);
@@ -3886 +3893 @@
             STAM_COUNTER_INC(&pVM->pgm.s.StatTrackAliased);
             pPhysExt->aidx[0] = PGMPOOL_TD_GET_IDX(u16);
+            pPhysExt->apte[0] = PGM_PAGE_GET_PTE_INDEX(pPhysPage);
             pPhysExt->aidx[1] = iShwPT;
+            pPhysExt->apte[1] = iPte;
             u16 = PGMPOOL_TD_MAKE(PGMPOOL_TD_CREFS_PHYSEXT, iPhysExt);
         }
@@ -3897 +3906 @@
          * Insert into the extent list.
          */
-        u16 = pgmPoolTrackPhysExtInsert(pVM, PGMPOOL_TD_GET_IDX(u16), iShwPT);
+        u16 = pgmPoolTrackPhysExtInsert(pVM, PGMPOOL_TD_GET_IDX(u16), iShwPT, iPte);
     }
     else
@@ -3905 +3914 @@
 }
 
-
 /**
  * Clear references to guest physical memory.
@@ -3938 +3946 @@
                 {
                     paPhysExts[iPhysExt].aidx[i] = NIL_PGMPOOL_IDX;
+                    paPhysExts[iPhysExt].apte[i] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
 
                     for (i = 0; i < RT_ELEMENTS(paPhysExts[iPhysExt].aidx); i++)
@@ -3989 +3998 @@
 }
 
-
 /**
  * Clear references to guest physical memory.
@@ -5137 +5145 @@
         paPhysExts[i].iNext = i + 1;
         paPhysExts[i].aidx[0] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[0] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
         paPhysExts[i].aidx[1] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[1] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
         paPhysExts[i].aidx[2] = NIL_PGMPOOL_IDX;
+        paPhysExts[i].apte[2] = NIL_PGMPOOL_PHYSEXT_IDX_PTE;
     }
     paPhysExts[cMaxPhysExts - 1].iNext = NIL_PGMPOOL_PHYSEXT_INDEX;