Changeset 54262 in vbox for trunk

Timestamp:

Feb 18, 2015 2:15:18 PM (10 years ago)

Author:

vboxsync

Message:

HostDrivers/support: keep the TSC-delta thread stuff working.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

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

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

@@ -4042 +4042 @@
      *  initially). The callback clears the methods not detected. */
     uint32_t volatile   fSupported;
-    /** The first callback detecting any kind of range issues (initializsed to
+    /** The first callback detecting any kind of range issues (initialized to
      * NIL_RTCPUID). */
     RTCPUID volatile    idCpuProblem;
@@ -4137 +4137 @@
         AssertCompile(sizeof(pState->bmApicId) * 8 == RT_ELEMENTS(pGip->aiCpuFromApicId));
         ASMAtomicCmpXchgU32(&pState->idCpuProblem, idCpu, NIL_RTCPUID);
-        LogRel(("supdrvGipDetectGetGipCpuCallback: idCpu=%#x iCpuSet=%d idApic=%#x - duplicate APIC ID.\n", 
+        LogRel(("supdrvGipDetectGetGipCpuCallback: idCpu=%#x iCpuSet=%d idApic=%#x - duplicate APIC ID.\n",
                 idCpu, iCpuSet, idApic));
     }
@@ -4149 +4149 @@
     {
         ASMAtomicCmpXchgU32(&pState->idCpuProblem, idCpu, NIL_RTCPUID);
-        LogRel(("supdrvGipDetectGetGipCpuCallback: idCpu=%#x iCpuSet=%d idApic=%#x - CPU set index is out of range.\n", 
+        LogRel(("supdrvGipDetectGetGipCpuCallback: idCpu=%#x iCpuSet=%d idApic=%#x - CPU set index is out of range.\n",
                 idCpu, iCpuSet, idApic));
     }
@@ -6120 +6120 @@
                     pDevExt->enmTscDeltaState = kSupDrvTscDeltaState_Listening;
                 RTSpinlockRelease(pDevExt->hTscDeltaSpinlock);
-                pDevExt->rcTscDelta = rc;
+                Assert(rc != VERR_NOT_AVAILABLE);   /* VERR_NOT_AVAILABLE is used as the initial value. */
+                ASMAtomicWriteS32(&pDevExt->rcTscDelta, rc);
                 break;
             }
@@ -6250 +6251 @@
 static int supdrvTscDeltaThreadInit(PSUPDRVDEVEXT pDevExt)
 {
+    int rc;
     Assert(pDevExt->pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_ZERO_CLAIMED);
-
-    int rc = RTSpinlockCreate(&pDevExt->hTscDeltaSpinlock, RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE, "VBoxTscSpnLck");
+    rc = RTSpinlockCreate(&pDevExt->hTscDeltaSpinlock, RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE, "VBoxTscSpnLck");
     if (RT_SUCCESS(rc))
     {
@@ -6269 +6270 @@
                 if (RT_SUCCESS(rc))
                 {
-                    pDevExt->rcTscDelta = VERR_NOT_AVAILABLE;
+                    ASMAtomicWriteS32(&pDevExt->rcTscDelta, VERR_NOT_AVAILABLE);
                     return rc;
                 }
@@ -6318 +6319 @@
     }
 
-    pDevExt->rcTscDelta = VERR_NOT_AVAILABLE;
+    ASMAtomicWriteS32(&pDevExt->rcTscDelta, VERR_NOT_AVAILABLE);
 }
 
@@ -6337 +6338 @@
     PSUPGLOBALINFOPAGE pGip = pDevExt->pGip;
     AssertReturn(pGip, VERR_INVALID_POINTER);
+
+    if (RT_UNLIKELY(pDevExt->hTscDeltaThread == NIL_RTTHREAD))
+        return VERR_THREAD_NOT_WAITABLE;
 
     cMsTotalWait = RT_MIN(pGip->cPresentCpus + 2, 150);
@@ -6582 +6586 @@
     u64DeltaTsc = u64Tsc - pDevExt->u64TscAnchor;
 
-    if (   pGip->u32Mode == SUPGIPMODE_INVARIANT_TSC
-        && !fDeltaApplied)
-    {
-        SUPR0Printf("vboxdrv: failed to refine TSC frequency as TSC-deltas unavailable after %d seconds!\n",
-                    GIP_TSC_REFINE_INTERVAL);
+    if (RT_UNLIKELY(   pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_PRACTICALLY_ZERO
+                    && !fDeltaApplied))
+    {
+        Log(("vboxdrv: failed to refine TSC frequency as TSC-deltas unavailable after %d seconds!\n",
+                    GIP_TSC_REFINE_INTERVAL));
         return;
     }
@@ -6620 +6624 @@
     uint8_t             idApic;
     int                 rc;
-    bool                fDeltaApplied = false;
     PSUPGLOBALINFOPAGE  pGip;
 
@@ -6626 +6629 @@
     Assert(pDevExt);
     Assert(pDevExt->pGip);
-
-    /*
-     * <Insert missing comment [it's not "Validate.", I think...]>
-     */ 
     pGip = pDevExt->pGip;
+
+#ifdef SUPDRV_USE_TSC_DELTA_THREAD
+    /*
+     * If the TSC-delta thread is created, wait until it's done calculating
+     * the TSC-deltas on the relevant online CPUs before we start the TSC refinement.
+     */
+    if (   pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_ZERO_CLAIMED
+        && ASMAtomicReadS32(&pDevExt->rcTscDelta) == VERR_NOT_AVAILABLE)
+    {
+        rc = supdrvTscDeltaThreadWaitForOnlineCpus(pDevExt);
+        if (rc == VERR_TIMEOUT)
+        {
+            SUPR0Printf("vboxdrv: Skipping refinement of TSC frequency as TSC-delta measurement timed out!\n");
+            return;
+        }
+    }
+#endif
+
+    /*
+     * Record the TSC and NanoTS as the starting anchor point for refinement of the
+     * TSC. We deliberately avoid using SUPReadTSC() here as we want to keep the
+     * reading of the TSC and the NanoTS as close as possible.
+     */
     u64NanoTS = RTTimeSystemNanoTS();
     while (RTTimeSystemNanoTS() == u64NanoTS)
@@ -6640 +6662 @@
     ASMSetFlags(uFlags);
     if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_PRACTICALLY_ZERO)
-        supdrvTscDeltaApply(pGip, &pDevExt->u64TscAnchor, idApic, &fDeltaApplied);
-
-#ifdef SUPDRV_USE_TSC_DELTA_THREAD
-    /* 
-     * <Explain yourself>
-     */
-    /** @todo r=bird: This is (and was) bogus on systems where we don't need to
-     *        apply any delta (not used on windows doesn't stick without comments).
-     *        What is the logic you want here exactly? */
-    if (   pGip->u32Mode == SUPGIPMODE_INVARIANT_TSC
-        && !fDeltaApplied)
-    {
-        rc = supdrvTscDeltaThreadWaitForOnlineCpus(pDevExt);
-        if (rc == VERR_TIMEOUT)
-        {
-            SUPR0Printf("vboxdrv: Skipping refinement of TSC frequency as TSC-delta measurement timed out!\n");
-            return;
-        }
-    }
-#endif
+        supdrvTscDeltaApply(pGip, &pDevExt->u64TscAnchor, idApic, NULL /* pfDeltaApplied */);
 
     rc = RTTimerCreateEx(&pDevExt->pTscRefineTimer, 0 /* one-shot */, RTTIMER_FLAGS_CPU_ANY, supdrvRefineTscTimer, pDevExt);
@@ -6773 +6776 @@
             if (RT_SUCCESS(rc))
             {
+#ifndef SUPDRV_USE_TSC_DELTA_THREAD
                 uint16_t iCpu;
-#ifndef SUPDRV_USE_TSC_DELTA_THREAD
                 if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_ZERO_CLAIMED)
                 {
@@ -6816 +6819 @@
                         }
                         if (pGip->u32Mode != SUPGIPMODE_ASYNC_TSC)
-                            rc = RTTimerCreateEx(&pDevExt->pGipTimer, u32Interval, 0 /* fFlags */, 
+                            rc = RTTimerCreateEx(&pDevExt->pGipTimer, u32Interval, 0 /* fFlags */,
                                                  supdrvGipSyncAndInvariantTimer, pDevExt);
                         if (RT_SUCCESS(rc))
@@ -6931 +6934 @@
 
 /**
- * Timer callback function for the sync and invariant  GIP modes. 
- *  
+ * Timer callback function for the sync and invariant GIP modes.
+ *
  * @param   pTimer      The timer.
  * @param   pvUser      Opaque pointer to the device extension.
@@ -8320 +8323 @@
     cMsWaitRetry = RT_MAX(pReq->u.In.cMsWaitRetry, 5);
 
-    /* 
+    /*
      * The request is a noop if the TSC delta isn't being used.
      */

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

@@ -732 +732 @@
     RTCPUSET                        TscDeltaObtainedCpuSet;
     /** Whether the TSC-delta measurement was successful. */
-    int                             rcTscDelta;
+    int32_t volatile                rcTscDelta;
     /** @} */
 #endif