Changeset 86056 in vbox

Timestamp:

Sep 7, 2020 8:07:22 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140269

Message:

Back out r140215 which is not required anymore, bugref:9004#c72

Location:

trunk/src/VBox/VMM

Files:

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

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

@@ -4039 +4039 @@
     for (unsigned iLoop = 0;; iLoop++)
     {
-//# ifndef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
+# ifndef NEM_WIN_USE_HYPERCALLS_FOR_PAGES
         /*
          * Hack alert!
          */
         uint32_t const cMappedPages = pVM->nem.s.cMappedPages;
-        if (   cMappedPages >= pVM->nem.s.cMappedPagesMaxBeforeUnmap
-            && pVM->nem.s.cMappedPagesMaxBeforeUnmap != 0)
+        if (cMappedPages >= 4000)
         {
             PGMPhysNemEnumPagesByState(pVM, pVCpu, NEM_WIN_PAGE_STATE_READABLE, nemHCWinUnmapOnePageCallback, NULL);
             Log(("nemHCWinRunGC: Unmapped all; cMappedPages=%u -> %u\n", cMappedPages, pVM->nem.s.cMappedPages));
         }
-//# endif
+# endif
 
         /*

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

@@ -85 +85 @@
 #ifdef RT_OS_WINDOWS
                                   "|UseRing0Runloop"
-                                  "|MaxPagesMappedBeforeUnmap"
 #endif
                                   ,
@@ -122 +121 @@
     AssertLogRelRCReturn(rc, rc);
     pVM->nem.s.fUseRing0Runloop = fUseRing0Runloop;
-
-    /** @cfgm{/NEM/MaxPagesMappedBeforeUnmap, bool, true}
-     * Maximum nuber of pages mapped before into the Hv partition before
-     * unmapping verything and starting from the beginning
-     * @bugref{9044}. */
-    uint32_t cMappedPagesMaxBeforeUnmap = 0;
-    rc = CFGMR3QueryU32Def(pCfgNem, "MaxPagesMappedBeforeUnmap", &cMappedPagesMaxBeforeUnmap, 0);
-    AssertLogRelRCReturn(rc, rc);
-
-    if (   cMappedPagesMaxBeforeUnmap < 4000
-        && cMappedPagesMaxBeforeUnmap != 0)
-    {
-        LogRel(("NEM: MaxPagesMappedBeforeUnmap too small %u, setting to 4000\n", cMappedPagesMaxBeforeUnmap));
-        cMappedPagesMaxBeforeUnmap = 4000;
-    }
-
-    LogRel(("NEM: cMappedPagesMaxBeforeUnmap=%u\n", cMappedPagesMaxBeforeUnmap));
-    pVM->nem.s.cMappedPagesMaxBeforeUnmap = cMappedPagesMaxBeforeUnmap;
 #endif
 

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

@@ -192 +192 @@
     /** Number of currently mapped pages. */
     uint32_t volatile           cMappedPages;
-    /** Maximum number of mappd pages before unmapping everything, 0 disables this. */
-    uint32_t                    cMappedPagesMaxBeforeUnmap;
 
     /** Info about the VidGetHvPartitionId I/O control interface. */