Changeset 107171 in vbox for trunk/src/VBox/VMM/VMMR3/PGM-armv8.cpp

Timestamp:

Nov 28, 2024 10:38:10 AM (7 weeks ago)

Author:

vboxsync

Message:

VMM/PGM: Introducing VBOX_WITH_ONLY_PGM_NEM_MODE to disable lots unused code on *.arm64 and darwin. jiraref:VBP-1466

File:

• trunk/src/VBox/VMM/VMMR3/PGM-armv8.cpp (modified) (18 diffs)

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

@@ -72 +72 @@
 
 /*********************************************************************************************************************************
-*   Structures and Typedefs                                                                                                      *
-*********************************************************************************************************************************/
-
-
-/*********************************************************************************************************************************
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
@@ -101 +96 @@
 {
     AssertFatal(!PDMCritSectIsInitialized(&pVM->pgm.s.CritSectX));
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     pVM->pgm.s.fNemMode = true;
+#endif
 }
 
@@ -113 +110 @@
 VMMR3_INT_DECL(bool)    PGMR3IsNemModeEnabled(PVM pVM)
 {
-    return pVM->pgm.s.fNemMode;
+    RT_NOREF(pVM);
+    return PGM_IS_IN_NEM_MODE(pVM);
 }
 
@@ -126 +124 @@
 {
     LogFlow(("PGMR3Init:\n"));
-    PCFGMNODE pCfgPGM = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/PGM");
-    int rc;
 
     /*
@@ -136 +132 @@
     AssertCompileMemberAlignment(PGM, CritSectX, sizeof(uintptr_t));
 
-    /*
-     * If we're in driveless mode we have to use the simplified memory mode.
-     */
     bool const fDriverless = SUPR3IsDriverless();
-    AssertReturn(fDriverless, VERR_NOT_SUPPORTED);
-    if (!pVM->pgm.s.fNemMode)
-        pVM->pgm.s.fNemMode = true;
 
     /*
@@ -148 +138 @@
      */
     /*pVM->pgm.s.fRestoreRomPagesAtReset = false;*/
+
+    /* We always use the simplified memory mode on arm. */
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
+    pVM->pgm.s.fNemMode = true;
+#endif
 
     for (unsigned i = 0; i < RT_ELEMENTS(pVM->pgm.s.aHandyPages); i++)
@@ -168 +163 @@
     for (size_t i = 0; i < RT_ELEMENTS(pVM->pgm.s.aPhysHandlerTypes); i++)
     {
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
         if (fDriverless)
+#endif
             pVM->pgm.s.aPhysHandlerTypes[i].hType  = i | (RTRandU64() & ~(uint64_t)PGMPHYSHANDLERTYPE_IDX_MASK);
         pVM->pgm.s.aPhysHandlerTypes[i].enmKind    = PGMPHYSHANDLERKIND_INVALID;
@@ -183 +180 @@
 #endif
 
-    rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "RamPreAlloc", &pVM->pgm.s.fRamPreAlloc,
+    /*
+     * Read the configuration.
+     */
+    PCFGMNODE const pCfgPGM = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/PGM");
+
+    int rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "RamPreAlloc", &pVM->pgm.s.fRamPreAlloc,
 #ifdef VBOX_WITH_PREALLOC_RAM_BY_DEFAULT
                             true
@@ -252 +254 @@
      */
     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 */;
     AssertRelease(pVM->pgm.s.HCPhysZeroPg != NIL_RTHCPHYS);
     AssertRelease(pVM->pgm.s.HCPhysZeroPg != 0);
+#endif
 
     /*
@@ -262 +266 @@
      */
     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 */;
@@ -267 +272 @@
     AssertRelease(pVM->pgm.s.HCPhysMmioPg != 0);
     pVM->pgm.s.HCPhysInvMmioPg = pVM->pgm.s.HCPhysMmioPg;
+#endif
 
     /*
@@ -282 +288 @@
     AssertLogRelMsgStmt(cAccessHandlers >= 32, ("cAccessHandlers=%#x, min 32\n", cAccessHandlers), cAccessHandlers = 32);
     AssertLogRelMsgStmt(cAccessHandlers <= _64K, ("cAccessHandlers=%#x, max 65536\n", cAccessHandlers), cAccessHandlers = _64K);
+#if defined(VBOX_WITH_R0_MODULES) && !defined(VBOX_WITH_MINIMAL_R0)
     if (!fDriverless)
     {
@@ -291 +298 @@
     }
     else
+#endif
     {
         uint32_t       cbTreeAndBitmap = 0;
@@ -331 +339 @@
 
 /**
- * Ring-3 init finalizing.
+ * Ring-3 init finalizing (not required here).
  *
  * @returns VBox status code.
@@ -338 +346 @@
 VMMR3DECL(int) PGMR3InitFinalize(PVM pVM)
 {
-    /*
-     * Allocate memory if we're supposed to do that.
-     */
+    RT_NOREF(pVM);
     int rc = VINF_SUCCESS;
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     if (pVM->pgm.s.fRamPreAlloc)
         rc = pgmR3PhysRamPreAllocate(pVM);
+#endif
 
     //pgmLogState(pVM);
-    LogRel(("PGM: PGMR3InitFinalize: 4 MB PSE mask %RGp -> %Rrc\n", pVM->pgm.s.GCPhys4MBPSEMask, rc));
+    LogRel(("PGM: PGMR3InitFinalize done: %Rrc\n", rc));
     return rc;
 }
@@ -511 +519 @@
 VMMDECL(bool) PGMHasDirtyPages(PVM pVM)
 {
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     return pVM->pgm.s.CTX_SUFF(pPool)->cDirtyPages != 0;
+#else
+    RT_NOREF(pVM);
+    return false;
+#endif
 }
 
@@ -730 +743 @@
 
     CPUMMODE enmCpuMode = CPUMGetGuestMode(pVCpu);
-    return   enmCpuMode == CPUMMODE_ARMV8_AARCH64
-           ? PGMMODE_VMSA_V8_64
-           : PGMMODE_VMSA_V8_32;
+    return enmCpuMode == CPUMMODE_ARMV8_AARCH64
+         ? PGMMODE_VMSA_V8_64
+         : PGMMODE_VMSA_V8_32;
 }
 
@@ -1000 +1013 @@
     return pgmGstPtWalk(pVCpu, GCPtr, pWalk, pGstWalk); /** @todo Always do full walk for now. */
 }
+