Changeset 37062 in vbox for trunk/src/VBox/Runtime/r0drv/solaris

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.

Location:

trunk/src/VBox/Runtime/r0drv/solaris/vbi

Files:

• mp-r0drv-solaris.c (modified) (2 diffs)
• mpnotification-r0drv-solaris.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c

@@ -174 +174 @@
     PRTMPARGS pArgs = (PRTMPARGS)(uArg);
 
+    /*
+     * Solaris CPU cross calls execute on offline CPUs too. Check our CPU cache
+     * set and ignore if it's offline.
+     */
+    if (!RTMpIsCpuOnline(RTMpCpuId()))
+        return 0;
+
     pArgs->pfnWorker(RTMpCpuId(), pArgs->pvUser1, pArgs->pvUser2);
 
@@ -279 +286 @@
         return VERR_CPU_NOT_FOUND;
 
+    if (RT_UNLIKELY(!RTMpIsCpuOnline(idCpu)))
+        return RTMpIsCpuPresent(idCpu) ? VERR_CPU_OFFLINE : VERR_CPU_NOT_FOUND;
+
     Args.pfnWorker = pfnWorker;
     Args.pvUser1 = pvUser1;

trunk/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c

@@ -34 +34 @@
 #include <iprt/mp.h>
 #include <iprt/cpuset.h>
+#include <iprt/string.h>
 #include "r0drv/mp-r0drv.h"
 
@@ -49 +50 @@
 
 
-static void rtMpNotificationSolarisCallback(void *pvUser, int iCpu, int online)
+static void rtMpNotificationSolarisOnCurrentCpu(void *pvArgs, void *uIgnored1, void *uIgnored2)
 {
-    NOREF(pvUser);
+    NOREF(uIgnored1);
+    NOREF(uIgnored2);
 
-    /* ASSUMES iCpu == RTCPUID */
+    PRTMPARGS pArgs = (PRTMPARGS)(pvArgs);
+    AssertRelease(pArgs && pArgs->idCpu == RTMpCpuId());
+    Assert(pArgs->pvUser2);
+    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+
+    int online = *(int *)pArgs->pvUser2;
     if (online)
     {
-        RTCpuSetAdd(&g_rtMpSolarisCpuSet, iCpu);
-        rtMpNotificationDoCallbacks(RTMPEVENT_ONLINE, iCpu);
+        RTCpuSetAdd(&g_rtMpSolarisCpuSet, pArgs->idCpu);
+        rtMpNotificationDoCallbacks(RTMPEVENT_ONLINE, pArgs->idCpu);
     }
     else
     {
-        RTCpuSetDel(&g_rtMpSolarisCpuSet, iCpu);
-        rtMpNotificationDoCallbacks(RTMPEVENT_OFFLINE, iCpu);
+        RTCpuSetDel(&g_rtMpSolarisCpuSet, pArgs->idCpu);
+        rtMpNotificationDoCallbacks(RTMPEVENT_OFFLINE, pArgs->idCpu);
     }
+}
+
+
+static void rtMpNotificationSolarisCallback(void *pvUser, int iCpu, int online)
+{
+    vbi_preempt_disable();
+
+    RTMPARGS Args;
+    RT_ZERO(Args);
+    Args.pvUser1 = pvUser;
+    Args.pvUser2 = &online;
+    Args.idCpu   = iCpu;
+
+    /*
+     * If we're not on the target CPU, schedule (synchronous) the event notification callback
+     * to run on the target CPU i.e. the one pertaining to the MP event.
+     */
+    bool fRunningOnTargetCpu = iCpu == RTMpCpuId();      /* ASSUMES iCpu == RTCPUID */
+    if (fRunningOnTargetCpu)
+        rtMpNotificationSolarisOnCurrentCpu(&Args, NULL /* pvIgnored1 */, NULL /* pvIgnored2 */);
+    else
+        vbi_execute_on_one(rtMpNotificationSolarisOnCurrentCpu, &Args, iCpu);
+
+    vbi_preempt_enable();
 }