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

Timestamp:

Nov 29, 2021 12:32:58 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 Adjust PGM APIs and translate nested-guest CR3 prior to mapping them when switching mode and other places.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• EM.cpp (modified) (1 diff)
• NEMR3Native-darwin.cpp (modified) (1 diff)
• NEMR3Native-linux.cpp (modified) (1 diff)
• NEMR3Native-win.cpp (modified) (1 diff)
• PGM.cpp (modified) (3 diffs)
• PGMPhys.cpp (modified) (1 diff)

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

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

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

@@ -1125 +1125 @@
     if (fUpdateCr3)
     {
-        int rc = PGMUpdateCR3(pVCpu, pVCpu->cpum.GstCtx.cr3, false /*fCr3Mapped*/);
+        int rc = PGMUpdateCR3(pVCpu, pVCpu->cpum.GstCtx.cr3);
         if (rc == VINF_SUCCESS)
         { /* likely */ }

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

@@ -1566 +1566 @@
         if (fUpdateCr3)
         {
-            int rc = PGMUpdateCR3(pVCpu, pVCpu->cpum.GstCtx.cr3, false /*fCr3Mapped*/);
+            int rc = PGMUpdateCR3(pVCpu, pVCpu->cpum.GstCtx.cr3);
             if (rc == VINF_SUCCESS)
             { /* likely */ }

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

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

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

@@ -795 +795 @@
 
         pPGM->GCPhysCR3         = NIL_RTGCPHYS;
+        pPGM->GCPhysNstGstCR3   = NIL_RTGCPHYS;
 
         pPGM->pGst32BitPdR3     = NULL;
@@ -1782 +1783 @@
     }
     pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+    pVCpu->pgm.s.GCPhysNstGstCR3 = NIL_RTGCPHYS;
 
     int rc = PGMHCChangeMode(pVM, pVCpu, PGMMODE_REAL);
@@ -1834 +1836 @@
         }
         pVCpu->pgm.s.GCPhysCR3 = NIL_RTGCPHYS;
+        pVCpu->pgm.s.GCPhysNstGstCR3 = NIL_RTGCPHYS;
     }
 

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

@@ -5643 +5643 @@
                     pPGM->pGstPaePdptR3    = NULL;
                     pPGM->pGstAmd64Pml4R3  = NULL;
+                    pPGM->pGstEptPml4R3    = NULL;
                     pPGM->pGst32BitPdR0    = NIL_RTR0PTR;
                     pPGM->pGstPaePdptR0    = NIL_RTR0PTR;
                     pPGM->pGstAmd64Pml4R0  = NIL_RTR0PTR;
+                    pPGM->pGstEptPml4R0    = NIL_RTR0PTR;
                     for (unsigned i = 0; i < RT_ELEMENTS(pPGM->apGstPaePDsR3); i++)
                     {