Changeset 79489 in vbox

Timestamp:

Jul 3, 2019 8:02:20 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131753

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Don't add/remove the TSC_AUX MSR during VM-entry because we might transition to executing the nested-guest after the VM-exit. So add during VM-entry and remove on the VM-exit to make sure the MSR bitmap permissions are what they should be in case we transition to executing a nested-guest.

File:

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

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

@@ -280 +280 @@
      *  external interrupt or NMI. */
     bool                fVectoringPF;
-    bool                afAlignment0[3];
+    /** Whether the TSC_AUX MSR needs to be removed from the auto-load/store MSR
+     *  area after VM-exit. */
+    bool                fRemoveTscAuxMsr;
+    bool                afAlignment0[2];
 
     /** The VMCS info. object. */
@@ -11747 +11750 @@
      * host CPU ticks till the next virtual sync deadline (for the dynamic case).
      */
-    if (pVmcsInfo->u32ProcCtls2 & VMX_PROC_CTLS2_RDTSCP)
-    {
-        if (!(pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_RDTSC_EXIT))
-        {
-            /** @todo NSTVMX: This might be broken wrt to merging MSR permissions when
-             *        transitioning to executing the nested-guest. We should probably remove
-             *        the dynamically added MSRs somehow. */
-            hmR0VmxImportGuestState(pVCpu, pVmcsInfo, CPUMCTX_EXTRN_TSC_AUX);
-            /* NB: Because we call hmR0VmxAddAutoLoadStoreMsr with fUpdateHostMsr=true,
-               it's safe even after hmR0VmxUpdateAutoLoadHostMsrs has already been done. */
-            int rc = hmR0VmxAddAutoLoadStoreMsr(pVCpu, pVmxTransient, MSR_K8_TSC_AUX, CPUMGetGuestTscAux(pVCpu),
-                                                true /* fSetReadWrite */, true /* fUpdateHostMsr */);
-            AssertRC(rc);
-        }
-        else
-            hmR0VmxRemoveAutoLoadStoreMsr(pVCpu, pVmxTransient, MSR_K8_TSC_AUX);
+    if (    (pVmcsInfo->u32ProcCtls2 & VMX_PROC_CTLS2_RDTSCP)
+        && !(pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_RDTSC_EXIT))
+    {
+        /** @todo NSTVMX: This might be broken wrt to merging MSR permissions when
+         *        transitioning to executing the nested-guest. We should probably remove
+         *        the dynamically added MSRs somehow. */
+        hmR0VmxImportGuestState(pVCpu, pVmcsInfo, CPUMCTX_EXTRN_TSC_AUX);
+
+        /* NB: Because we call hmR0VmxAddAutoLoadStoreMsr with fUpdateHostMsr=true,
+           it's safe even after hmR0VmxUpdateAutoLoadHostMsrs has already been done. */
+        int rc = hmR0VmxAddAutoLoadStoreMsr(pVCpu, pVmxTransient, MSR_K8_TSC_AUX, CPUMGetGuestTscAux(pVCpu),
+                                            true /* fSetReadWrite */, true /* fUpdateHostMsr */);
+        AssertRC(rc);
+        Assert(!pVmxTransient->fRemoveTscAuxMsr);
+        pVmxTransient->fRemoveTscAuxMsr = true;
     }
 
@@ -11851 +11853 @@
     pVmxTransient->uExitReason    = VMX_EXIT_REASON_BASIC(uExitReason);
     pVmxTransient->fVMEntryFailed = VMX_EXIT_REASON_HAS_ENTRY_FAILED(uExitReason);
+
+    /*
+     * Remove the TSC_AUX MSR from the auto-load/store MSR area and reset any MSR
+     * bitmap permissions, if it was added before VM-entry.
+     */
+    if (pVmxTransient->fRemoveTscAuxMsr)
+    {
+        hmR0VmxRemoveAutoLoadStoreMsr(pVCpu, pVmxTransient, MSR_K8_TSC_AUX);
+        pVmxTransient->fRemoveTscAuxMsr = false;
+    }
 
     /*