Changeset 86488 in vbox for trunk/src/VBox/VMM

Timestamp:

Oct 8, 2020 8:32:24 AM (4 years ago)

Author:

vboxsync

Message:

VMM/PGM: Working on eliminating page table bitfield use (32-bit PDEs). bugref:9841 bugref:9746

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMAll/PGMAllPool.cpp (modified) (3 diffs)
• VMMAll/PGMAllShw.h (modified) (1 diff)
• VMMR3/PGM.cpp (modified) (1 diff)
• include/PGMInline.h (modified) (1 diff)

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

@@ -1418 +1418 @@
                 AssertReturn(pPde, VERR_INTERNAL_ERROR_3);
                 Log(("pgmShwMakePageSupervisorAndWritable: PDE=%#llx", pPde->u));
-                pPde->n.u1Write = 1;
+                pPde->u |= X86_PDE_RW;
                 Log(("-> PDE=%#llx (32)\n", pPde->u));
                 break;

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

@@ -345 +345 @@
                 LogFlow(("pgmPoolMonitorChainChanging: PGMPOOLKIND_32BIT_PD %x\n", iShw));
                 STAM_COUNTER_INC(&pPool->CTX_MID_Z(StatMonitor,FaultPD));
-                if (uShw.pPD->a[iShw].n.u1Present)
+                X86PGUINT const uPde = uShw.pPD->a[iShw].u;
+                if (uPde & X86_PDE_P)
                 {
-                    LogFlow(("pgmPoolMonitorChainChanging: 32 bit pd iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPD->a[iShw].u));
-                    pgmPoolFree(pVM,
-                                uShw.pPD->a[iShw].u & X86_PDE_PAE_PG_MASK,
-                                pPage->idx,
-                                iShw);
+                    LogFlow(("pgmPoolMonitorChainChanging: 32 bit pd iShw=%#x: %RX64 -> freeing it!\n", iShw, uPde));
+                    pgmPoolFree(pVM, uPde & X86_PDE_PG_MASK, pPage->idx, iShw);
                     ASMAtomicWriteU32(&uShw.pPD->a[iShw].u, 0);
                 }
+
                 /* paranoia / a bit assumptive. */
                 if (    (off & 3)
@@ -362 +361 @@
                         &&  iShw2 < RT_ELEMENTS(uShw.pPD->a))
                     {
-                        if (uShw.pPD->a[iShw2].n.u1Present)
+                        X86PGUINT const uPde2 = uShw.pPD->a[iShw2].u;
+                        if (uPde2 & X86_PDE_P)
                         {
-                            LogFlow(("pgmPoolMonitorChainChanging: 32 bit pd iShw=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPD->a[iShw2].u));
-                            pgmPoolFree(pVM,
-                                        uShw.pPD->a[iShw2].u & X86_PDE_PAE_PG_MASK,
-                                        pPage->idx,
-                                        iShw2);
+                            LogFlow(("pgmPoolMonitorChainChanging: 32 bit pd iShw=%#x: %RX64 -> freeing it!\n", iShw2, uPde2));
+                            pgmPoolFree(pVM, uPde2 & X86_PDE_PG_MASK, pPage->idx, iShw2);
                             ASMAtomicWriteU32(&uShw.pPD->a[iShw2].u, 0);
                         }
@@ -4482 +4479 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pShwPD->a); i++)
     {
-        if (    pShwPD->a[i].n.u1Present
+        X86PGUINT const uPde = pShwPD->a[i].u;
 #ifndef PGM_WITHOUT_MAPPINGS
-            &&  !(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING)
+        if ((uPde & (X86_PDE_P | PGM_PDFLAGS_MAPPING)) == X86_PDE_P)
+#else
+        if (uPde & X86_PDE_P)
 #endif
-           )
         {
             PPGMPOOLPAGE pSubPage = (PPGMPOOLPAGE)RTAvloHCPhysGet(&pPool->HCPhysTree, pShwPD->a[i].u & X86_PDE_PG_MASK);

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

@@ -74 +74 @@
 # define SHW_PD_MASK                    X86_PD_MASK
 # define SHW_TOTAL_PD_ENTRIES           X86_PG_ENTRIES
-# define SHW_PDE_IS_P(Pde)              ( (Pde).n.u1Present )
-# define SHW_PDE_IS_A(Pde)              ( (Pde).n.u1Accessed )
-# define SHW_PDE_IS_BIG(Pde)            ( (Pde).b.u1Size )
+# define SHW_PDE_IS_P(Pde)              ( (Pde).u & X86_PDE_P )
+# define SHW_PDE_IS_A(Pde)              ( (Pde).u & X86_PDE_A )
+# define SHW_PDE_IS_BIG(Pde)            ( (Pde).u & X86_PDE_PS  )
 # define SHW_PDE_ATOMIC_SET(Pde, uNew)  do { ASMAtomicWriteU32(&(Pde).u, (uNew)); } while (0)
 # define SHW_PDE_ATOMIC_SET2(Pde, Pde2) do { ASMAtomicWriteU32(&(Pde).u, (Pde2).u); } while (0)

trunk/src/VBox/VMM/VMMR3/PGM.cpp

@@ -2345 +2345 @@
     {
         X86PDE PdeSrc = pPDSrc->a[iPD];
-        if (PdeSrc.n.u1Present)
+        if (PdeSrc.u & X86_PDE_P)
         {
-            if (PdeSrc.b.u1Size && fPSE)
+            if ((PdeSrc.u & X86_PDE_PS) && fPSE)
                 pHlp->pfnPrintf(pHlp,
                                 "%04X - %RGp P=%d U=%d RW=%d G=%d - BIG\n",
                                 iPD,
-                                pgmGstGet4MBPhysPage(pVM, PdeSrc),
-                                PdeSrc.b.u1Present, PdeSrc.b.u1User, PdeSrc.b.u1Write, PdeSrc.b.u1Global && fPGE);
+                                pgmGstGet4MBPhysPage(pVM, PdeSrc), PdeSrc.u & X86_PDE_P, !!(PdeSrc.u & X86_PDE_US),
+                                !!(PdeSrc.u & X86_PDE_RW), (PdeSrc.u & X86_PDE4M_G) && fPGE);
             else
                 pHlp->pfnPrintf(pHlp,
                                 "%04X - %RGp P=%d U=%d RW=%d [G=%d]\n",
                                 iPD,
-                                (RTGCPHYS)(PdeSrc.u & X86_PDE_PG_MASK),
-                                PdeSrc.n.u1Present, PdeSrc.n.u1User, PdeSrc.n.u1Write, PdeSrc.b.u1Global && fPGE);
+                                (RTGCPHYS)(PdeSrc.u & X86_PDE_PG_MASK), PdeSrc.u & X86_PDE_P, !!(PdeSrc.u & X86_PDE_US),
+                                !!(PdeSrc.u & X86_PDE_RW), (PdeSrc.u & X86_PDE4M_G) && fPGE);
         }
     }

trunk/src/VBox/VMM/include/PGMInline.h

@@ -638 +638 @@
 {
     RTGCPHYS GCPhys = Pde.u & X86_PDE4M_PG_MASK;
-    GCPhys |= (RTGCPHYS)Pde.b.u8PageNoHigh << 32;
+    GCPhys |= (RTGCPHYS)(Pde.u & X86_PDE4M_PG_HIGH_MASK) << X86_PDE4M_PG_HIGH_SHIFT;
 
     return GCPhys & pVM->pgm.s.GCPhys4MBPSEMask;