Changeset 92569 in vbox for trunk/src/VBox/VMM

Timestamp:

Nov 23, 2021 3:47:04 PM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:10092 Call PGMSetGuestEptPtr before calling PGMGstMapPaePdpesAtCr3. This should probably be asserted somehow...

File:

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

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -6680 +6680 @@
 
     /*
+     * Set PGM's copy of the EPT pointer.
+     * The EPTP has already been validated while checking guest state.
+     *
+     * It is important to do this prior to mapping PAE PDPTEs (below).
+     */
+    if (pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_EPT)
+        PGMSetGuestEptPtr(pVCpu, pVmcs->u64EptPtr.u);
+
+    /*
      * Load the guest's PAE PDPTEs.
      */
@@ -6715 +6724 @@
         }
     }
-
-    /*
-     * Set PGM's copy of the EPT pointer.
-     * The EPTP has already been validated while checking guest state.
-     */
-    if (pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_EPT)
-        PGMSetGuestEptPtr(pVCpu, pVmcs->u64EptPtr.u);
 
     /* VPID is irrelevant. We don't support VPID yet. */