Changeset 54395 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Feb 23, 2015 5:34:01 PM (10 years ago)

Author:

vboxsync

Message:

IPRT, HostDriver, VMMR0: MP notifications fixes for TSC-delta measurements, scheduling of notification callback taken care by the API consumer instead of IPRT.

File:

• trunk/src/VBox/VMM/VMMR0/HMR0.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMR0/HMR0.cpp

@@ -994 +994 @@
  *
  * @returns VBox status code.
- * @param   idCpu       The identifier for the CPU the function is called on.
+ * @param   idCpu       The identifier for the CPU this function is called on.
  *
  * @remarks Must be called with preemption disabled.
@@ -1007 +1007 @@
     Assert(idCpu < RT_ELEMENTS(g_HvmR0.aCpuInfo));
     Assert(!pCpu->fConfigured || pCpu->hMemObj != NIL_RTR0MEMOBJ);
+    AssertRelease(idCpu == RTMpCpuId());
 
     if (pCpu->hMemObj == NIL_RTR0MEMOBJ)
@@ -1012 +1013 @@
 
     int rc;
-    if (   pCpu->fConfigured
-        && idCpu == RTMpCpuId())    /* We may not be firing on the CPU being disabled/going offline. */
+    if (pCpu->fConfigured)
     {
         void    *pvCpuPage     = RTR0MemObjAddress(pCpu->hMemObj);
@@ -1043 +1043 @@
     AssertReturnVoid(g_HvmR0.fGlobalInit);
     hmR0FirstRcSetStatus(pFirstRc, hmR0DisableCpu(idCpu));
+}
+
+
+/**
+ * Worker function passed to RTMpOnSpecific() that is to be called on the target
+ * CPU.
+ *
+ * @param   idCpu       The identifier for the CPU the function is called on.
+ * @param   pvUser1     Null, not used.
+ * @param   pvUser2     Null, not used.
+ */
+static DECLCALLBACK(void) hmR0DisableCpuOnSpecificCallback(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+{
+    NOREF(pvUser1);
+    NOREF(pvUser2);
+    hmR0DisableCpu(idCpu);
 }
 
@@ -1061 +1077 @@
      * CPU comes online, the initialization is done lazily in HMR0Enter().
      */
-    Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
     switch (enmEvent)
     {
         case RTMPEVENT_OFFLINE:
         {
-            int rc = hmR0DisableCpu(idCpu);
-            AssertRC(rc);
+            RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
+            RTThreadPreemptDisable(&PreemptState);
+            if (idCpu == RTMpCpuId())
+            {
+                int rc = hmR0DisableCpu(idCpu);
+                AssertRC(rc);
+                RTThreadPreemptRestore(&PreemptState);
+            }
+            else
+            {
+                RTThreadPreemptRestore(&PreemptState);
+                RTMpOnSpecific(idCpu, hmR0DisableCpuOnSpecificCallback, NULL /* pvUser1 */, NULL /* pvUser2 */);
+            }
             break;
         }