Changeset 37062 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

May 13, 2011 10:18:29 AM (14 years ago)

Author:

vboxsync

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

71699

Message:

VMM: Support for online/offlining of CPUs.

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.c (modified) (10 diffs)

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

@@ -322 +322 @@
     { "RTMpIsCpuOnline",                        (void *)RTMpIsCpuOnline },
     { "RTMpIsCpuWorkPending",                   (void *)RTMpIsCpuWorkPending },
+    { "RTMpNotificationRegister",               (void *)RTMpNotificationRegister },
+    { "RTMpNotificationDeregister",             (void *)RTMpNotificationDeregister },
     { "RTMpOnAll",                              (void *)RTMpOnAll },
     { "RTMpOnOthers",                           (void *)RTMpOnOthers },
@@ -4990 +4992 @@
 
 /**
+ * Helper for finding the CPU index from the CPU Id.
+ *
+ * @param    pGip               The GIP.
+ * @param    idCpu              The CPU ID.
+ *
+ * @returns Index of the CPU in the cache set.
+ */
+static inline uint32_t supdrvGipCpuIndexFromCpuId(PSUPGLOBALINFOPAGE pGip, RTCPUID idCpu)
+{
+    uint32_t i = 0;
+
+    /*
+     * Find our entry, or allocate one if not found.
+     * ASSUMES that CPU IDs are constant.
+     */
+    for (i = 0; i < pGip->cCpus; i++)
+        if (pGip->aCPUs[i].idCpu == idCpu)
+            break;
+
+    if (i >= pGip->cCpus)
+        for (i = 0; i < pGip->cCpus; i++)
+        {
+            bool fRc;
+            ASMAtomicCmpXchgSize(&pGip->aCPUs[i].idCpu, idCpu, NIL_RTCPUID, fRc);
+            if (fRc)
+                break;
+        }
+
+    AssertRelease(i < pGip->cCpus);
+    return i;
+}
+
+
+/**
  * The calling CPU should be accounted as online, update GIP accordingly.
  *
@@ -4999 +5035 @@
 static void supdrvGipMpEventOnline(PSUPGLOBALINFOPAGE pGip, RTCPUID idCpu)
 {
-    int         iCpuSet;
-    uint8_t     idApic;
-    uint32_t    i;
-
-    Assert(idCpu == RTMpCpuId());
+    int         iCpuSet = 0;
+    uint16_t    idApic = UINT16_MAX;
+    uint32_t    i = 0;
+
+    AssertRelease(idCpu == RTMpCpuId());
     Assert(pGip->cPossibleCpus == RTMpGetCount());
 
@@ -5019 +5055 @@
     }
 
-    /*
-     * Find our entry, or allocate one if not found.
-     * ASSUMES that CPU IDs are constant.
-     */
-    for (i = 0; i < pGip->cCpus; i++)
-        if (pGip->aCPUs[i].idCpu == idCpu)
-            break;
-
-    if (i >= pGip->cCpus)
-        for (i = 0; i < pGip->cCpus; i++)
-        {
-            bool fRc;
-            ASMAtomicCmpXchgSize(&pGip->aCPUs[i].idCpu, idCpu, NIL_RTCPUID, fRc);
-            if (fRc)
-                break;
-        }
-
-    AssertReturnVoid(i < pGip->cCpus);
+    i = supdrvGipCpuIndexFromCpuId(pGip, idCpu);
 
     /*
@@ -5045 +5064 @@
     ASMAtomicUoWriteS16(&pGip->aCPUs[i].iCpuSet, (int16_t)iCpuSet);
     ASMAtomicUoWriteSize(&pGip->aCPUs[i].idCpu,  idCpu);
-    ASMAtomicWriteSize(&pGip->aCPUs[i].enmState, SUPGIPCPUSTATE_ONLINE);
 
     /*
@@ -5052 +5070 @@
     ASMAtomicWriteU16(&pGip->aiCpuFromApicId[idApic],     i);
     ASMAtomicWriteU16(&pGip->aiCpuFromCpuSetIdx[iCpuSet], i);
+
+    ASMAtomicWriteSize(&pGip->aCPUs[i].enmState, SUPGIPCPUSTATE_ONLINE);
 }
 
@@ -5076 +5096 @@
 
     Assert(RTCpuSetIsMemberByIndex(&pGip->PossibleCpuSet, iCpuSet));
+    RTCpuSetDelByIndex(&pGip->OnlineCpuSet, iCpuSet);
     ASMAtomicWriteSize(&pGip->aCPUs[i].enmState, SUPGIPCPUSTATE_OFFLINE);
-    RTCpuSetDelByIndex(&pGip->OnlineCpuSet, iCpuSet);
 }
 
@@ -5095 +5115 @@
     PSUPDRVDEVEXT       pDevExt = (PSUPDRVDEVEXT)pvUser;
     PSUPGLOBALINFOPAGE  pGip    = pDevExt->pGip;
+
+    AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
     /*
@@ -5359 +5381 @@
         pGip->aCPUs[i].idCpu             = NIL_RTCPUID;
         pGip->aCPUs[i].iCpuSet           = -1;
-        pGip->aCPUs[i].idApic            = UINT8_MAX;
+        pGip->aCPUs[i].idApic            = UINT16_MAX;
 
         /*
@@ -5618 +5640 @@
                                   RTCPUID idCpu, uint8_t idApic, uint64_t iTick)
 {
+    /*
+     * Avoid a potential race when a CPU online notification doesn't fire on the onlined CPU
+     * but the tick creeps in before the event notification is run.
+     */
+    if (iTick == 1)
+    {
+        uint32_t i = supdrvGipCpuIndexFromCpuId(pGip, idCpu);
+        if (pGip->aCPUs[i].enmState == SUPGIPCPUSTATE_OFFLINE)
+            supdrvGipMpEventOnline(pGip, idCpu);
+    }
+
     unsigned iCpu = pGip->aiCpuFromApicId[idApic];