Changeset 93593 in vbox for trunk/src/VBox/VMM/VMMR3/PGM.cpp

Timestamp:

Feb 3, 2022 9:05:05 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Embedded the zero and mmio-dummy pages into the VM structure and realigned it for a 16384 page size. bugref:9898

File:

• trunk/src/VBox/VMM/VMMR3/PGM.cpp (modified) (2 diffs)

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

@@ -930 +930 @@
 
     /*
-     * Allocate the zero page.
-     */
-    if (RT_SUCCESS(rc))
-    {
-        rc = MMHyperAlloc(pVM, RT_MAX(GUEST_PAGE_SIZE, HOST_PAGE_SIZE), GUEST_PAGE_SIZE, MM_TAG_PGM, &pVM->pgm.s.pvZeroPgR3);
-        if (RT_SUCCESS(rc))
-        {
-            pVM->pgm.s.pvZeroPgR0 = MMHyperR3ToR0(pVM, pVM->pgm.s.pvZeroPgR3);
-            pVM->pgm.s.HCPhysZeroPg = !fDriverless ? MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.pvZeroPgR3)
-                                    : _4G - GUEST_PAGE_SIZE * 2 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
-            AssertRelease(pVM->pgm.s.HCPhysZeroPg != NIL_RTHCPHYS);
-        }
-    }
-
-    /*
-     * Allocate the invalid MMIO page.
+     * Setup the zero page.
+     */
+    RT_ZERO(pVM->pgm.s.abZeroPg);
+    pVM->pgm.s.HCPhysZeroPg = !fDriverless ? MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.abZeroPg)
+                            : _4G - GUEST_PAGE_SIZE * 2 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
+    AssertRelease(pVM->pgm.s.HCPhysZeroPg != NIL_RTHCPHYS);
+
+    /*
+     * Setup the invalid MMIO page.
      * (The invalid bits in HCPhysInvMmioPg are set later on init complete.)
      */
-    if (RT_SUCCESS(rc))
-    {
-        rc = MMHyperAlloc(pVM, RT_MAX(GUEST_PAGE_SIZE, HOST_PAGE_SIZE), GUEST_PAGE_SIZE,
-                          MM_TAG_PGM, &pVM->pgm.s.pvMmioPgR3);
-        if (RT_SUCCESS(rc))
-        {
-            ASMMemFill32(pVM->pgm.s.pvMmioPgR3, RT_MAX(GUEST_PAGE_SIZE, HOST_PAGE_SIZE), 0xfeedface);
-            pVM->pgm.s.HCPhysMmioPg = !fDriverless ? MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.pvMmioPgR3)
-                                    : _4G - GUEST_PAGE_SIZE * 3 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
-            AssertRelease(pVM->pgm.s.HCPhysMmioPg != NIL_RTHCPHYS);
-            pVM->pgm.s.HCPhysInvMmioPg = pVM->pgm.s.HCPhysMmioPg;
-        }
-    }
+    ASMMemFill32(pVM->pgm.s.abMmioPg, sizeof(pVM->pgm.s.abMmioPg), 0xfeedface);
+    pVM->pgm.s.HCPhysMmioPg = !fDriverless ? MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.abMmioPg)
+                            : _4G - GUEST_PAGE_SIZE * 3 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
+    AssertRelease(pVM->pgm.s.HCPhysMmioPg != NIL_RTHCPHYS);
+    pVM->pgm.s.HCPhysInvMmioPg = pVM->pgm.s.HCPhysMmioPg;
 
     /*
@@ -1773 +1758 @@
 
     /*
-     * The Zero page.
-     */
-    pVM->pgm.s.pvZeroPgR0 = MMHyperR3ToR0(pVM, pVM->pgm.s.pvZeroPgR3);
-    AssertRelease(pVM->pgm.s.pvZeroPgR0 != NIL_RTR0PTR || SUPR3IsDriverless());
-
-    /*
      * The page pool.
      */