Changeset 53800 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jan 14, 2015 12:51:28 PM (10 years ago)

Author:

vboxsync

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

97608

Message:

HostDrivers/Support: Moved fOsTscDeltasInSync to the GIP, fix SUPReadTsc() and a few other places to check the right macro for TSC-delta availability.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (18 diffs)
• SUPDrvInternal.h (modified) (1 diff)

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

@@ -137 +137 @@
 # define DO_NOT_START_GIP
 #endif
-
-/** Whether the application of TSC-deltas is required. */
-#define GIP_ARE_TSC_DELTAS_APPLICABLE(a_pDevExt) \
-    ((a_pDevExt)->pGip->u32Mode == SUPGIPMODE_INVARIANT_TSC && !((a_pDevExt)->fOsTscDeltasInSync))
-
 
 /*******************************************************************************
@@ -5896 +5891 @@
 static int supdrvTscDeltaThreadInit(PSUPDRVDEVEXT pDevExt)
 {
-    Assert(GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt));
+    Assert(GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt->pGip));
 
     int rc = RTSpinlockCreate(&pDevExt->hTscDeltaSpinlock, RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE, "VBoxTscSpnLck");
@@ -6078 +6073 @@
         ASMSetFlags(uFlags);
 
-        if (GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt))
+        if (GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
         {
             int rc;
@@ -6156 +6151 @@
     u64NanoTS = RTTimeSystemNanoTS();
     ASMSetFlags(uFlags);
-    SUPTscDeltaApply(pGip, &u64Tsc, idApic, &fDeltaApplied);
+    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
+        SUPTscDeltaApply(pGip, &u64Tsc, idApic, &fDeltaApplied);
     u64DeltaNanoTS = u64NanoTS - pDevExt->u64NanoTSAnchor;
     u64DeltaTsc = u64Tsc - pDevExt->u64TscAnchor;
@@ -6230 +6226 @@
     pDevExt->u64NanoTSAnchor = RTTimeSystemNanoTS();
     ASMSetFlags(uFlags);
-    SUPTscDeltaApply(pGip, &pDevExt->u64TscAnchor, idApic, &fDeltaApplied);
+    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
+        SUPTscDeltaApply(pGip, &pDevExt->u64TscAnchor, idApic, &fDeltaApplied);
 
 #ifdef SUPDRV_USE_TSC_DELTA_THREAD
@@ -6333 +6330 @@
     supdrvGipInit(pDevExt, pGip, HCPhysGip, RTTimeSystemNanoTS(), RT_NS_1SEC / u32Interval /*=Hz*/, u32Interval, cCpus);
 
-    if (RT_UNLIKELY(   pDevExt->fOsTscDeltasInSync
+    if (RT_UNLIKELY(   pGip->fOsTscDeltasInSync
                     && pGip->u32Mode == SUPGIPMODE_ASYNC_TSC
                     && !supdrvOSGetForcedAsyncTscMode(pDevExt)))
@@ -6343 +6340 @@
 
 #ifdef SUPDRV_USE_TSC_DELTA_THREAD
-    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt))
+    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
     {
         /* Initialize TSC-delta measurement thread before executing any Mp event callbacks. */
@@ -6359 +6356 @@
                 uint16_t iCpu;
 #ifndef SUPDRV_USE_TSC_DELTA_THREAD
-                if (GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt))
+                if (GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
                 {
                     /*
@@ -6533 +6530 @@
     u64NanoTS = RTTimeSystemNanoTS();
 
-    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt))
+    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
     {
         /*
@@ -6678 +6675 @@
      * update the state and it'll get serviced when the thread's listening interval times out.
      */
-    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt))
+    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
     {
         RTSpinlockAcquire(pDevExt->hTscDeltaSpinlock);
@@ -6737 +6734 @@
 
     /* Reset the TSC delta, we will recalculate it lazily. */
-    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt))
+    if (GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
         ASMAtomicWriteS64(&pGip->aCPUs[i].i64TSCDelta, INT64_MAX);
 
@@ -7101 +7098 @@
     pGipCpuWorker = &pGip->aCPUs[idxWorker];
 
-    Assert(GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt));
+    Assert(GIP_ARE_TSC_DELTAS_APPLICABLE(pGip));
 
     if (pGipCpuWorker->idCpu == idMaster)
@@ -7162 +7159 @@
     uint32_t   cOnlineCpus    = pGip->cOnlineCpus;
 
-    Assert(GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt));
+    Assert(GIP_ARE_TSC_DELTAS_APPLICABLE(pGip));
 
     /*
@@ -7410 +7407 @@
     pCpu->u64TSC             = ASMReadTSC();
     pCpu->u64TSCSample       = GIP_TSC_DELTA_RSVD;
-    pCpu->i64TSCDelta        = pDevExt->fOsTscDeltasInSync ? 0 : INT64_MAX;
+    pCpu->i64TSCDelta        = pGip->fOsTscDeltasInSync ? 0 : INT64_MAX;
 
     ASMAtomicWriteSize(&pCpu->enmState, SUPGIPCPUSTATE_INVALID);
@@ -7462 +7459 @@
      * We only bother with TSC-deltas on invariant CPUs for now.
      */
-    pDevExt->fOsTscDeltasInSync = supdrvIsInvariantTsc() && supdrvOSAreTscDeltasInSync();
+    pGip->fOsTscDeltasInSync = supdrvIsInvariantTsc() && supdrvOSAreTscDeltasInSync();
 
     /*
@@ -7879 +7876 @@
     pGip = pDevExt->pGip;
 
-    if (!GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt))
+    if (!GIP_ARE_TSC_DELTAS_APPLICABLE(pGip))
         return VINF_SUCCESS;
 
@@ -7951 +7948 @@
     AssertReturn(pReq, VERR_INVALID_PARAMETER);
     AssertReturn(pDevExt->pGip, VERR_INVALID_PARAMETER);
+
     pGip = pDevExt->pGip;
+    Assert(GIP_ARE_TSC_DELTAS_APPLICABLE(pGip));
 
     cTries = 4;
@@ -7973 +7972 @@
         AssertMsgReturn(iCpu < pGip->cCpus, ("iCpu=%u cCpus=%u\n", iCpu, pGip->cCpus), VERR_INVALID_CPU_INDEX);
 
-        Assert(GIP_ARE_TSC_DELTAS_APPLICABLE(pDevExt));
         rc2 = supdrvMeasureTscDeltaOne(pDevExt, iCpu);
         if (RT_SUCCESS(rc2))

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -710 +710 @@
     /** Aligned pointer to the TSC delta sync. struct. */
     PSUPTSCDELTASYNC                pTscDeltaSync;
-    /** Whether the host OS has already normalized the hardware TSC deltas across
-     *  CPUs. */
-    bool                            fOsTscDeltasInSync;
     /** @}  */