Changeset 108676 in vbox for trunk/src

Timestamp:

Mar 20, 2025 9:29:19 PM (8 weeks ago)

Author:

vboxsync

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

168089

Message:

VMM/PGM: Don't need the abZeroPg and abMmioPg page sized members if only NEM PGM mode is available, bugref:10391

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPhys.cpp (modified) (2 diffs)
• VMMR3/PGM.cpp (modified) (3 diffs)
• include/PGMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp ¶

@@ -52 +52 @@
 #ifdef IN_RING3
 # include <iprt/thread.h>
+# ifdef VBOX_WITH_ONLY_PGM_NEM_MODE
+#  include <iprt/zero.h>
+# endif
 #elif defined(IN_RING0)
 # include <iprt/mem.h>
@@ -3003 +3006 @@
 #ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
         AssertMsg(PGM_PAGE_GET_HCPHYS(pPage) == pVM->pgm.s.HCPhysZeroPg, ("%RGp/%R[pgmpage]\n", GCPhys, pPage));
-#endif
 #ifndef IN_RING0
         pTlbe->pMap = NULL;
 #endif
         pTlbe->pv = pVM->pgm.s.abZeroPg;
+#else
+        /*
+         * Should not ever be used, as we don't implement zero pages for NEM mode currently and
+         * MMIO accesses are not handled through the TLB.
+         */
+        pTlbe->pv = (void *)&g_abRTZero64K[0]; /* Maximum granule size on ARM. */
+#endif
     }
 #ifdef PGM_WITH_PHYS_TLB

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

@@ -981 +981 @@
     AssertRCReturn(rc, rc);
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     /*
      * Setup the zero page (HCPHysZeroPg is set by ring-0).
      */
     RT_ZERO(pVM->pgm.s.abZeroPg); /* paranoia */
-#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (fDriverless)
         pVM->pgm.s.HCPhysZeroPg = _4G - GUEST_PAGE_SIZE * 2 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
@@ -991 +991 @@
     AssertRelease(pVM->pgm.s.HCPhysZeroPg != 0);
     Log(("HCPhysZeroPg=%RHp abZeroPg=%p\n", pVM->pgm.s.HCPhysZeroPg, pVM->pgm.s.abZeroPg));
-#endif
 
     /*
@@ -998 +997 @@
      */
     ASMMemFill32(pVM->pgm.s.abMmioPg, sizeof(pVM->pgm.s.abMmioPg), 0xfeedface);
-#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (fDriverless)
         pVM->pgm.s.HCPhysMmioPg = _4G - GUEST_PAGE_SIZE * 3 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;

trunk/src/VBox/VMM/include/PGMInternal.h ¶

@@ -3015 +3015 @@
 typedef struct PGM
 {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     /** The zero page. */
     uint8_t                         abZeroPg[RT_MAX(HOST_PAGE_SIZE, GUEST_PAGE_SIZE)];
     /** The MMIO placeholder page. */
     uint8_t                         abMmioPg[RT_MAX(HOST_PAGE_SIZE, GUEST_PAGE_SIZE)];
+#endif
 
     /** @name   RAM, MMIO2 and ROM ranges