Changeset 53269 in vbox for trunk/include/VBox

Timestamp:

Nov 7, 2014 5:41:01 PM (10 years ago)

Author:

vboxsync

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

96841

Message:

HostDrivers/Support: Enabled global TSC rate calculation and implemented TSC calibration over a longer interval for invariant hosts.

Location:

trunk/include/VBox

Files:

• sup.h (modified) (8 diffs)
• sup.mac (modified) (2 diffs)

trunk/include/VBox/sup.h

@@ -310 +310 @@
     /** The timestamp of the last time we update the update frequency. */
     volatile uint64_t   u64NanoTSLastUpdateHz;
+    /** The TSC frequency of the system. */
+    uint64_t            u64CpuHz;
     /** The set of online CPUs. */
     RTCPUSET            OnlineCpuSet;
@@ -322 +324 @@
     /** The highest number of CPUs possible. */
     uint16_t            cPossibleCpus;
-    /** The highest number of CPUs possible. */
     uint16_t            u16Padding0;
     /** The max CPU ID (RTMpGetMaxCpuId). */
@@ -328 +329 @@
 
     /** Padding / reserved space for future data. */
-    uint32_t            au32Padding1[29];
+    uint32_t            au32Padding1[27];
 
     /** Table indexed by the CPU APIC ID to get the CPU table index. */
@@ -360 +361 @@
  * Upper 16 bits is the major version. Major version is only changed with
  * incompatible changes in the GIP. */
-#define SUPGLOBALINFOPAGE_VERSION   0x00040000
+#define SUPGLOBALINFOPAGE_VERSION   0x00050000
 
 /**
@@ -1467 +1468 @@
 
 /**
+ * Gets the GIP mode name given the GIP mode.
+ *
+ * @returns The name
+ * @param   enmGipMode      The GIP mode.
+ */
+DECLINLINE(const char *) SUPGetGIPModeName(PSUPGLOBALINFOPAGE pGip)
+{
+    Assert(pGip);
+    switch (pGip->u32Mode)
+    {
+        /* case SUPGIPMODE_INVARIANT_TSC:  return "Invariant"; */
+        case SUPGIPMODE_SYNC_TSC:       return "Synchronous";
+        case SUPGIPMODE_ASYNC_TSC:      return "Asynchronous";
+        case SUPGIPMODE_INVALID:        return "Invalid";
+        default:                        return "???";
+    }
+}
+
+
+/**
+ * Checks if the provided TSC frequency is close enough to the computed TSC
+ * frequency of the host.
+ *
+ * @returns true if it's compatible, false otherwise.
+ */
+DECLINLINE(bool) SUPIsTscFreqCompatible(uint64_t u64CpuHz)
+{
+    PSUPGLOBALINFOPAGE pGip = g_pSUPGlobalInfoPage;
+    if (   pGip
+        && pGip->u32Mode == SUPGIPMODE_SYNC_TSC)   /** @todo use INVARIANT_TSC */
+    {
+        uint64_t uLo;
+        uint64_t uHi;
+
+        if (pGip->u64CpuHz == u64CpuHz)
+            return true;
+
+        /* Arbitrary tolerance threshold, tweak later if required, perhaps
+           more tolerance on higher frequencies and less tolerance on lower. */
+        uLo = (pGip->u64CpuHz << 10) / 1025;
+        uHi = pGip->u64CpuHz + (pGip->u64CpuHz - uLo);
+        if (   u64CpuHz < uLo
+            || u64CpuHz > uHi)
+        {
+            return false;
+        }
+        return true;
+    }
+    return false;
+}
+
+
+
+/**
  * Applies the TSC delta to the supplied raw TSC value.
  *
@@ -1478 +1533 @@
  * @remarks Maybe called with interrupts disabled!
  */
-DECLINLINE(int) SUPTscDeltaApply(PSUPGLOBALINFOPAGE pGip, uint64_t *puTsc, uint16_t idApic, bool *fDeltaApplied)
+DECLINLINE(int) SUPTscDeltaApply(PSUPGLOBALINFOPAGE pGip, uint64_t *puTsc, uint16_t idApic, bool *pfDeltaApplied)
 {
     PSUPGIPCPU pGipCpu;
@@ -1487 +1542 @@
     Assert(pGip);
 
+    AssertMsgReturn(idApic < RT_ELEMENTS(pGip->aiCpuFromApicId), ("idApic=%u\n", idApic), VERR_INVALID_CPU_ID);
     iCpu = pGip->aiCpuFromApicId[idApic];
     AssertMsgReturn(iCpu < pGip->cCpus, ("iCpu=%u cCpus=%u\n", iCpu, pGip->cCpus), VERR_INVALID_CPU_INDEX);
@@ -1495 +1551 @@
     {
         *puTsc -= pGipCpu->i64TSCDelta;
-        if (fDeltaApplied)
-            *fDeltaApplied = true;
+        if (pfDeltaApplied)
+            *pfDeltaApplied = true;
     }
-    else if (fDeltaApplied)
-        *fDeltaApplied = false;
+    else if (pfDeltaApplied)
+        *pfDeltaApplied = false;
 
     return VINF_SUCCESS;

trunk/include/VBox/sup.mac

@@ -58 +58 @@
     .u32UpdateIntervalNS        resd 1
     .u64NanoTSLastUpdateHz      resq 1
+    .u64CpuHz                   resq 1
     .OnlineCpuSet               resq 4
     .PresentCpuSet              resq 4
@@ -66 +67 @@
     .u16Padding0                resw 1
     .idCpuMax                   resd 1
-    .au32Padding1               resd 29
+    .au32Padding1               resd 27
     .aiCpuFromApicId            resw 256
     .aiCpuFromCpuSetIdx         resw 256