Changeset 79235 in vbox

Timestamp:

Jun 19, 2019 8:42:11 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Some symmetry with regards to clearing and loading the current VMCS. Renamed iemVmxCommitCurrentVmcsToMemory to iemVmxWriteCurrentVmcsToGstMem and added iemVmxReadCurrentVmcsFromGstMem. Will make it easier to add HM hooks in the right places with clearer names. Also the VMCS read/write functions do not set/clear the current VMCS ptr anymore, let the callers do this.

File:

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

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

@@ -864 +864 @@
  * @param   pVCpu   The cross context virtual CPU structure.
  */
-DECL_FORCE_INLINE(int) iemVmxCommitCurrentVmcsToMemory(PVMCPU pVCpu)
-{
+DECL_FORCE_INLINE(int) iemVmxWriteCurrentVmcsToGstMem(PVMCPU pVCpu)
+{
+    Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs));
     Assert(IEM_VMX_HAS_CURRENT_VMCS(pVCpu));
-    Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs));
     int rc = PGMPhysSimpleWriteGCPhys(pVCpu->CTX_SUFF(pVM), IEM_VMX_GET_CURRENT_VMCS(pVCpu),
                                       pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs), sizeof(VMXVVMCS));
-    IEM_VMX_CLEAR_CURRENT_VMCS(pVCpu);
+    return rc;
+}
+
+
+/**
+ * Populates the current VMCS contents from guest memory.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu   The cross context virtual CPU structure.
+ */
+DECL_FORCE_INLINE(int) iemVmxReadCurrentVmcsFromGstMem(PVMCPU pVCpu)
+{
+    Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs));
+    Assert(IEM_VMX_HAS_CURRENT_VMCS(pVCpu));
+    int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), (void *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs),
+                                     IEM_VMX_GET_CURRENT_VMCS(pVCpu), sizeof(VMXVVMCS));
     return rc;
 }
@@ -7993 +8008 @@
     {
         pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs)->fVmcsState = fVmcsLaunchStateClear;
-        iemVmxCommitCurrentVmcsToMemory(pVCpu);
-        Assert(!IEM_VMX_HAS_CURRENT_VMCS(pVCpu));
+        iemVmxWriteCurrentVmcsToGstMem(pVCpu);
+        IEM_VMX_CLEAR_CURRENT_VMCS(pVCpu);
     }
     else
@@ -8208 +8223 @@
         if (IEM_VMX_HAS_CURRENT_VMCS(pVCpu))
         {
-            iemVmxCommitCurrentVmcsToMemory(pVCpu);
-            Assert(!IEM_VMX_HAS_CURRENT_VMCS(pVCpu));
-        }
-
-        /* Finally, cache the new VMCS from guest memory and mark it as the current VMCS. */
-        rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), (void *)pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs), GCPhysVmcs,
-                                     sizeof(VMXVVMCS));
+            iemVmxWriteCurrentVmcsToGstMem(pVCpu);
+            IEM_VMX_CLEAR_CURRENT_VMCS(pVCpu);
+        }
+
+        /* Set the new VMCS as the current VMCS and read it from guest memory. */
+        IEM_VMX_SET_CURRENT_VMCS(pVCpu, GCPhysVmcs);
+        rc = iemVmxReadCurrentVmcsFromGstMem(pVCpu);
         if (RT_SUCCESS(rc))
         { /* likely */ }
@@ -8223 +8238 @@
             return rc;
         }
-        IEM_VMX_SET_CURRENT_VMCS(pVCpu, GCPhysVmcs);
     }