Changeset 76722 in vbox for trunk

Timestamp:

Jan 9, 2019 8:15:04 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Fix VMLAUNCH/VMRESUME and VMPTRLD caching of the VMCS. We cache VMCS on VMPTRLD, so do not reload it again during VMLAUNCH/VMRESUME.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/HMVMXAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (3 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -4048 +4048 @@
     kVmxVDiag_Vmentry_ProcCtls2Disallowed0,
     kVmxVDiag_Vmentry_PtrInvalid,
-    kVmxVDiag_Vmentry_PtrReadPhys,
     kVmxVDiag_Vmentry_RealOrV86Mode,
     kVmxVDiag_Vmentry_SavePreemptTimer,

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

@@ -328 +328 @@
     VMXV_DIAG_DESC(kVmxVDiag_Vmentry_ProcCtls2Disallowed0     , "ProcCtls2Disallowed0"      ),
     VMXV_DIAG_DESC(kVmxVDiag_Vmentry_PtrInvalid               , "PtrInvalid"                ),
-    VMXV_DIAG_DESC(kVmxVDiag_Vmentry_PtrReadPhys              , "PtrReadPhys"               ),
     VMXV_DIAG_DESC(kVmxVDiag_Vmentry_RealOrV86Mode            , "RealOrV86Mode"             ),
     VMXV_DIAG_DESC(kVmxVDiag_Vmentry_SavePreemptTimer         , "SavePreemptTimer"          ),

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

@@ -7220 +7220 @@
 
     /*
-     * Load the current VMCS.
-     */
-    Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs));
-    int rc = PGMPhysSimpleReadGCPhys(pVCpu->CTX_SUFF(pVM), pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs),
-                                     IEM_VMX_GET_CURRENT_VMCS(pVCpu), VMX_V_VMCS_SIZE);
-    if (RT_FAILURE(rc))
-    {
-        Log(("%s: Failed to read VMCS at %#RGp, rc=%Rrc\n", pszInstr, IEM_VMX_GET_CURRENT_VMCS(pVCpu), rc));
-        pVCpu->cpum.GstCtx.hwvirt.vmx.enmDiag = kVmxVDiag_Vmentry_PtrReadPhys;
-        return rc;
-    }
-
-    /*
      * We are allowed to cache VMCS related data structures (such as I/O bitmaps, MSR bitmaps)
      * while entering VMX non-root mode. We do some of this while checking VM-execution
@@ -7242 +7229 @@
      * See Intel spec. 24.11.4 "Software Access to Related Structures".
      */
-    rc = iemVmxVmentryCheckExecCtls(pVCpu, pszInstr);
+    Assert(pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs));
+    Assert(IEM_VMX_HAS_CURRENT_VMCS(pVCpu));
+    int rc = iemVmxVmentryCheckExecCtls(pVCpu, pszInstr);
     if (RT_SUCCESS(rc))
     {
@@ -8099 +8088 @@
 
     /*
-     * 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);
-        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));
-    if (RT_FAILURE(rc))
-    {
-        Log(("vmptrld: Failed to read VMCS at %#RGp, rc=%Rrc\n", GCPhysVmcs, rc));
-        pVCpu->cpum.GstCtx.hwvirt.vmx.enmDiag = kVmxVDiag_Vmptrld_PtrReadPhys;
-        return rc;
-    }
-
-    IEM_VMX_SET_CURRENT_VMCS(pVCpu, GCPhysVmcs);
-
+     * We cache only the current VMCS in CPUMCTX. Therefore, VMPTRLD should always flush
+     * the cache of an existing, current VMCS back to guest memory before loading a new,
+     * different current VMCS.
+     */
+    bool fLoadVmcsFromMem;
+    if (IEM_VMX_HAS_CURRENT_VMCS(pVCpu))
+    {
+        if (IEM_VMX_GET_CURRENT_VMCS(pVCpu) != GCPhysVmcs)
+        {
+            iemVmxCommitCurrentVmcsToMemory(pVCpu);
+            Assert(!IEM_VMX_HAS_CURRENT_VMCS(pVCpu));
+            fLoadVmcsFromMem = true;
+        }
+        else
+            fLoadVmcsFromMem = false;
+    }
+    else
+        fLoadVmcsFromMem = true;
+
+    if (fLoadVmcsFromMem)
+    {
+        /* 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));
+        if (RT_FAILURE(rc))
+        {
+            Log(("vmptrld: Failed to read VMCS at %#RGp, rc=%Rrc\n", GCPhysVmcs, rc));
+            pVCpu->cpum.GstCtx.hwvirt.vmx.enmDiag = kVmxVDiag_Vmptrld_PtrReadPhys;
+            return rc;
+        }
+        IEM_VMX_SET_CURRENT_VMCS(pVCpu, GCPhysVmcs);
+    }
+
+    Assert(IEM_VMX_HAS_CURRENT_VMCS(pVCpu));
     iemVmxVmSucceed(pVCpu);
     iemRegAddToRipAndClearRF(pVCpu, cbInstr);