Changeset 7971 in vbox

Timestamp:

Apr 15, 2008 10:12:22 AM (17 years ago)

Author:

vboxsync

Message:

PAE fixes/updates for raw mode (PDPT monitoring)

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• PGMMap.cpp (modified) (8 diffs)
• VMMAll/PGMAllPool.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -170 +170 @@
  * Never free such an entry. */
 #define PGM_PLXFLAGS_PERMANENT      RT_BIT_64(10)
+/** Mapping (hypervisor allocated pagetable). */
+#define PGM_PLXFLAGS_MAPPING        RT_BIT_64(11)
 /** @} */
 

trunk/src/VBox/VMM/PGMMap.cpp

@@ -36 +36 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static void              pgmR3MapClearPDEs(PPGM pPGM, PPGMMAPPING pMap, int iOldPDE);
-static void              pgmR3MapSetPDEs(PVM pVM, PPGMMAPPING pMap, int iNewPDE);
+static void              pgmR3MapClearPDEs(PPGM pPGM, PPGMMAPPING pMap, unsigned iOldPDE);
+static void              pgmR3MapSetPDEs(PVM pVM, PPGMMAPPING pMap, unsigned iNewPDE);
 static int               pgmR3MapIntermediateCheckOne(PVM pVM, uintptr_t uAddress, unsigned cPages, PX86PT pPTDefault, PX86PTPAE pPTPaeDefault);
 static void              pgmR3MapIntermediateDoOne(PVM pVM, uintptr_t uAddress, RTHCPHYS HCPhys, unsigned cPages, PX86PT pPTDefault, PX86PTPAE pPTPaeDefault);
@@ -691 +691 @@
  * @param   iOldPDE     The index of the 32-bit PDE corresponding to the base of the mapping.
  */
-static void pgmR3MapClearPDEs(PPGM pPGM, PPGMMAPPING pMap, int iOldPDE)
+static void pgmR3MapClearPDEs(PPGM pPGM, PPGMMAPPING pMap, unsigned iOldPDE)
 {
     unsigned i = pMap->cPTs;
@@ -708 +708 @@
          * PAE.
          */
-        const int iPD = iOldPDE / 256;
-        int iPDE = iOldPDE * 2 % 512;
+        const unsigned iPD = iOldPDE / 256;
+        unsigned iPDE = iOldPDE * 2 % 512;
         pPGM->apInterPaePDs[iPD]->a[iPDE].u = 0;
         pPGM->apHCPaePDs[iPD]->a[iPDE].u    = 0;
@@ -715 +715 @@
         pPGM->apInterPaePDs[iPD]->a[iPDE].u = 0;
         pPGM->apHCPaePDs[iPD]->a[iPDE].u    = 0;
+
+        /* Clear the PGM_PDFLAGS_MAPPING flag for the page directory pointer entry. (legacy PAE guest mode) */
+        pPGM->pHCPaePDPT->a[iPD].u &= ~PGM_PLXFLAGS_MAPPING;
     }
 }
@@ -726 +729 @@
  * @param   iNewPDE     The index of the 32-bit PDE corresponding to the base of the mapping.
  */
-static void pgmR3MapSetPDEs(PVM pVM, PPGMMAPPING pMap, int iNewPDE)
+static void pgmR3MapSetPDEs(PVM pVM, PPGMMAPPING pMap, unsigned iNewPDE)
 {
     PPGM pPGM = &pVM->pgm.s;
@@ -734 +737 @@
         return;
 
-    Assert(PGMGetGuestMode(pVM) <= PGMMODE_32_BIT);
+    Assert(PGMGetGuestMode(pVM) <= PGMMODE_PAE);
 
     /*
@@ -759 +762 @@
          * PAE.
          */
-        const int iPD = iNewPDE / 256;
-        int iPDE = iNewPDE * 2 % 512;
+        const unsigned iPD = iNewPDE / 256;
+        unsigned iPDE = iNewPDE * 2 % 512;
         if (pPGM->apHCPaePDs[iPD]->a[iPDE].n.u1Present)
             pgmPoolFree(pVM, pPGM->apHCPaePDs[iPD]->a[iPDE].u & X86_PDE_PAE_PG_MASK, PGMPOOL_IDX_PAE_PD, iNewPDE * 2);
@@ -775 +778 @@
         pPGM->apInterPaePDs[iPD]->a[iPDE] = PdePae1;
         pPGM->apHCPaePDs[iPD]->a[iPDE]    = PdePae1;
+
+        /* Set the PGM_PDFLAGS_MAPPING flag in the page directory pointer entry. (legacy PAE guest mode) */
+        pPGM->pHCPaePDPT->a[iPD].u |= PGM_PLXFLAGS_MAPPING;
     }
 }

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

@@ -433 +433 @@
                 if (iShw < X86_PG_PAE_PDPE_ENTRIES)          /* don't use ELEMENTS(uShw.pPDPT->a), because that's for long mode only */
                 {
-                    if (uShw.pPDPT->a[iShw].u & PGM_PDFLAGS_MAPPING)
+                    if (uShw.pPDPT->a[iShw].u & PGM_PLXFLAGS_MAPPING)
                     {
                         Assert(pgmMapAreMappingsEnabled(&pPool->CTXSUFF(pVM)->pgm.s));
@@ -447 +447 @@
                         if (    iShw2 != iShw
                             &&  iShw2 < X86_PG_PAE_PDPE_ENTRIES
-                            &&  uShw.pPDPT->a[iShw2].u & PGM_PDFLAGS_MAPPING)
+                            &&  uShw.pPDPT->a[iShw2].u & PGM_PLXFLAGS_MAPPING)
                         {
                             Assert(pgmMapAreMappingsEnabled(&pPool->CTXSUFF(pVM)->pgm.s));