Changeset 45820 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Apr 29, 2013 3:31:20 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Update TSC offsetting when the guest write TSC. This fixes the Windows 7 guest BSODs and hangs.

Fixes also re-updating TSC offsetting when we get rescheduled to another CPU due to a longjmp.

File:

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

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

@@ -6539 +6539 @@
         pVmxTransient->u8GuestTpr = pVCpu->hm.s.vmx.pbVirtApic[0x80];
 
+    if (   pVmxTransient->fUpdateTscOffsettingAndPreemptTimer
+        || HMR0GetCurrentCpu()->idCpu != pVCpu->hm.s.idLastCpu)
+    {
+        hmR0VmxUpdateTscOffsettingAndPreemptTimer(pVCpu, pMixedCtx);
+        pVmxTransient->fUpdateTscOffsettingAndPreemptTimer = false;
+    }
+
     ASMAtomicWriteBool(&pVCpu->hm.s.fCheckedTLBFlush, true);    /* Used for TLB-shootdowns, set this across the world switch. */
     hmR0VmxFlushTaggedTlb(pVCpu);                               /* Invalidate the appropriate guest entries from the TLB. */
-
-    if (pVmxTransient->fUpdateTscOffsettingAndPreemptTimer)
-    {
-        hmR0VmxUpdateTscOffsettingAndPreemptTimer(pVCpu, pMixedCtx);
-        pVmxTransient->fUpdateTscOffsettingAndPreemptTimer = false;
-    }
+    Assert(HMR0GetCurrentCpu()->idCpu == pVCpu->hm.s.idLastCpu);
 
     /*
@@ -7640 +7642 @@
             pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_VMX_GUEST_AUTO_MSRS;
         }
+        else if (pMixedCtx->ecx == MSR_IA32_TSC)        /* Windows 7 does this during bootup. See @bugref{6398}. */
+            pVmxTransient->fUpdateTscOffsettingAndPreemptTimer = true;
 
         /* Update MSRs that are part of the VMCS when MSR-bitmaps are not supported. */