儲存庫 vbox 的更動 37297

時間撮記:

2011-6-1 下午04:18:21 (13 年 以前)

作者:

vboxsync

訊息:

Runtime/r0drv/linux: mpnotification, filter off unwanted events.

檔案:

• trunk/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c (修改) (7 筆差異)

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

@@ -85 +85 @@
     AssertRelease(idCpu == RTMpCpuId());   /* ASSUMES iCpu == RTCPUID */
 
+    switch (ulNativeEvent)
+    {
+# ifdef CPU_DOWN_FAILED
+        case CPU_DOWN_FAILED:
+#  if defined(CPU_TASKS_FROZEN) && defined(CPU_DOWN_FAILED_FROZEN)
+        case CPU_DOWN_FAILED_FROZEN:
+#  endif
+# endif
+        case CPU_ONLINE:
+# if defined(CPU_TASKS_FROZEN) && defined(CPU_ONLINE_FROZEN)
+        case CPU_ONLINE_FROZEN:
+# endif
+            rtMpNotificationDoCallbacks(RTMPEVENT_ONLINE, idCpu);
+            break;
+
+# ifdef CPU_DOWN_PREPARE
+        case CPU_DOWN_PREPARE:
+#  if defined(CPU_TASKS_FROZEN) && defined(CPU_DOWN_PREPARE_FROZEN)
+        case CPU_DOWN_PREPARE_FROZEN:
+#  endif
+            rtMpNotificationDoCallbacks(RTMPEVENT_OFFLINE, idCpu);
+            break;
+# endif
+    }
+}
+
+
+/**
+ * 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;
+    bool fProcessEvent = false;
+    RTCPUID idCpu      = (uintptr_t)pvCpu;
+    NOREF(pNotifierBlock);
+
     /*
      * Note that redhat/CentOS ported _some_ of the FROZEN macros
@@ -91 +134 @@
      * the individual event variants.
      */
-
-    /* ASSUMES iCpu == RTCPUID */
     switch (ulNativeEvent)
     {
@@ -105 +146 @@
 #  endif
             if (!RTCpuSetIsMember(&g_MpPendingOfflineSet, idCpu))
-                return;
+                break;      /* fProcessEvents = false */
         /* fall thru */
 # endif
@@ -115 +156 @@
             RTCpuSetDel(&g_MpPendingOfflineSet, idCpu);
 # endif
-            rtMpNotificationDoCallbacks(RTMPEVENT_ONLINE, idCpu);
+            fProcessEvent = true;
             break;
 
@@ -128 +169 @@
         case CPU_DOWN_PREPARE_FROZEN:
 #  endif
+            fProcessEvent = true;
 # else
         case CPU_DEAD:
@@ -133 +175 @@
         case CPU_DEAD_FROZEN:
 #  endif
-# endif
-            rtMpNotificationDoCallbacks(RTMPEVENT_OFFLINE, idCpu);
+            /* Don't process CPU_DEAD notifications. */
+# endif
 # ifdef CPU_DOWN_FAILED
             RTCpuSetAdd(&g_MpPendingOfflineSet, idCpu);
@@ -140 +182 @@
             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);
+
+    if (!fProcessEvent)
+        return NOTIFY_DONE;
 
     /*