Changeset 91580 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 6, 2021 7:22:04 AM (3 years ago)

Author:

vboxsync

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

147289

Message:

VMM: Nested VMX: bugref:10092 Made changes to PGM++ to handle invalid PAE PDPEs being loaded.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (1 diff)
• NEMR3Native-win.cpp (modified) (1 diff)
• PGM.cpp (modified) (1 diff)

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

@@ -1452 +1452 @@
     {
         CPUM_IMPORT_EXTRN_RCSTRICT(pVCpu, CPUMCTX_EXTRN_CR0 | CPUMCTX_EXTRN_CR3 | CPUMCTX_EXTRN_CR4 | CPUMCTX_EXTRN_EFER, rc);
-        int rc2 = PGMUpdateCR3(pVCpu, CPUMGetGuestCR3(pVCpu));
+        int const rc2 = PGMUpdateCR3(pVCpu, CPUMGetGuestCR3(pVCpu), false /* fPdpesMapped */);
         if (RT_FAILURE(rc2))
             return rc2;

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

@@ -1712 +1712 @@
                 {
                     LogFlow(("nemR3NativeRunGC: calling PGMFlushTLB...\n"));
-                    int rc = PGMFlushTLB(pVCpu, CPUMGetGuestCR3(pVCpu), true);
+                    int rc = PGMFlushTLB(pVCpu, CPUMGetGuestCR3(pVCpu), true /*fGlobal*/, false /*fPdpesMapped*/);
                     AssertRCReturn(rc, rc);
                     if (rcStrict == VINF_NEM_FLUSH_TLB)

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

@@ -2343 +2343 @@
     uintptr_t idxBth = pVCpu->pgm.s.idxBothModeData;
     if (   idxBth < RT_ELEMENTS(g_aPgmBothModeData)
-        && g_aPgmBothModeData[idxBth].pfnMapCR3)
+        && g_aPgmBothModeData[idxBth].pfnUnmapCR3)
     {
         rc = g_aPgmBothModeData[idxBth].pfnUnmapCR3(pVCpu);