Changeset 92717 in vbox for trunk/src/VBox

Timestamp:

Dec 2, 2021 9:43:46 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM: Driverless requires the simplified memory mode. Must also fake host physical address for the MMIO and ZERO pages, or we'll end up asserting elsewhere in PGM for to good reason. bugref:10138

File:

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

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

@@ -750 +750 @@
 {
     LogFlow(("PGMR3Init:\n"));
-    bool const fDriverless = SUPR3IsDriverless();
     PCFGMNODE pCfgPGM = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/PGM");
     int rc;
@@ -760 +759 @@
     AssertCompile(sizeof(pVM->apCpusR3[0]->pgm.s) <= sizeof(pVM->apCpusR3[0]->pgm.padding));
     AssertCompileMemberAlignment(PGM, CritSectX, sizeof(uintptr_t));
+
+    /*
+     * If we're in driveless mode we have to use the simplified memory mode.
+     */
+    bool const fDriverless = SUPR3IsDriverless();
+    if (fDriverless)
+    {
+#ifdef VBOX_WITH_PGM_NEM_MODE
+        if (!pVM->pgm.s.fNemMode)
+            pVM->pgm.s.fNemMode = true;
+#else
+        return VMR3SetError(pVM->pUVM, VERR_SUP_DRIVERLESS, RT_SRC_POS,
+                            "Driverless requires that VBox is built with VBOX_WITH_PGM_NEM_MODE defined");
+#endif
+    }
 
     /*
@@ -924 +938 @@
         {
             pVM->pgm.s.pvZeroPgR0 = MMHyperR3ToR0(pVM, pVM->pgm.s.pvZeroPgR3);
-            pVM->pgm.s.HCPhysZeroPg = MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.pvZeroPgR3);
-            AssertRelease(pVM->pgm.s.HCPhysZeroPg != NIL_RTHCPHYS || fDriverless);
+            pVM->pgm.s.HCPhysZeroPg = !fDriverless ? MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.pvZeroPgR3)
+                                    : _4G - PAGE_SIZE * 2 /* fake to avoid PGM_PAGE_INIT_ZERO assertion */;
+            AssertRelease(pVM->pgm.s.HCPhysZeroPg != NIL_RTHCPHYS);
         }
     }
@@ -939 +954 @@
         {
             ASMMemFill32(pVM->pgm.s.pvMmioPgR3, PAGE_SIZE, 0xfeedface);
-            pVM->pgm.s.HCPhysMmioPg = MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.pvMmioPgR3);
-            AssertRelease(pVM->pgm.s.HCPhysMmioPg != NIL_RTHCPHYS || fDriverless);
+            pVM->pgm.s.HCPhysMmioPg = !fDriverless ? MMR3HyperHCVirt2HCPhys(pVM, pVM->pgm.s.pvMmioPgR3)
+                                    : _4G - 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;
         }