Changeset 86461 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 6, 2020 4:40:59 PM (4 years ago)

Author:

vboxsync

Message:

VMM/PGM: Don't check for, or even define, PGM_PDFLAGS_MAPPING when PGM_WITHOUT_MAPPINGS is active (the default now).

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (9 diffs)
• PGMAllPool.cpp (modified) (5 diffs)
• PGMAllShw.h (modified) (4 diffs)

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

@@ -1193 +1193 @@
         Assert(     PdeSrc.n.u1User == PdeDst.n.u1User
                &&   (PdeSrc.n.u1Write || !PdeDst.n.u1Write || pVCpu->pgm.s.cNetwareWp0Hacks > 0));
-# ifndef PGM_WITHOUT_MAPPING
+# ifndef PGM_WITHOUT_MAPPINGS
         if (PdeDst.u & PGM_PDFLAGS_MAPPING)
         {
@@ -1204 +1204 @@
         }
         else
-# endif /* !PGM_WITHOUT_MAPPING */
+# endif /* !PGM_WITHOUT_MAPPINGS */
         if (!fIsBigPage)
         {
@@ -1302 +1302 @@
          * Page directory is not present, mark shadow PDE not present.
          */
+# ifndef PGM_WITHOUT_MAPPINGS
         if (!(PdeDst.u & PGM_PDFLAGS_MAPPING))
+# endif
         {
             pgmPoolFree(pVM, PdeDst.u & SHW_PDE_PG_MASK, pShwPde->idx, iPDDst);
@@ -1309 +1311 @@
             PGM_INVL_PG(pVCpu, GCPtrPage);
         }
+# ifndef PGM_WITHOUT_MAPPINGS
         else
         {
@@ -1314 +1317 @@
             STAM_COUNTER_INC(&pVCpu->pgm.s.CTX_SUFF(pStats)->CTX_MID_Z(Stat,InvalidatePagePDMappings));
         }
+# endif
     }
     return rc;
@@ -2984 +2988 @@
     SHWPDE          PdeDst = *pPdeDst;
 
+# ifndef PGM_WITHOUT_MAPPINGS
     Assert(!(PdeDst.u & PGM_PDFLAGS_MAPPING));
+# endif
     Assert(!PdeDst.n.u1Present); /* We're only supposed to call SyncPT on PDE!P and conflicts.*/
 
@@ -3247 +3253 @@
         PdeDst = pPDDst->a[iPDDst];
 # endif
+# ifndef PGM_WITHOUT_MAPPINGS
         if (!(PdeDst.u & PGM_PDFLAGS_MAPPING))
+# endif
         {
             if (!PdeDst.n.u1Present)
@@ -3781 +3789 @@
                 const SHWPDE PdeDst = pPDDst->a[iPDDst];
 #  endif
+#  ifndef PGM_WITHOUT_MAPPINGS
                 if (PdeDst.u & PGM_PDFLAGS_MAPPING)
                 {
@@ -3791 +3800 @@
                     }
                 }
-                else if (   (PdeDst.u & X86_PDE_P)
-                        || ((PdeDst.u & (X86_PDE_P | PGM_PDFLAGS_TRACK_DIRTY)) == (X86_PDE_P | PGM_PDFLAGS_TRACK_DIRTY))
-                        )
+                else
+#  endif
+                if (   (PdeDst.u & X86_PDE_P)
+                    || ((PdeDst.u & (X86_PDE_P | PGM_PDFLAGS_TRACK_DIRTY)) == (X86_PDE_P | PGM_PDFLAGS_TRACK_DIRTY)) )
                 {
                     HCPhysShw = PdeDst.u & SHW_PDE_PG_MASK;

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

@@ -482 +482 @@
                 uShw.pv = PGMPOOL_PAGE_2_PTR(pVM, pPage);
                 const unsigned iShw = off / sizeof(X86PDEPAE);
+#ifndef PGM_WITHOUT_MAPPINGS
                 Assert(!(uShw.pPDPae->a[iShw].u & PGM_PDFLAGS_MAPPING));
+#endif
                 if (uShw.pPDPae->a[iShw].n.u1Present)
                 {
@@ -499 +501 @@
                     AssertBreak(iShw2 < RT_ELEMENTS(uShw.pPDPae->a));
 
+#ifndef PGM_WITHOUT_MAPPINGS
                     Assert(!(uShw.pPDPae->a[iShw2].u & PGM_PDFLAGS_MAPPING));
+#endif
                     if (uShw.pPDPae->a[iShw2].n.u1Present)
                     {
@@ -3803 +3807 @@
         case PGMPOOLKIND_64BIT_PD_FOR_64BIT_PD:
             Assert(iUserTable < X86_PG_PAE_ENTRIES);
+#ifndef PGM_WITHOUT_MAPPINGS
             Assert(!(u.pau64[iUserTable] & PGM_PDFLAGS_MAPPING));
+#endif
             break;
         case PGMPOOLKIND_64BIT_PDPT_FOR_64BIT_PDPT:
@@ -4485 +4491 @@
     {
         if (    pShwPD->a[i].n.u1Present
+#ifndef PGM_WITHOUT_MAPPINGS
             &&  !(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING)
+#endif
            )
         {
@@ -4510 +4518 @@
     {
         if (   pShwPD->a[i].n.u1Present
-            && !(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING))
+#ifndef PGM_WITHOUT_MAPPINGS
+            && !(pShwPD->a[i].u & PGM_PDFLAGS_MAPPING)
+#endif
+           )
         {
 #ifdef PGM_WITH_LARGE_PAGES

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

@@ -344 +344 @@
 
 # elif PGM_SHW_TYPE == PGM_TYPE_EPT
-    const unsigned  iPd = ((GCPtr >> SHW_PD_SHIFT) & SHW_PD_MASK);
     PEPTPD          pPDDst;
-    EPTPDE          Pde;
-
     int rc = pgmShwGetEPTPDPtr(pVCpu, GCPtr, NULL, &pPDDst);
-    if (rc != VINF_SUCCESS) /** @todo this function isn't expected to return informational status codes. Check callers / fix. */
+    if (rc == VINF_SUCCESS) /** @todo this function isn't expected to return informational status codes. Check callers / fix. */
+    { /* likely */ }
+    else
     {
         AssertRC(rc);
@@ -355 +354 @@
     }
     Assert(pPDDst);
-    Pde = pPDDst->a[iPd];
+
+    const unsigned  iPd = ((GCPtr >> SHW_PD_SHIFT) & SHW_PD_MASK);
+    EPTPDE Pde = pPDDst->a[iPd];
 
 # elif PGM_SHW_TYPE == PGM_TYPE_32BIT || PGM_SHW_TYPE == PGM_TYPE_NESTED_32BIT
     X86PDE          Pde = pgmShwGet32BitPDE(pVCpu, GCPtr);
+
 # else
 #  error "Misconfigured PGM_SHW_TYPE or something..."
@@ -396 +398 @@
      */
     PSHWPT          pPT;
+# ifndef PGM_WITHOUT_MAPPINGS
     if (!(Pde.u & PGM_PDFLAGS_MAPPING))
+# endif
     {
         int rc2 = PGM_HCPHYS_2_PTR(pVM, pVCpu, Pde.u & SHW_PDE_PG_MASK, &pPT);
@@ -402 +406 @@
             return rc2;
     }
+# ifndef PGM_WITHOUT_MAPPINGS
     else /* mapping: */
     {
-# if  PGM_SHW_TYPE == PGM_TYPE_AMD64 \
-  || PGM_SHW_TYPE == PGM_TYPE_EPT \
-  || defined(PGM_WITHOUT_MAPPINGS)
+#  if  PGM_SHW_TYPE == PGM_TYPE_AMD64 \
+    || PGM_SHW_TYPE == PGM_TYPE_EPT \
+    || defined(PGM_WITHOUT_MAPPINGS)
         AssertFailed(); /* can't happen */
         pPT = NULL;     /* shut up MSC */
-# else
+#  else
         Assert(pgmMapAreMappingsEnabled(pVM));
 
         PPGMMAPPING pMap = pgmGetMapping(pVM, (RTGCPTR)GCPtr);
         AssertMsgReturn(pMap, ("GCPtr=%RGv\n", GCPtr), VERR_PGM_MAPPING_IPE);
-#  if PGM_SHW_TYPE == PGM_TYPE_32BIT || PGM_SHW_TYPE == PGM_TYPE_NESTED_32BIT
+#   if PGM_SHW_TYPE == PGM_TYPE_32BIT || PGM_SHW_TYPE == PGM_TYPE_NESTED_32BIT
         pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> X86_PD_SHIFT].CTX_SUFF(pPT);
-#  else /* PAE */
+#   else /* PAE */
         pPT = pMap->aPTs[(GCPtr - pMap->GCPtr) >> X86_PD_SHIFT].CTX_SUFF(paPaePTs);
+#   endif
 #  endif
-# endif
     }
+# endif /* !PGM_WITHOUT_MAPPINGS */
     const unsigned  iPt = (GCPtr >> SHW_PT_SHIFT) & SHW_PT_MASK;
     SHWPTE          Pte = pPT->a[iPt];