Changeset 53235 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Nov 5, 2014 12:56:17 PM (10 years ago)

Author:

vboxsync

Message:

VMM: Fixed incorrect pure TSC-offsetting mode switch with paravirt. VMs when the host/TM cannot do offsetting.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (1 diff)

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

@@ -2262 +2262 @@
         uint64_t u64CurTSC   = ASMReadTSC();
         uint64_t u64LastTick = TMCpuTickGetLastSeen(pVCpu);
-        if (fParavirtTsc)
-        {
-#if 0
-            if (u64CurTSC - pVmcb->ctrl.u64TSCOffset < u64LastTick)
-            {
-                pVmcb->ctrl.u64TSCOffset = u64CurTSC - u64LastTick;
-                STAM_COUNTER_INC(&pVCpu->hm.s.StatTscOffsetAdjusted);
-            }
-            int rc = GIMR0UpdateParavirtTsc(pVCpu->CTX_SUFF(pVM), pVmcb->ctrl.u64TSCOffset);
-            AssertRC(rc);
-#endif
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatTscParavirt);
-        }
 
         if (u64CurTSC - pVmcb->ctrl.u64TSCOffset >= TMCpuTickGetLastSeen(pVCpu))
@@ -2295 +2282 @@
         pVmcb->ctrl.u32InterceptCtrl2 |= SVM_CTRL2_INTERCEPT_RDTSCP;
         STAM_COUNTER_INC(&pVCpu->hm.s.StatTscIntercept);
+    }
+
+    if (fParavirtTsc)
+    {
+        int rc = GIMR0UpdateParavirtTsc(pVCpu->CTX_SUFF(pVM), 0 /* u64Offset */);
+        AssertRC(rc);
+        STAM_COUNTER_INC(&pVCpu->hm.s.StatTscParavirt);
     }
 

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

@@ -5622 +5622 @@
     if (fParavirtTsc)
     {
-        /** @todo this is a hack until TM switches to pure-offsetting mode. */
-        uint64_t const u64CurTsc   = ASMReadTSC();
-        uint64_t const u64LastTick = TMCpuTickGetLastSeen(pVCpu);
-        if (u64CurTsc - pVCpu->hm.s.vmx.u64TSCOffset < u64LastTick)
-        {
-            pVCpu->hm.s.vmx.u64TSCOffset = u64CurTsc - u64LastTick;
-            STAM_COUNTER_INC(&pVCpu->hm.s.StatTscOffsetAdjusted);
-        }
-
-        Assert(u64CurTsc - pVCpu->hm.s.vmx.u64TSCOffset >= u64LastTick);
-        rc = GIMR0UpdateParavirtTsc(pVM, pVCpu->hm.s.vmx.u64TSCOffset);
+        rc = GIMR0UpdateParavirtTsc(pVM, 0 /* u64Offset */);
         AssertRC(rc);
-        /* Note: VMX_VMCS_CTRL_PROC_EXEC_RDTSC_EXIT takes precedence over TSC_OFFSET, applies to RDTSCP too. */
-        rc = VMXWriteVmcs64(VMX_VMCS64_CTRL_TSC_OFFSET_FULL, 0);                                    AssertRC(rc);
-
-        pVCpu->hm.s.vmx.u32ProcCtls &= ~VMX_VMCS_CTRL_PROC_EXEC_RDTSC_EXIT;
-        rc = VMXWriteVmcs32(VMX_VMCS32_CTRL_PROC_EXEC, pVCpu->hm.s.vmx.u32ProcCtls);                AssertRC(rc);
         STAM_COUNTER_INC(&pVCpu->hm.s.StatTscParavirt);
     }
-    else if (fOffsettedTsc)
+
+    if (fOffsettedTsc)
     {
         uint64_t u64CurTSC = ASMReadTSC();