Changeset 86018 in vbox for trunk/src

Timestamp:

Sep 3, 2020 9:13:51 AM (4 years ago)

Author:

vboxsync

Message:

NEM/Hyper-V: Make the unmap pages hack threshold configurable bugref:9044

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 >= 4000)
-        {
-            PGMPhysNemEnumPagesByState(pVM, pVCpu, NEM_WIN_PAGE_STATE_READABLE, nemR3WinWHvUnmapOnePageCallback, NULL);
+        if (   cMappedPages >= pVM->nem.s.cMappedPagesMaxBeforeUnmap
+            && pVM->nem.s.cMappedPagesMaxBeforeUnmap != 0)
+        {
+            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
                                   ,
@@ -121 +122 @@
     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. */