Changeset 61753 in vbox

Timestamp:

Jun 17, 2016 3:35:46 PM (9 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Fix host-state re-saving as a result of recent FPU changes requesting host-state re-saving.
Fix assertion with lazy saving host MSRs (to ensure guest MSRs aren't loaded at that point).

File:

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

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

@@ -1473 +1473 @@
      * Note: If you're adding MSRs here, make sure to update the MSR-bitmap permissions in hmR0VmxSetupProcCtls().
      */
-    Assert(!(pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_LOADED_GUEST));
     if (!(pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_SAVED_HOST))
     {
+        Assert(!(pVCpu->hm.s.vmx.fLazyMsrs & VMX_LAZY_MSRS_LOADED_GUEST));  /* Guest MSRs better not be loaded now. */
 #if HC_ARCH_BITS == 64
         if (pVCpu->CTX_SUFF(pVM)->hm.s.fAllow64BitGuests)
@@ -2909 +2909 @@
      * If we've executed guest code using VT-x, the host-state bits will be messed up. We
      * should -not- save the messed up state without restoring the original host-state. See @bugref{7240}.
+     *
+     * This apparently can happen (most likely the FPU changes), deal with it rather than asserting.
      */
-    AssertMsgReturn(!(pVCpu->hm.s.vmx.fRestoreHostFlags & VMX_RESTORE_HOST_REQUIRED),
-                    ("Re-saving host-state after executing guest code without leaving VT-x!\n"), VERR_WRONG_ORDER);
+    if (   (pVCpu->hm.s.vmx.fRestoreHostFlags & VMX_RESTORE_HOST_REQUIRED)
+        && (pVCpu->hm.s.vmx.fRestoreHostFlags & ~VMX_RESTORE_HOST_REQUIRED))
+    {
+        Log4Func(("Restoring Host State: fRestoreHostFlags=%#RX32 HostCpuId=%u\n", pVCpu->hm.s.vmx.fRestoreHostFlags,
+                  pVCpu->idCpu));
+        VMXRestoreHostState(pVCpu->hm.s.vmx.fRestoreHostFlags, &pVCpu->hm.s.vmx.RestoreHost);
+    }
+    pVCpu->hm.s.vmx.fRestoreHostFlags = 0;
 #endif
 
@@ -2928 +2936 @@
     RTSEL uSelGS = 0;
 #endif
-
-    /* Recalculate which host-state bits need to be manually restored. */
-    pVCpu->hm.s.vmx.fRestoreHostFlags = 0;
 
     /*