Changeset 51961 in vbox

Timestamp:

Jul 10, 2014 8:55:01 AM (10 years ago)

Author:

vboxsync

Message:

VMM/GIM: Fix Hyper-V TSC offset scaling to 100ns units.

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/GIMR0Hv.cpp (modified) (2 diffs)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• VMMR3/GIMHv.cpp (modified) (2 diffs)
• include/GIMHvInternal.h (modified) (1 diff)

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

@@ -25 +25 @@
 #include <VBox/err.h>
 #include <VBox/vmm/gim.h>
+#include <VBox/vmm/tm.h>
 #include <VBox/vmm/vm.h>
 
@@ -103 +104 @@
     Assert(pRefTsc);
 
+    /*
+     * Hyper-V reports the reference time in 100 nanosecond units.
+     */
+    uint64_t u64Tsc100Ns = TMCpuTicksPerSecond(pVM) / UINT64_C(10000000); /* 100 ns */
+    int64_t i64TscOffset = (int64_t)u64Offset / u64Tsc100Ns;
+
+    /*
+     * The TSC page can be simulatenously read by other VCPUs in the guest. The
+     * spinlock is only for protecting simultaneous hypervisor writes from other
+     * EMTs.
+     */
     RTSpinlockAcquire(pcHv->hSpinlockR0);
-    pRefTsc->i64TscOffset = u64Offset;
-    if (pRefTsc->u32TscSequence < UINT32_C(0xfffffffe))
-        ASMAtomicIncU32(&pRefTsc->u32TscSequence);
-    else
-        ASMAtomicWriteU32(&pRefTsc->u32TscSequence, 1);
+    if (pRefTsc->i64TscOffset != i64TscOffset)
+    {
+        ASMAtomicWriteS64(&pRefTsc->i64TscOffset, i64TscOffset);
+        if (pRefTsc->u32TscSequence < UINT32_C(0xfffffffe))
+            ASMAtomicIncU32(&pRefTsc->u32TscSequence);
+        else
+            ASMAtomicWriteU32(&pRefTsc->u32TscSequence, 1);
+    }
     RTSpinlockRelease(pcHv->hSpinlockR0);
 
     Assert(pRefTsc->u32TscSequence != 0);
     Assert(pRefTsc->u32TscSequence != UINT32_C(0xffffffff));
+    AssertReturn(pRefTsc->u32TscSequence != 0xfffffffe, VERR_GIM_IPE_3);
     return VINF_SUCCESS;
 }

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

@@ -5589 +5589 @@
     if (fParavirtTsc)
     {
-#if 0
+#if 1
         uint64_t const u64CurTsc   = ASMReadTSC();
         uint64_t const u64LastTick = TMCpuTickGetLastSeen(pVCpu);

trunk/src/VBox/VMM/VMMR3/GIMHv.cpp

@@ -491 +491 @@
         pRefTsc->u64TscScale     = ((INT64_C(10000) << 32) / u64TscKHz) << 32;
 
-        LogRel(("GIM: HyperV: Enabled TSC page at %#RGp (u64TscScale=%#RX64 u64TscKHz=%#RX64)\n", GCPhysTscPage,
-                pRefTsc->u64TscScale, u64TscKHz));
+        LogRel(("GIM: HyperV: Enabled TSC page at %#RGp - u64TscScale=%#RX64 u64TscKHz=%#RX64 (%'RU64)\n", GCPhysTscPage,
+                pRefTsc->u64TscScale, u64TscKHz, u64TscKHz));
         return VINF_SUCCESS;
     }
@@ -602 +602 @@
         {
             /** @todo Handle raw-mode hypercall page patching. */
-            LogRelFunc(("Raw-mode not yet implemented!\n"));
+            LogRel(("GIM: HyperV: Raw-mode not yet implemented!\n"));
         }
         GIMR3Mmio2Unmap(pVM, pRegion);

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

@@ -425 +425 @@
 /**
  * MMIO2 region indices.
- * Note!! Saved-state are dependent on the index values, do -not- change!
  */
 /** The hypercall page region. */