Changeset 52871 in vbox

Timestamp:

Sep 26, 2014 3:12:49 PM (10 years ago)

Author:

vboxsync

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

96295

Message:

HostDrivers/support: pick master based on Apic Id, use Apic Id to index and print deltas in tstGIP.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (3 diffs)
• testcase/tstGIP-2.cpp (modified) (1 diff)

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

@@ -6356 +6356 @@
 
     /*
-     * Pick the first CPU online as the master TSC and make it the new GIP master.
+     * Pick the first CPU online as the master TSC and make it the new GIP master based
+     * on the APIC ID.
      *
      * Technically we can simply use "idGipMaster" but doing this gives us master as CPU 0
@@ -6363 +6364 @@
      */
     supdrvClearTscSamples(pGip, true /* fClearDeltas */);
-    for (iCpu = 0; iCpu < pGip->cCpus; iCpu++)
-    {
-        PSUPGIPCPU pGipCpu = &pGip->aCPUs[iCpu];
-        if (RTCpuSetIsMember(&pGip->OnlineCpuSet, pGipCpu->idCpu))
-        {
-            idxMaster = iCpu;
-            pGipCpu->i64TSCDelta = 0;
-            break;
+    for (iCpu = 0; iCpu < RT_ELEMENTS(pGip->aiCpuFromApicId); iCpu++)
+    {
+        uint16_t idxCpu = pGip->aiCpuFromApicId[iCpu];
+        if (idxCpu != UINT16_MAX)
+        {
+            PSUPGIPCPU pGipCpu = &pGip->aCPUs[idxCpu];
+            if (RTCpuSetIsMember(&pGip->OnlineCpuSet, pGipCpu->idCpu))
+            {
+                idxMaster = idxCpu;
+                pGipCpu->i64TSCDelta = 0;
+                break;
+            }
         }
     }
@@ -6646 +6651 @@
     pGip->idCpuMax              = RTMpGetMaxCpuId();
     for (i = 0; i < RT_ELEMENTS(pGip->aiCpuFromApicId); i++)
-        pGip->aiCpuFromApicId[i]    = 0;
+        pGip->aiCpuFromApicId[i]    = UINT16_MAX;
     for (i = 0; i < RT_ELEMENTS(pGip->aiCpuFromCpuSetIdx); i++)
         pGip->aiCpuFromCpuSetIdx[i] = UINT16_MAX;

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

@@ -162 +162 @@
             /* Display TSC deltas. */
             RTPrintf("tstGIP-2: TSC deltas:\n");
-            for (unsigned iCpu = 0; iCpu < g_pSUPGlobalInfoPage->cCpus; iCpu++)
-                RTPrintf("tstGIP-2: %6d: %lld\n", iCpu, g_pSUPGlobalInfoPage->aCPUs[iCpu].i64TSCDelta);
+            RTPrintf("tstGIP-2: idApic: i64TSCDelta\n");
+            for (unsigned i = 0; i < RT_ELEMENTS(g_pSUPGlobalInfoPage->aiCpuFromApicId); i++)
+            {
+                uint16_t iCpu = g_pSUPGlobalInfoPage->aiCpuFromApicId[i];
+                if (iCpu != UINT16_MAX)
+                {
+                    RTPrintf("tstGIP-2: %6d: %lld\n", g_pSUPGlobalInfoPage->aCPUs[iCpu].idApic,
+                             g_pSUPGlobalInfoPage->aCPUs[iCpu].i64TSCDelta);
+                }
+            }
         }
         else