Changeset 93573 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 3, 2022 11:22:36 AM (3 years ago)

Author:

vboxsync

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

149708

Message:

VMM: Nested VMX: bugref:10092 The guest SLAT mode should be EPT even when nested-guest paging isn't enabled (since we need to still perform SLAT for real-mode).

File:

• trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (2 diffs)

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

@@ -2480 +2480 @@
     RTGCPHYS       GCPhysCR3    = pgmGetGuestMaskedCr3(pVCpu, cr3);
 #ifdef VBOX_WITH_NESTED_HWVIRT_VMX_EPT
-    if (pVCpu->pgm.s.enmGuestSlatMode == PGMSLAT_EPT)
+    if (   pVCpu->pgm.s.enmGuestSlatMode == PGMSLAT_EPT
+        && PGMMODE_WITH_PAGING(pVCpu->pgm.s.enmGuestMode))
     {
         LogFlowFunc(("nested_cr3=%RX64 old=%RX64\n", GCPhysCR3, pVCpu->pgm.s.GCPhysNstGstCR3));
@@ -3373 +3374 @@
      *   - Indicate that the CR3 is nested-guest physical address.
      */
-    if (   CPUMIsGuestVmxEptPagingEnabled(pVCpu)
-        && PGMMODE_WITH_PAGING(enmGuestMode))
-    {
-        /*
-         * Translate CR3 to its guest-physical address.
-         * We don't use pgmGstSlatTranslateCr3() here as we want to update GCPhysNstGstCR3 -after-
-         * switching modes to keep it consistent with how GCPhysCR3 is updated.
-         */
-        PGMPTWALK    Walk;
-        PGMPTWALKGST GstWalk;
-        int const rc = pgmGstSlatWalkPhys(pVCpu, PGMSLAT_EPT, GCPhysCR3, &Walk, &GstWalk);
-        if (RT_SUCCESS(rc))
-        { /* likely */ }
-        else
+    if (CPUMIsGuestVmxEptPagingEnabled(pVCpu))
+    {
+        if (PGMMODE_WITH_PAGING(enmGuestMode))
         {
             /*
-             * SLAT failed but we avoid reporting this to the caller because the caller
-             * is not supposed to fail. The only time the caller needs to indicate a
-             * failure to software is when PAE paging is used by the nested-guest, but
-             * we handle the PAE case separately (e.g., see VMX transition in IEM).
-             * In all other cases, the failure will be indicated when CR3 tries to be
-             * translated on the next linear-address memory access.
-             * See Intel spec. 27.2.1 "EPT Overview".
+             * Translate CR3 to its guest-physical address.
+             * We don't use pgmGstSlatTranslateCr3() here as we want to update GCPhysNstGstCR3 -after-
+             * switching modes to keep it consistent with how GCPhysCR3 is updated.
              */
-            AssertMsgFailed(("SLAT failed for CR3 %#RX64 rc=%Rrc\n", GCPhysCR3, rc));
-
-            /* Trying to coax PGM to succeed for the time being... */
-            Assert(pVCpu->pgm.s.GCPhysCR3 == NIL_RTGCPHYS);
+            PGMPTWALK    Walk;
+            PGMPTWALKGST GstWalk;
+            int const rc = pgmGstSlatWalkPhys(pVCpu, PGMSLAT_EPT, GCPhysCR3, &Walk, &GstWalk);
+            if (RT_SUCCESS(rc))
+            { /* likely */ }
+            else
+            {
+                /*
+                 * SLAT failed but we avoid reporting this to the caller because the caller
+                 * is not supposed to fail. The only time the caller needs to indicate a
+                 * failure to software is when PAE paging is used by the nested-guest, but
+                 * we handle the PAE case separately (e.g., see VMX transition in IEM).
+                 * In all other cases, the failure will be indicated when CR3 tries to be
+                 * translated on the next linear-address memory access.
+                 * See Intel spec. 27.2.1 "EPT Overview".
+                 */
+                AssertMsgFailed(("SLAT failed for CR3 %#RX64 rc=%Rrc\n", GCPhysCR3, rc));
+
+                /* Trying to coax PGM to succeed for the time being... */
+                Assert(pVCpu->pgm.s.GCPhysCR3 == NIL_RTGCPHYS);
+                pVCpu->pgm.s.GCPhysNstGstCR3  = GCPhysCR3;
+                pVCpu->pgm.s.enmGuestSlatMode = PGMSLAT_EPT;
+                pVCpu->pgm.s.enmGuestMode     = enmGuestMode;
+                HMHCChangedPagingMode(pVM, pVCpu, pVCpu->pgm.s.enmShadowMode, pVCpu->pgm.s.enmGuestMode);
+                return VINF_SUCCESS;
+            }
             pVCpu->pgm.s.GCPhysNstGstCR3  = GCPhysCR3;
-            pVCpu->pgm.s.enmGuestSlatMode = PGMSLAT_EPT;
-            pVCpu->pgm.s.enmGuestMode     = enmGuestMode;
-            HMHCChangedPagingMode(pVM, pVCpu, pVCpu->pgm.s.enmShadowMode, pVCpu->pgm.s.enmGuestMode);
-            return VINF_SUCCESS;
-        }
-
-        pVCpu->pgm.s.GCPhysNstGstCR3  = GCPhysCR3;
+            GCPhysCR3 = Walk.GCPhys;
+        }
         pVCpu->pgm.s.enmGuestSlatMode = PGMSLAT_EPT;
-        GCPhysCR3 = Walk.GCPhys;
     }
     else