Changeset 73376 in vbox for trunk/src

Timestamp:

Jul 27, 2018 8:00:39 AM (7 years ago)

Author:

vboxsync

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

123994

Message:

PGM/NEM: catch make-writable changes during memory exits and avoid the emulation when a page was allocated. bugref:9044

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• NEMAllNativeTemplate-win.cpp.h (modified) (1 diff)
• PGMAllPhys.cpp (modified) (1 diff)

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

@@ -1779 +1779 @@
             if (pInfo->fNemProt & NEM_PAGE_PROT_WRITE)
             {
-                Log4(("nemHCWinHandleMemoryAccessPageCheckerCallback: %RGp - #3\n", GCPhys));
+                if (pInfo->u2OldNemState == NEM_WIN_PAGE_STATE_WRITABLE)
+                    Log4(("nemHCWinHandleMemoryAccessPageCheckerCallback: %RGp - #3a\n", GCPhys));
+                else
+                {
+                    pState->fCanResume = true;
+                    Log4(("nemHCWinHandleMemoryAccessPageCheckerCallback: %RGp - #3b (%s -> %s)\n",
+                          GCPhys, g_apszPageStates[pInfo->u2OldNemState], g_apszPageStates[u2State]));
+                }
                 return VINF_SUCCESS;
             }

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -4768 +4768 @@
     {
         /* Try make it writable if requested. */
+        pInfo->u2OldNemState = PGM_PAGE_GET_NEM_STATE(pPage);
         if (fMakeWritable)
             switch (PGM_PAGE_GET_STATE(pPage))