Changeset 91427 in vbox for trunk/src/VBox

Timestamp:

Sep 28, 2021 8:54:40 AM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:10092 Save PAE PDPTEs from CPU context to VMCS on VM-exit when EPT is enabled.

File:

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

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

@@ -1525 +1525 @@
         pVmcs->u32PreemptTimer = iemVmxCalcPreemptTimer(pVCpu);
 
-    /* PDPTEs. */
-    /* We don't support EPT yet. */
-    Assert(!(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_EPT));
-    pVmcs->u64GuestPdpte0.u = 0;
-    pVmcs->u64GuestPdpte1.u = 0;
-    pVmcs->u64GuestPdpte2.u = 0;
-    pVmcs->u64GuestPdpte3.u = 0;
+    /*
+     * PAE PDPTEs.
+     *
+     * If EPT is enabled and PAE paging was used at the time of the VM-exit,
+     * the PDPTEs are saved from the VMCS. Otherwise they're undefined but
+     * we zero them for consistency.
+     */
+    if (    (pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_EPT)
+        && !(pVmcs->u32EntryCtls & VMX_ENTRY_CTLS_IA32E_MODE_GUEST)
+        &&  (pVCpu->cpum.GstCtx.cr4 & X86_CR4_PAE)
+        &&  (pVCpu->cpum.GstCtx.cr0 & X86_CR0_PG))
+    {
+        pVmcs->u64GuestPdpte0.u = pVCpu->cpum.GstCtx.aPaePdpes[0].u;
+        pVmcs->u64GuestPdpte1.u = pVCpu->cpum.GstCtx.aPaePdpes[1].u;
+        pVmcs->u64GuestPdpte2.u = pVCpu->cpum.GstCtx.aPaePdpes[2].u;
+        pVmcs->u64GuestPdpte3.u = pVCpu->cpum.GstCtx.aPaePdpes[3].u;
+    }
+    else
+    {
+        pVmcs->u64GuestPdpte0.u = 0;
+        pVmcs->u64GuestPdpte1.u = 0;
+        pVmcs->u64GuestPdpte2.u = 0;
+        pVmcs->u64GuestPdpte3.u = 0;
+    }
 }
 
@@ -5638 +5655 @@
     const char * const pszFailure = "VM-exit";
 
-    bool const fGstInLongMode = RT_BOOL(pVmcs->u32EntryCtls & VMX_ENTRY_CTLS_IA32E_MODE_GUEST);
-    if (   !fGstInLongMode
-        && (pVmcs->u64GuestCr4.u & X86_CR4_PAE)
-        && (pVmcs->u64GuestCr0.u & X86_CR0_PG))
+    if (   !(pVmcs->u32EntryCtls & VMX_ENTRY_CTLS_IA32E_MODE_GUEST)
+        &&  (pVmcs->u64GuestCr4.u & X86_CR4_PAE)
+        &&  (pVmcs->u64GuestCr0.u & X86_CR0_PG))
     {
         /* Get the PDPTEs. */