Changeset 54214 in vbox for trunk

Timestamp:

Feb 16, 2015 11:08:27 AM (10 years ago)

Author:

vboxsync

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

98278

Message:

HostDrivers/Support, testcase, TM: Add fTscDeltasRoughlyInSync.

Location:

trunk

Files:

• include/VBox/sup.h (modified) (1 diff)
• include/VBox/sup.mac (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrv.c (modified) (4 diffs)
• src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/TM.cpp (modified) (1 diff)

trunk/include/VBox/sup.h

@@ -332 +332 @@
      *  CPUs. */
     bool                fOsTscDeltasInSync;
-    uint8_t             au8Padding0[3];
+    /** Whether the TSC deltas are small enough to not bother applying. */
+    bool                fTscDeltasRoughlyInSync;
+    uint8_t             au8Padding0[2];
 
     /** Padding / reserved space for future data. */

trunk/include/VBox/sup.mac

@@ -68 +68 @@
     .idCpuMax                   resd 1
     .fOsTscDeltasInSync         resb 1
-    .au8Padding0                resb 3
+    .fTscDeltasRoughlyInSync    resb 1
+    .au8Padding0                resb 2
     .au32Padding1               resd 26
     .aiCpuFromApicId            resw 256

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -124 +124 @@
 /** The TSC-refinement interval in seconds. */
 #define GIP_TSC_REFINE_INTERVAL             5
+/** The TSC-delta threshold (in ticks) for whether it's worth applying them or
+ *  not for performance reasons, see @bugref{6710} comment #124. */
+#define GIP_TSC_DELTA_APPLY_THRESHOLD       384
 
 AssertCompile(GIP_TSC_DELTA_PRIMER_LOOPS < GIP_TSC_DELTA_READ_TIME_LOOPS);
@@ -7265 +7268 @@
             if (RT_UNLIKELY(pGipCpuWorker->i64TSCDelta == INT64_MAX))
                 rc = VERR_SUPDRV_TSC_DELTA_MEASUREMENT_FAILED;
+            else if (   pGipCpuWorker->i64TSCDelta >  GIP_TSC_DELTA_APPLY_THRESHOLD
+                     || pGipCpuWorker->i64TSCDelta < -GIP_TSC_DELTA_APPLY_THRESHOLD)
+            {
+                pGip->fTscDeltasRoughlyInSync = false;
+            }
         }
     }
@@ -7595 +7603 @@
 
     /*
+     * Initialize the structure.
+     */
+    memset(pGip, 0, cbGip);
+
+    /*
      * Record whether the host OS has already normalized inter-CPU deltas for the hardware TSC.
      * We only bother with TSC-deltas on invariant CPUs for now.
@@ -7600 +7613 @@
     pGip->fOsTscDeltasInSync = supdrvIsInvariantTsc() && supdrvOSAreTscDeltasInSync();
 
-    /*
-     * Initialize the structure.
-     */
-    memset(pGip, 0, cbGip);
-    pGip->u32Magic              = SUPGLOBALINFOPAGE_MAGIC;
-    pGip->u32Version            = SUPGLOBALINFOPAGE_VERSION;
-    pGip->u32Mode               = supdrvGipDetermineTscMode(pDevExt);
-    pGip->cCpus                 = (uint16_t)cCpus;
-    pGip->cPages                = (uint16_t)(cbGip / PAGE_SIZE);
-    pGip->u32UpdateHz           = uUpdateHz;
-    pGip->u32UpdateIntervalNS   = uUpdateIntervalNS;
+    pGip->fTscDeltasRoughlyInSync = true;
+    pGip->u32Magic                = SUPGLOBALINFOPAGE_MAGIC;
+    pGip->u32Version              = SUPGLOBALINFOPAGE_VERSION;
+    pGip->u32Mode                 = supdrvGipDetermineTscMode(pDevExt);
+    pGip->cCpus                   = (uint16_t)cCpus;
+    pGip->cPages                  = (uint16_t)(cbGip / PAGE_SIZE);
+    pGip->u32UpdateHz             = uUpdateHz;
+    pGip->u32UpdateIntervalNS     = uUpdateIntervalNS;
     RTCpuSetEmpty(&pGip->OnlineCpuSet);
     RTCpuSetEmpty(&pGip->PresentCpuSet);
     RTMpGetSet(&pGip->PossibleCpuSet);
-    pGip->cOnlineCpus           = RTMpGetOnlineCount();
-    pGip->cPresentCpus          = RTMpGetPresentCount();
-    pGip->cPossibleCpus         = RTMpGetCount();
-    pGip->idCpuMax              = RTMpGetMaxCpuId();
+    pGip->cOnlineCpus             = RTMpGetOnlineCount();
+    pGip->cPresentCpus            = RTMpGetPresentCount();
+    pGip->cPossibleCpus           = RTMpGetCount();
+    pGip->idCpuMax                = RTMpGetMaxCpuId();
     for (i = 0; i < RT_ELEMENTS(pGip->aiCpuFromApicId); i++)
         pGip->aiCpuFromApicId[i]    = UINT16_MAX;

trunk/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp

@@ -251 +251 @@
                     RTPrintf("tstGIP-2: offline: %lld\n", g_pSUPGlobalInfoPage->aCPUs[iCpu].i64TSCDelta);
 
+            RTPrintf("fTscDeltasRoughlyInSync: %RTbool\n", g_pSUPGlobalInfoPage->fTscDeltasRoughlyInSync);
             RTPrintf("CPUID.Invariant-TSC    : %RTbool\n", tstIsInvariantTsc());
             if (   uCpuHzRef

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

@@ -619 +619 @@
      * Dump the GIPCPU TSC-deltas, iterate using the Apic Id to get master at the beginning in most cases.
      */
+    LogRel(("TM: GIP - fTscDeltasRoughlyInSync=%RTbool\n", g_pSUPGlobalInfoPage->fTscDeltasRoughlyInSync));
     unsigned cGipCpus = RT_ELEMENTS(g_pSUPGlobalInfoPage->aiCpuFromApicId);
     for (unsigned i = 0; i < cGipCpus; i++)