Changeset 7915 in vbox for trunk/src/VBox

Timestamp:

Apr 11, 2008 1:12:23 PM (17 years ago)

Author:

vboxsync

Message:

Fixed RTMpOnSpecific usage.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDRVShared.c (modified) (4 diffs)

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

@@ -39 +39 @@
 #include <iprt/process.h>
 #include <iprt/mp.h>
+#include <iprt/cpuset.h>
 #include <iprt/log.h>
 
@@ -4138 +4139 @@
 }
 
-/**
- * Determine if the time stamp counters of the CPU cores are asynchronous.
- */
-static uint64_t g_aTsc[8][8];
-
+
+/**
+ * Callback used by supdrvDetermineAsyncTSC to read the TSC on a CPU.
+ *
+ * @param   idCpu       Ignored.
+ * @param   pvUser1     Where to put the TSC.
+ * @param   pvUser2     Ignored.
+ */
 static DECLCALLBACK(void) supdrvDetermineAsyncTscWorker(RTCPUID idCpu, void *pvUser1, void *pvUser2)
 {
-    int iSlot = *(int*)pvUser1; 
-    int iCpu  = *(int*)pvUser2;
-    g_aTsc[iSlot][iCpu] = ASMReadTSC();
-}
-
-/**
+    *(uint64_t *)pvUser1 = ASMReadTSC();
+}
+
+
+/**
+ * Determine if Async GIP mode is required because of TSC drift.
+ *
  * When using the default/normal timer code it is essential that the time stamp counter
  * (TSC) runs never backwards, that is, a read operation to the counter should return
@@ -4157 +4162 @@
  * case we have to choose the asynchronous timer mode.
  *
- * @param  pu64Diff pointer to the determined difference between different cores.
- * @return false if the time stamp counters appear to be synchron, true otherwise.
+ * @param   pu64Diff    pointer to the determined difference between different cores.
+ * @return  false if the time stamp counters appear to be synchron, true otherwise.
  */
 bool VBOXCALL supdrvDetermineAsyncTsc(uint64_t *pu64DiffCores)
 {
+    static uint64_t s_aTsc[8][8];
     uint64_t u64Diff, u64DiffMin, u64DiffMax, u64TscLast;
-    int iSlot, iCpu;
-    bool fBackwards = false;
-    int cCpu = RTMpGetOnlineCount();
-
-    if (cCpu < 2)
+    int iSlot, iCpu, cCpus;
+    bool fBackwards;
+    RTCPUSET OnlineCpus;
+    int rc;
+
+    *pu64DiffCores = 1;
+
+    RTMpGetOnlineSet(&OnlineCpus);
+    cCpus = RTCpuSetCount(&OnlineCpus);
+    if (cCpus < 2)
         return false;
 
-    if (cCpu > RT_ELEMENTS(g_aTsc))
-        cCpu = RT_ELEMENTS(g_aTsc);
-
-    for (iSlot = 0; iSlot < RT_ELEMENTS(g_aTsc); iSlot++)
-    {
-        for (iCpu = 0; iCpu < cCpu; iCpu++)
-            RTMpOnSpecific(iCpu, supdrvDetermineAsyncTscWorker, &iSlot, &iCpu);
-    }
-
+    /*
+     * Collect data from the first 8 online CPUs.
+     */
+    if (cCpus > RT_ELEMENTS(s_aTsc))
+        cCpus = RT_ELEMENTS(s_aTsc);
+    for (iSlot = 0; iSlot < RT_ELEMENTS(s_aTsc); iSlot++)
+    {
+        RTCPUID iCpuSet = 0;
+        for (iCpu = 0; iCpu < cCpus; iCpu++)
+        {
+            while (!RTCpuSetIsMember(&OnlineCpus, iCpuSet))
+                iCpuSet++; /* skip offline CPU */
+            rc = RTMpOnSpecific(RTMpCpuIdFromSetIndex(iCpuSet), supdrvDetermineAsyncTscWorker, &s_aTsc[iSlot][iCpu], NULL);
+            if (rc == VERR_NOT_SUPPORTED)
+                return false;
+            iCpuSet++;
+        }
+    }
+
+    /*
+     * Check that the TSC reads are strictly ascending.
+     */
+    fBackwards = false;
     u64DiffMin = (uint64_t)~0;
     u64TscLast = 0;
-    for (iSlot = 0; iSlot < RT_ELEMENTS(g_aTsc); iSlot++)
-    {
-        uint64_t u64Tsc0 = g_aTsc[iSlot][0];
+    for (iSlot = 0; iSlot < RT_ELEMENTS(s_aTsc); iSlot++)
+    {
+        uint64_t u64Tsc0 = s_aTsc[iSlot][0];
         u64DiffMax = 0;
         if (u64Tsc0 <= u64TscLast)
             fBackwards = true;
         u64TscLast = u64Tsc0;
-        for (iCpu = 1; iCpu < cCpu; iCpu++)
-        {
-            uint64_t u64TscN = g_aTsc[iSlot][iCpu];
+        for (iCpu = 1; iCpu < cCpus; iCpu++)
+        {
+            uint64_t u64TscN = s_aTsc[iSlot][iCpu];
             if (u64TscN <= u64TscLast)
                 fBackwards = true;
             u64TscLast = u64TscN;
+
             u64Diff = u64TscN > u64Tsc0 ? u64TscN - u64Tsc0 : u64Tsc0 - u64TscN;
             if (u64DiffMax < u64Diff)
@@ -4203 +4229 @@
     /* informational */
     *pu64DiffCores = u64DiffMin;
-    
+
     return fBackwards;
 }