Changeset 42056 in vbox for trunk

Timestamp:

Jul 9, 2012 12:52:22 PM (13 years ago)

Author:

vboxsync

Message:

VMM/HWVMXR0: Save/restore IA32_TSC_AUX MSR across VMX non-root ops.

Location:

trunk

Files:

• include/iprt/x86.h (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (2 diffs)
• src/VBox/VMM/include/HWACCMInternal.h (modified) (1 diff)

trunk/include/iprt/x86.h

@@ -1081 +1081 @@
 /** K8 KernelGSbase - Used with SWAPGS. */
 #define MSR_K8_KERNEL_GS_BASE               0xc0000102
+/** K8 TSC_AUX - Used with RDTSCP. */
 #define MSR_K8_TSC_AUX                      0xc0000103
 #define MSR_K8_SYSCFG                       0xc0010010

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

@@ -3098 +3098 @@
 
     TMNotifyStartOfExecution(pVCpu);
+
+    /*
+     * Save the current Host TSC_AUX and write the guest TSC_AUX to the host, so that
+     * RDTSCPs (that don't cause exits) reads the guest MSR. See @bugref{3324}.
+     */
+    if (    (pVCpu->hwaccm.s.vmx.proc_ctls2 & VMX_VMCS_CTRL_PROC_EXEC2_RDTSCP)
+        && !(pVCpu->hwaccm.s.vmx.proc_ctls & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_RDTSC_EXIT))
+    {
+        pVCpu->hwaccm.s.vmx.u64HostTSCAux = ASMRdMsr(MSR_K8_TSC_AUX);
+        uint64_t u64GuestTSCAux = 0;
+        rc2 = CPUMQueryGuestMsr(pVCpu, MSR_K8_TSC_AUX, &u64GuestTSCAux);
+        AssertRC(rc2);
+        ASMWrMsr(MSR_K8_TSC_AUX, u64GuestTSCAux);
+    }
+
 #ifdef VBOX_WITH_KERNEL_USING_XMM
     rc = hwaccmR0VMXStartVMWrapXMM(pVCpu->hwaccm.s.fResumeVM, pCtx, &pVCpu->hwaccm.s.vmx.VMCSCache, pVM, pVCpu, pVCpu->hwaccm.s.vmx.pfnStartVM);
@@ -3105 +3120 @@
     ASMAtomicWriteBool(&pVCpu->hwaccm.s.fCheckedTLBFlush, false);
     ASMAtomicIncU32(&pVCpu->hwaccm.s.cWorldSwitchExits);
+
+    /*
+     * Restore host's TSC_AUX.
+     */
+    if (    (pVCpu->hwaccm.s.vmx.proc_ctls2 & VMX_VMCS_CTRL_PROC_EXEC2_RDTSCP)
+        && !(pVCpu->hwaccm.s.vmx.proc_ctls & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_RDTSC_EXIT))
+    {
+        ASMWrMsr(MSR_K8_TSC_AUX, pVCpu->hwaccm.s.vmx.u64HostTSCAux);
+    }
+
     /* Possibly the last TSC value seen by the guest (too high) (only when we're in TSC offset mode). */
     if (!(pVCpu->hwaccm.s.vmx.proc_ctls & VMX_VMCS_CTRL_PROC_EXEC_CONTROLS_RDTSC_EXIT))

trunk/src/VBox/VMM/include/HWACCMInternal.h

@@ -631 +631 @@
         uint32_t                    cCachedMSRs;
         uint32_t                    uAlignement;
+
+        /* Host's IA32_TSC_AUX MSR (for RDTSCP in VMX non-root). */
+        uint64_t                    u64HostTSCAux;
 
         /* Last use TSC offset value. (cached) */