Changeset 37294 in vbox

Timestamp:

Jun 1, 2011 2:11:14 PM (14 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/linux: Fixed Mp event notifications.

Location:

trunk/src/VBox/Runtime/r0drv/linux

Files:

• mp-r0drv-linux.c (modified) (4 diffs)
• mpnotification-r0drv-linux.c (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c

@@ -36 +36 @@
 #include <iprt/err.h>
 #include <iprt/asm.h>
+#include <iprt/thread.h>
 #include "r0drv/mp-r0drv.h"
 
@@ -288 +289 @@
     RTMPARGS Args;
 
+    RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
     Args.pfnWorker = pfnWorker;
     Args.pvUser1 = pvUser1;
@@ -297 +299 @@
         return VERR_CPU_NOT_FOUND;
 
-# ifdef preempt_disable
-    preempt_disable();
-# endif
+    RTThreadPreemptDisable(&PreemptState);
     if (idCpu != RTMpCpuId())
     {
@@ -322 +322 @@
         rc = VINF_SUCCESS;
     }
-# ifdef preempt_enable
-    preempt_enable();
-# endif
+    RTThreadPreemptRestore(&PreemptState);;
 
     NOREF(rc);

trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c

@@ -35 +35 @@
 #include <iprt/err.h>
 #include <iprt/cpuset.h>
+#include <iprt/thread.h>
 #include "r0drv/mp-r0drv.h"
 
@@ -68 +69 @@
 
 /**
- * The native callback.
- *
- * @returns 0.
- * @param   pNotifierBlock  Pointer to g_NotifierBlock.
- * @param   ulNativeEvent   The native event.
- * @param   pvCpu           The cpu id cast into a pointer value.
- */
-static int rtMpNotificationLinuxCallback(struct notifier_block *pNotifierBlock, unsigned long ulNativeEvent, void *pvCpu)
-{
-    RTCPUID idCpu = (uintptr_t)pvCpu;
-    NOREF(pNotifierBlock);
+ * Notification wrapper that updates CPU states and invokes our notification
+ * callbacks.
+ *
+ * @param idCpu             The CPU Id.
+ * @param pvUser1           Pointer to the notifier_block (unused).
+ * @param pvUser2           The notification event.
+ * @remarks This can be invoked in interrupt context.
+ */
+static void rtMpNotificationLinuxOnCurrentCpu(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+{
+    unsigned long ulNativeEvent = *(unsigned long *)pvUser2;
+    NOREF(pvUser1);
+
+    AssertRelease(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
+    AssertRelease(idCpu == RTMpCpuId());   /* ASSUMES iCpu == RTCPUID */
 
     /*
@@ -100 +105 @@
 #  endif
             if (!RTCpuSetIsMember(&g_MpPendingOfflineSet, idCpu))
-                return 0;
+                return;
         /* fall thru */
 # endif
@@ -135 +140 @@
             break;
     }
-
+}
+
+
+/**
+ * The native callback.
+ *
+ * @returns NOTIFY_DONE.
+ * @param   pNotifierBlock  Pointer to g_NotifierBlock.
+ * @param   ulNativeEvent   The native event.
+ * @param   pvCpu           The cpu id cast into a pointer value.
+ * @remarks This can fire with preemption enabled and on any CPU.
+ */
+static int rtMpNotificationLinuxCallback(struct notifier_block *pNotifierBlock, unsigned long ulNativeEvent, void *pvCpu)
+{
+    int rc;
+    RTCPUID idCpu = (uintptr_t)pvCpu;
+    NOREF(pNotifierBlock);
+
+    /*
+     * Reschedule the callbacks to fire on the specific CPU with preemption disabled.
+     */
+    rc = RTMpOnSpecific(idCpu, rtMpNotificationLinuxOnCurrentCpu, pNotifierBlock, &ulNativeEvent);
+    Assert(RT_SUCCESS(rc));
     return NOTIFY_DONE;
 }