Changeset 92409 in vbox

Timestamp:

Nov 12, 2021 10:17:42 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PDM,PGM: Added PGMR3IsNemModeEnabled and made PDM not put devices in ring-0 when the simplified memory mode is active as it is implied that we won't be running anything from ring-0 (at least not on windows and mac, I think). PDM must use RTMemAllocZ instead of MMR3HeapAllocZEx for allocating device instance data to get proper alignment. bugref:10122

Location:

trunk

Files:

• include/VBox/vmm/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/PGM.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/pgm.h

@@ -695 +695 @@
  */
 VMMR3_INT_DECL(void)    PGMR3EnableNemMode(PVM pVM);
+VMMR3_INT_DECL(bool)    PGMR3IsNemModeEnabled(PVM pVM);
 VMMR3DECL(int)      PGMR3Init(PVM pVM);
 VMMR3DECL(int)      PGMR3InitFinalize(PVM pVM);

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

@@ -278 +278 @@
         bool fR0Enabled = false;
         bool fRCEnabled = false;
-        if (pReg->fFlags & (PDM_DEVREG_FLAGS_R0 | PDM_DEVREG_FLAGS_RC))
+        if (   (pReg->fFlags & (PDM_DEVREG_FLAGS_R0 | PDM_DEVREG_FLAGS_RC))
+            && !PGMR3IsNemModeEnabled(pVM) /* No ring-0 in simplified memory mode. */ )
         {
             if (pReg->fFlags & PDM_DEVREG_FLAGS_R0)
@@ -414 +415 @@
                                   VERR_ALLOCATION_TOO_BIG);
 
+#if 0  /* Several devices demands cacheline aligned data, if not page aligned. Real problem in NEM mode. */
             rc = MMR3HeapAllocZEx(pVM, MM_TAG_PDM_DEVICE, cb, (void **)&pDevIns);
             AssertLogRelMsgRCReturn(rc, ("Failed to allocate %zu bytes of instance data for device '%s'. rc=%Rrc\n",
                                          cb, pReg->szName, rc), rc);
+#else
+            pDevIns = (PPDMDEVINS)RTMemPageAllocZ(cb);
+            AssertLogRelMsgReturn(pDevIns, ("Failed to allocate %zu bytes of instance data for device '%s'\n", cb, pReg->szName),
+                                  VERR_NO_PAGE_MEMORY);
+#endif
 
             /* Initialize it: */

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

@@ -712 +712 @@
 #endif
 
-
 #ifdef VBOX_WITH_PGM_NEM_MODE
+
 /**
  * Interface that NEM uses to switch PGM into simplified memory managment mode.
@@ -726 +726 @@
     pVM->pgm.s.fNemMode = true;
 }
-#endif
-
+
+
+/**
+ * Checks whether the simplificed memory management mode for NEM is enabled.
+ *
+ * @returns true if enabled, false if not.
+ * @param   pVM     The cross context VM structure.
+ */
+VMMR3_INT_DECL(bool)    PGMR3IsNemModeEnabled(PVM pVM)
+{
+    return pVM->pgm.s.fNemMode;
+}
+
+#endif /* VBOX_WITH_PGM_NEM_MODE */
 
 /**