Changeset 23200 in vbox

Timestamp:

Sep 21, 2009 4:13:38 PM (15 years ago)

Author:

vboxsync

Message:

Extend to all use cases of RTMpPokeCpu

File:

• trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMAll/HWACCMAll.cpp

@@ -104 +104 @@
 }
 
+#ifdef IN_RING0
+/**
+ * Dummy RTMpOnSpecific handler since RTMpPokeCpu couldn't be used. 
+ *
+ */
+static DECLCALLBACK(void) hwaccmFlushHandler(RTCPUID idCpu, void *pvUser1, void *pvUser2)
+{
+    return;
+}
+
+/**
+ * Wrapper for RTMpPokeCpu to deal with VERR_NOT_SUPPORTED
+ *
+ */
+void hwaccmMpPokeCpu(RTCPUID idHostCpu)
+{
+    int rc = RTMpPokeCpu(idHostCpu);
+# ifdef RT_OS_WINDOWS
+    AssertRC(rc);
+# else
+    /* Not implemented on some platforms (Darwin, Linux kernel < 2.6.19); fall back to a less efficient implementation (broadcast). */
+    if (rc == VERR_NOT_SUPPORTED)
+        RTMpOnSpecific(idHostCpu, hwaccmFlushHandler, 0, 0);
+# endif
+}
+#endif
+
 #ifndef IN_RC
 /**
@@ -133 +160 @@
                 RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
                 if (idHostCpu != NIL_RTCPUID)
-                    RTMpPokeCpu(idHostCpu);
+                    hwaccmMpPokeCpu(idHostCpu);
 #else
                 VMR3NotifyCpuFFU(pVCpu->pUVCpu, VMNOTIFYFF_FLAGS_POKE);
@@ -148 +175 @@
 
 /**
- * Dummy RTMpOnSpecific handler since RTMpPokeCpu couldn't be used. 
- *
- */
-static DECLCALLBACK(void) hwaccmFlushHandler(RTCPUID idCpu, void *pvUser1, void *pvUser2)
-{
-    return;
-}
-
-
-/**
  * Flush the TLBs of all VCPUs
  *
@@ -188 +205 @@
             RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
             if (idHostCpu != NIL_RTCPUID)
-            {
-                int rc = RTMpPokeCpu(idHostCpu);
-# ifdef RT_OS_WINDOWS
-                AssertRC(rc);
-# else
-                /* Not implemented on some platforms (Darwin, Linux kernel < 2.6.19); fall back to a less efficient implementation (broadcast). */
-                if (rc == VERR_NOT_SUPPORTED)
-                    RTMpOnSpecific(idHostCpu, hwaccmFlushHandler, 0, 0);
-# endif
-            }
+                hwaccmMpPokeCpu(idHostCpu);
 #else
             VMR3NotifyCpuFFU(pVCpu->pUVCpu, VMNOTIFYFF_FLAGS_POKE);
@@ -269 +277 @@
             {
                 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatTlbShootdownFlush);
-    #ifdef IN_RING0
+# ifdef IN_RING0
                 RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
                 if (idHostCpu != NIL_RTCPUID)
-                    RTMpPokeCpu(idHostCpu);
-    #else
+                    hwaccmMpPokeCpu(idHostCpu);
+# else
                 VMR3NotifyCpuFFU(pVCpu->pUVCpu, VMNOTIFYFF_FLAGS_POKE);
-    #endif
+# endif
             }
             else