Changeset 91958 in vbox for trunk/src

Timestamp:

Oct 21, 2021 2:34:49 PM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM/win: No mapping limits when in simplified memory management mode. bugref:10122

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (2 diffs)
• VMMR3/NEMR3Native-win.cpp (modified) (1 diff)
• include/NEMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -1808 +1808 @@
     LogRel(("nemHCWinHandleMemoryAccessPageCheckerCallback/unmap: GCPhysDst=%RGp rc=%Rrc\n", GCPhys, rc));
     return rc;
+# elif defined(VBOX_WITH_PGM_NEM_MODE)
+    LogRel(("nemHCWinHandleMemoryAccessPageCheckerCallback/unmap: GCPhysDst=%RGp %s hrc=%Rhrc (%#x)\n",
+            GCPhys, g_apszPageStates[u2State], hrc, hrc));
+    return VERR_NEM_UNMAP_PAGES_FAILED;
 # else
     LogRel(("nemHCWinHandleMemoryAccessPageCheckerCallback/unmap: GCPhysDst=%RGp %s hrc=%Rhrc (%#x) Last=%#x/%u (cMappedPages=%u)\n",
@@ -4209 +4213 @@
     for (unsigned iLoop = 0;; iLoop++)
     {
-# ifndef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
+# if !defined(NEM_WIN_USE_HYPERCALLS_FOR_PAGES) && !defined(VBOX_WITH_PGM_NEM_MODE)
         /*
          * Hack alert!

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -1364 +1364 @@
                         STAMR3Register(pVM, (void *)&pVM->nem.s.StatRemapPage, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
                                        "/NEM/PagesRemapFails", STAMUNIT_PAGES, "Calls to HvCallMapGpaPages for changing page protection failed");
-#else
+#elif !defined(VBOX_WITH_PGM_NEM_MODE)
                         STAMR3Register(pVM, (void *)&pVM->nem.s.StatUnmapAllPages, STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS,
                                        "/NEM/PagesUnmapAll", STAMUNIT_PAGES, "Times we had to unmap all the pages");

trunk/src/VBox/VMM/include/NEMInternal.h

@@ -51 +51 @@
  * Windows: Code configuration.
  */
-# define NEM_WIN_USE_HYPERCALLS_FOR_PAGES
+# ifndef VBOX_WITH_PGM_NEM_MODE
+#  define NEM_WIN_USE_HYPERCALLS_FOR_PAGES
+#endif
 //# define NEM_WIN_USE_HYPERCALLS_FOR_REGISTERS   /**< Applies to ring-3 code only. Useful for testing VID API. */
 //# define NEM_WIN_USE_OUR_OWN_RUN_API            /**< Applies to ring-3 code only. Useful for testing VID API. */
@@ -208 +210 @@
     STAMCOUNTER                 StatRemapPage;
     STAMCOUNTER                 StatRemapPageFailed;
-#  else
+#  elif !defined(VBOX_WITH_PGM_NEM_MODE)
     STAMCOUNTER                 StatUnmapAllPages;
 #  endif