Changeset 23366 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Sep 28, 2009 12:31:50 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52890

Message:

Wait for the target VCPU to finish its world switch.

File:

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

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

@@ -59 +59 @@
     VMCPU_FF_SET(pVCpu, VMCPU_FF_TLB_FLUSH);
 #else
+    Be very careful when activating this code!
     if (iPage == RT_ELEMENTS(pVCpu->hwaccm.s.TlbShootdown.aPages))
         VMCPU_FF_SET(pVCpu, VMCPU_FF_TLB_FLUSH);
@@ -118 +119 @@
  *
  */
-void hwaccmMpPokeCpu(RTCPUID idHostCpu)
-{
+void hwaccmMpPokeCpu(PVMCPU pVCpu, RTCPUID idHostCpu)
+{
+    uint32_t cWorldSwitchExit = pVCpu->hwaccm.s.cWorldSwitchExit;
+
     int rc = RTMpPokeCpu(idHostCpu);
-# ifndef RT_OS_WINDOWS
     /* Not implemented on some platforms (Darwin, Linux kernel < 2.6.19); fall back to a less efficient implementation (broadcast). */
     if (rc == VERR_NOT_SUPPORTED)
+    {
+        /* synchronous. */
         RTMpOnSpecific(idHostCpu, hwaccmFlushHandler, 0, 0);
-# endif
+    }
+    else
+    {
+        if (rc == VINF_SUCCESS)
+            STAM_PROFILE_ADV_START(&pVCpu->hwaccm.s.StatSpinPoke, z);
+        else
+            STAM_PROFILE_ADV_START(&pVCpu->hwaccm.s.StatSpinPokeFailed, z);
+            
+        /* Spin until the VCPU has switched back. */
+        while (     VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED_EXEC
+               &&   pVCpu->hwaccm.s.fCheckedTLBFlush
+               &&   cWorldSwitchExit == pVCpu->hwaccm.s.cWorldSwitchExit)
+        {
+            ASMNopPause();
+        }
+        if (rc == VINF_SUCCESS)
+            STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatSpinPoke, z);
+        else
+            STAM_PROFILE_ADV_STOP(&pVCpu->hwaccm.s.StatSpinPokeFailed, z);
+    }
 }
 #endif
@@ -152 +175 @@
         {
             hwaccmQueueInvlPage(pVCpu, GCPtr);
-            if (VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED_EXEC)
+            if (    VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED_EXEC
+                &&  pVCpu->hwaccm.s.fCheckedTLBFlush)
             {
                 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatTlbShootdown);
@@ -158 +182 @@
                 RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
                 if (idHostCpu != NIL_RTCPUID)
-                    hwaccmMpPokeCpu(idHostCpu);
+                    hwaccmMpPokeCpu(pVCpu, idHostCpu);
 #else
                 VMR3NotifyCpuFFU(pVCpu->pUVCpu, VMNOTIFYFF_FLAGS_POKE);
@@ -197 +221 @@
             continue;
 
-        if (VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED_EXEC)
+        if (    VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED_EXEC
+            &&  pVCpu->hwaccm.s.fCheckedTLBFlush)
         {
             STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatTlbShootdownFlush);
@@ -203 +228 @@
             RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
             if (idHostCpu != NIL_RTCPUID)
-                hwaccmMpPokeCpu(idHostCpu);
+                hwaccmMpPokeCpu(pVCpu, idHostCpu);
 #else
             VMR3NotifyCpuFFU(pVCpu->pUVCpu, VMNOTIFYFF_FLAGS_POKE);
@@ -272 +297 @@
 
             VMCPU_FF_SET(pVCpu, VMCPU_FF_TLB_FLUSH);
-            if (VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED_EXEC)
+            if (    VMCPU_GET_STATE(pVCpu) == VMCPUSTATE_STARTED_EXEC
+                &&  pVCpu->hwaccm.s.fCheckedTLBFlush)
             {
                 STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatTlbShootdownFlush);
@@ -278 +304 @@
                 RTCPUID idHostCpu = pVCpu->hwaccm.s.idEnteredCpu;
                 if (idHostCpu != NIL_RTCPUID)
-                    hwaccmMpPokeCpu(idHostCpu);
+                    hwaccmMpPokeCpu(pVCpu, idHostCpu);
 # else
                 VMR3NotifyCpuFFU(pVCpu->pUVCpu, VMNOTIFYFF_FLAGS_POKE);