Changeset 76050 in vbox for trunk/src/VBox

Timestamp:

Dec 7, 2018 11:14:56 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Fixed VMCLEAR to use the guest-physical address rather than the guest-virtual address to offset into the VMCS while clearing state. Fixed VMPTRLD to write back to memory the current VMCS (if any) before loading a new current VMCS.

File:

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

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

@@ -7920 +7920 @@
     else
     {
-        rcStrict = PGMPhysSimpleWriteGCPhys(pVCpu->CTX_SUFF(pVM), GCPtrVmcs + RT_UOFFSETOF(VMXVVMCS, fVmcsState),
+        AssertCompileMemberSize(VMXVVMCS, fVmcsState, sizeof(fVmcsStateClear));
+        rcStrict = PGMPhysSimpleWriteGCPhys(pVCpu->CTX_SUFF(pVM), GCPhysVmcs + RT_UOFFSETOF(VMXVVMCS, fVmcsState),
                                             (const void *)&fVmcsStateClear, sizeof(fVmcsStateClear));
         if (RT_FAILURE(rcStrict))
@@ -8103 +8104 @@
 
     /*
-     * We only maintain only the current VMCS in our virtual CPU context (CPUMCTX). Therefore,
-     * VMPTRLD shall always flush any existing current VMCS back to guest memory before loading
-     * a new VMCS as current.
-     */
-    if (IEM_VMX_GET_CURRENT_VMCS(pVCpu) != GCPhysVmcs)
-    {
+     * We maintain only the cache of the current VMCS in CPUMCTX. Therefore, VMPTRLD shall
+     * always flush the cache contents of any existing, current VMCS back to guest memory
+     * before loading a new VMCS as current.
+     */
+    if (   IEM_VMX_HAS_CURRENT_VMCS(pVCpu)
+        && IEM_VMX_GET_CURRENT_VMCS(pVCpu) != GCPhysVmcs)
         iemVmxCommitCurrentVmcsToMemory(pVCpu);
-        IEM_VMX_SET_CURRENT_VMCS(pVCpu, GCPhysVmcs);
-    }
+
+    IEM_VMX_SET_CURRENT_VMCS(pVCpu, GCPhysVmcs);
 
     iemVmxVmSucceed(pVCpu);