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

Timestamp:

Jul 16, 2019 6:04:03 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Update TPR-threshold and Virtual-APIC page address VMCS fields only when TPR-shadowing is enabled while merging the VMCS controls before executing the nested-guest. If this control is enabled for the nested-guest VMCS it implies it's also supported by the host CPU (added paranoia assert).

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -10821 +10821 @@
      * The virtual-APIC page has already been allocated (by CPUM during VM startup) and cached
      * from guest memory as part of VMLAUNCH/VMRESUME instruction emulation. The host physical
-     * address has also been updated in the nested-guest VMCS.
+     * address has also been updated in the nested-guest VMCS object during allocation.
      */
     PVMXVMCSINFO pVmcsInfoNstGst = &pVCpu->hm.s.vmx.VmcsInfoNstGst;
@@ -10828 +10828 @@
     if (u32ProcCtls & VMX_PROC_CTLS_USE_TPR_SHADOW)
     {
+        Assert(pVM->hm.s.vmx.Msrs.ProcCtls.n.allowed1 & VMX_PROC_CTLS_USE_TPR_SHADOW);
         HCPhysVirtApic  = pVmcsInfoNstGst->HCPhysVirtApic;
         u32TprThreshold = pVmcsNstGst->u32TprThreshold;
@@ -10882 +10883 @@
         rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_PLE_WINDOW, cPleWindowTicks);
     }
-    rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_TPR_THRESHOLD, u32TprThreshold);
-    rc |= VMXWriteVmcs64(VMX_VMCS64_CTRL_VIRT_APIC_PAGEADDR_FULL, pVmcsInfoNstGst->HCPhysVirtApic);
+    if (u32ProcCtls & VMX_PROC_CTLS_USE_TPR_SHADOW)
+    {
+        rc |= VMXWriteVmcs32(VMX_VMCS32_CTRL_TPR_THRESHOLD, u32TprThreshold);
+        rc |= VMXWriteVmcs64(VMX_VMCS64_CTRL_VIRT_APIC_PAGEADDR_FULL, pVmcsInfoNstGst->HCPhysVirtApic);
+    }
     AssertRCReturn(rc, rc);
 
@@ -14696 +14700 @@
             }
         }
+        /* else: inject pending event before resuming guest execution. */
     }
     else if (rcStrict == VINF_HM_DOUBLE_FAULT)
@@ -17509 +17514 @@
     HMVMX_VALIDATE_NESTED_EXIT_HANDLER_PARAMS(pVCpu, pVmxTransient);
 
-    int rc  = hmR0VmxReadExitIntInfoVmcs(pVmxTransient);
-    rc     |= hmR0VmxReadExitIntErrorCodeVmcs(pVmxTransient);
-    rc     |= hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
+    int rc  = hmR0VmxReadExitInstrLenVmcs(pVmxTransient);
     rc     |= hmR0VmxReadIdtVectoringInfoVmcs(pVmxTransient);
     rc     |= hmR0VmxReadIdtVectoringErrorCodeVmcs(pVmxTransient);