Changeset 54306 in vbox

Timestamp:

Feb 19, 2015 6:40:36 PM (10 years ago)

Author:

vboxsync

Message:

HostDrivers/Support: TSC-delta thread fixes.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (15 diffs)
• SUPDrvInternal.h (modified) (3 diffs)
• testcase/tstSupTscDelta.cpp (modified) (1 diff)

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

@@ -6041 +6041 @@
                     && rc != VERR_TIMEOUT)
                     return supdrvTscDeltaThreadButchered(pDevExt, false /* fSpinlockHeld */, "RTThreadUserWait", rc);
+                RTThreadUserReset(pDevExt->hTscDeltaThread);
                 break;
             }
@@ -6061 +6062 @@
                 if (!cTimesMeasured++)
                 {
-                    rc = supdrvMeasureTscDeltas(pDevExt, NULL /* pidxMaster */);
-                    RTCpuSetCopy(&pDevExt->TscDeltaObtainedCpuSet, &pDevExt->pGip->OnlineCpuSet);
+                    int cTries = 8;
+                    int cMsWaitPerTry = 10;
+                    do
+                    {
+                        rc = supdrvMeasureTscDeltas(pDevExt, NULL /* pidxMaster */);
+                        if (   RT_SUCCESS(rc)
+                            || (   RT_FAILURE(rc)
+                                && rc != VERR_TRY_AGAIN
+                                && rc != VERR_CPU_OFFLINE))
+                        {
+                            break;
+                        }
+                        RTThreadSleep(cMsWaitPerTry);
+                    } while (cTries-- > 0);
                 }
                 else
@@ -6081 +6094 @@
                         {
                             rc |= supdrvMeasureTscDeltaOne(pDevExt, iCpu);
-                            RTCpuSetDel(&pDevExt->TscDeltaCpuSet, pGipCpuWorker->idCpu);
-                            if (pGipCpuWorker->i64TSCDelta != INT64_MAX)
-                                RTCpuSetAdd(&pDevExt->TscDeltaObtainedCpuSet, pGipCpuWorker->idCpu);
                         }
                     }
@@ -6231 +6241 @@
         if (RT_SUCCESS(rc))
         {
-            pDevExt->enmTscDeltaThreadState   = kTscDeltaThreadState_Creating;
+            pDevExt->enmTscDeltaThreadState = kTscDeltaThreadState_Creating;
             pDevExt->cMsTscDeltaTimeout = 1;
-            RTCpuSetEmpty(&pDevExt->TscDeltaCpuSet);
-            RTCpuSetEmpty(&pDevExt->TscDeltaObtainedCpuSet);
             rc = RTThreadCreate(&pDevExt->hTscDeltaThread, supdrvTscDeltaThread, pDevExt, 0 /* cbStack */,
                                 RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, "VBoxTscThread");
@@ -6314 +6322 @@
         return VERR_THREAD_NOT_WAITABLE;
 
-    cMsTotalWait = RT_MIN(pGip->cPresentCpus + 2, 150);
+    cMsTotalWait = RT_MIN(pGip->cPresentCpus + 10, 200);
     while (cTriesLeft-- > 0)
     {
@@ -6733 +6741 @@
     }
 
+    RTCpuSetEmpty(&pDevExt->TscDeltaCpuSet);
+    RTCpuSetEmpty(&pDevExt->TscDeltaObtainedCpuSet);
 #ifdef SUPDRV_USE_TSC_DELTA_THREAD
     if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_ZERO_CLAIMED)
@@ -6759 +6769 @@
                     {
                         rc = supdrvMeasureTscDeltas(pDevExt, NULL /* pidxMaster */);
-                        if (rc != VERR_TRY_AGAIN)
+                        if (   rc != VERR_TRY_AGAIN
+                            && rc != VERR_CPU_OFFLINE)
                             break;
                     } while (--cTries > 0);
@@ -6943 +6954 @@
 
     ASMSetFlags(uFlags);
+
+#ifdef SUPDRV_USE_TSC_DELTA_THREAD
+    if (   pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_ZERO_CLAIMED
+        && !RTCpuSetIsEmpty(&pDevExt->TscDeltaCpuSet))
+    {
+        RTSpinlockAcquire(pDevExt->hTscDeltaSpinlock);
+        if (   pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_Listening
+            || pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_Measuring)
+            pDevExt->enmTscDeltaThreadState = kTscDeltaThreadState_WaitAndMeasure;
+        RTSpinlockRelease(pDevExt->hTscDeltaSpinlock);
+        /** @todo Do the actual poking using -- RTThreadUserSignal() */
+    }
+#endif
 }
 
@@ -7063 +7087 @@
     ASMAtomicIncU32(&pDevExt->cMpOnOffEvents);
 
+    /* Add this CPU to the set of CPUs for which we need to calculate their TSC-deltas. */
+    if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_ZERO_CLAIMED)
+    {
+        RTCpuSetAdd(&pDevExt->TscDeltaCpuSet, idCpu);
 #ifdef SUPDRV_USE_TSC_DELTA_THREAD
-    /*
-     * Add this CPU to the set of CPUs that require their TSC delta to be measured.
-     *
-     * We cannot poke the TSC-delta measurement thread from this context (on all OSs), so we only
-     * update the state and it'll get serviced when the thread's listening interval times out.
-     */
-    if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_ZERO_CLAIMED)
-    {
         RTSpinlockAcquire(pDevExt->hTscDeltaSpinlock);
-        RTCpuSetAdd(&pDevExt->TscDeltaCpuSet, idCpu);
         if (   pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_Listening
             || pDevExt->enmTscDeltaThreadState == kTscDeltaThreadState_Measuring)
@@ -7080 +7099 @@
         }
         RTSpinlockRelease(pDevExt->hTscDeltaSpinlock);
-    }
 #endif
+    }
 
     /* commit it */
@@ -7128 +7147 @@
     }
 
-    /* Reset the TSC delta, we will recalculate it lazily. */
     if (pGip->enmUseTscDelta > SUPGIPUSETSCDELTA_ZERO_CLAIMED)
     {
+        /* Reset the TSC delta, we will recalculate it lazily. */
         ASMAtomicWriteS64(&pGip->aCPUs[i].i64TSCDelta, INT64_MAX);
-#ifdef SUPDRV_USE_TSC_DELTA_THREAD
         /* Remove this CPU from the set of CPUs that we have obtained the TSC deltas. */
         RTCpuSetDel(&pDevExt->TscDeltaObtainedCpuSet, idCpu);
-#endif
     }
 
@@ -7439 +7456 @@
 
         if (pGipCpuWorker->i64TSCDelta != INT64_MAX)
+        {
+            if (idCpu == idMaster)
+            {
+                RTCpuSetDel(&pDevExt->TscDeltaCpuSet, pGipCpuMaster->idCpu);
+                RTCpuSetAdd(&pDevExt->TscDeltaObtainedCpuSet, pGipCpuMaster->idCpu);
+            }
+            else
+            {
+                RTCpuSetDel(&pDevExt->TscDeltaCpuSet, pGipCpuWorker->idCpu);
+                RTCpuSetAdd(&pDevExt->TscDeltaObtainedCpuSet, pGipCpuWorker->idCpu);
+            }
             break;
+        }
     }
 }
@@ -7616 +7645 @@
         PSUPGIPCPU pGipCpuWorker = &pGip->aCPUs[iCpu];
         if (   iCpu != idxMaster
-            && RTCpuSetIsMember(&pGip->OnlineCpuSet, pGipCpuWorker->idCpu))
+            && RTCpuSetIsMember(&pDevExt->TscDeltaCpuSet, pGipCpuWorker->idCpu))
         {
             rc = supdrvMeasureTscDeltaOne(pDevExt, iCpu);
@@ -7628 +7657 @@
             if (ASMAtomicReadU32(&pDevExt->cMpOnOffEvents) != cMpOnOffEvents)
             {
-                SUPR0Printf("One or more CPUs transitioned between online & offline states. I'm confused, retrying...\n");
+                SUPR0Printf("One or more CPUs transitioned between online & offline states. I'm confused, retry...\n");
                 rc = VERR_TRY_AGAIN;
                 break;
@@ -8065 +8094 @@
     }
 
-
     /*
      * TSC History.

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

@@ -231 +231 @@
 #endif
 
-#if 0
+#if 1
 /**  Use a dedicated kernel thread to service TSC-delta measurement requests.
  *   @todo Test on servers with many CPUs and sockets. */
@@ -712 +712 @@
     /** Aligned pointer to the TSC delta sync. struct. */
     PSUPTSCDELTASYNC                pTscDeltaSync;
+    /** The set of CPUs we need to take measurements for. */
+    RTCPUSET                        TscDeltaCpuSet;
+    /** The set of CPUs we have completed taken measurements for. */
+    RTCPUSET                        TscDeltaObtainedCpuSet;
     /** @}  */
 
@@ -727 +731 @@
     /** Thread timeout time before rechecking state in ms. */
     RTMSINTERVAL                    cMsTscDeltaTimeout;
-    /** The set of CPUs we need to take measurements for. */
-    RTCPUSET                        TscDeltaCpuSet;
-    /** The set of CPUs we have completed taken measurements for. */
-    RTCPUSET                        TscDeltaObtainedCpuSet;
     /** Whether the TSC-delta measurement was successful. */
     int32_t volatile                rcTscDelta;

trunk/src/VBox/HostDrivers/Support/testcase/tstSupTscDelta.cpp

@@ -165 +165 @@
                     if (pGip->aCPUs[iCpu].enmState == SUPGIPCPUSTATE_ONLINE)
                     {
-                        rc = SUPR3TscDeltaMeasure(pGip->aCPUs[iCpu].idCpu, false /*fAsync*/, true /*fForce*/,  64, 16 /*ms*/);
+                        rc = SUPR3TscDeltaMeasure(pGip->aCPUs[iCpu].idCpu, false /*fAsync*/, true /*fForce*/, 64, 16 /*ms*/);
                         if (RT_FAILURE(rc))
                             RTTestFailed(hTest, "SUPR3TscDeltaMeasure failed on %#x: %Rrc", pGip->aCPUs[iCpu].idCpu, rc);