Changeset 53796 in vbox for trunk/src

Timestamp:

Jan 14, 2015 9:37:27 AM (10 years ago)

Author:

vboxsync

Message:

VMSVGA: Use new EMT wait API.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (11 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -28 +28 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DEV_VMSVGA
+#define VMSVGA_USE_EMT_HALT_CODE
 #include <VBox/vmm/pdmdev.h>
 #include <VBox/version.h>
@@ -33 +34 @@
 #include <VBox/log.h>
 #include <VBox/vmm/pgm.h>
+#ifdef VMSVGA_USE_EMT_HALT_CODE
+# include <VBox/vmm/vmapi.h>
+# include <VBox/vmm/vmcpuset.h>
+# include <VBox/vmm/vm.h> /* Need VMCPU::idCpu. */
+#endif
 #include <VBox/sup.h>
 
@@ -121 +127 @@
     SVGAColorBGRX           colorAnnotation;
 
+#ifdef VMSVGA_USE_EMT_HALT_CODE
+    /** Number of EMTs in BusyDelayedEmts (quicker than scanning the set). */
+    uint32_t volatile       cBusyDelayedEmts;
+    /** Set of EMTs that are   */
+    VMCPUSET                BusyDelayedEmts;
+#else
     /** Number of EMTs waiting on hBusyDelayedEmts. */
     uint32_t volatile       cBusyDelayedEmts;
@@ -126 +138 @@
      *  busy (ugly).  */
     RTSEMEVENTMULTI         hBusyDelayedEmts;
+#endif
     /** Tracks how much time we waste reading SVGA_REG_BUSY with a busy FIFO. */
     STAMPROFILE             StatBusyDelayEmts;
@@ -182 +195 @@
     SSMFIELD_ENTRY(             VMSVGASTATE, colorAnnotation),
     SSMFIELD_ENTRY_IGNORE(      VMSVGASTATE, cBusyDelayedEmts),
+#ifdef VMSVGA_USE_EMT_HALT_CODE
+    SSMFIELD_ENTRY_IGNORE(      VMSVGASTATE, BusyDelayedEmts),
+#else
     SSMFIELD_ENTRY_IGNORE(      VMSVGASTATE, hBusyDelayedEmts),
+#endif
     SSMFIELD_ENTRY_IGNORE(      VMSVGASTATE, StatBusyDelayEmts),
     SSMFIELD_ENTRY_IGNORE(      VMSVGASTATE, StatR3CmdPresent),
@@ -776 +793 @@
         {
 #ifndef IN_RING3
-            /* Go to ring-3 and yield the CPU a bit. */
+            /* Go to ring-3 and halt the CPU. */
             rc = VINF_IOM_R3_IOPORT_READ;
             break;
+#elif defined(VMSVGA_USE_EMT_HALT_CODE)
+            /* The guest is basically doing a HLT via the device here, but with
+               a special wake up condition on FIFO completion. */
+            PVMSVGASTATE pSVGAState = (PVMSVGASTATE)pThis->svga.pSVGAState;
+            STAM_REL_PROFILE_START(&pSVGAState->StatBusyDelayEmts, EmtDelay);
+            PVM         pVM   = PDMDevHlpGetVM(pThis->pDevInsR3);
+            VMCPUID     idCpu = PDMDevHlpGetVMCPU(pThis->pDevInsR3)->idCpu; /** @todo add a separate dev helper for this. */
+            VMCPUSET_ATOMIC_ADD(&pSVGAState->BusyDelayedEmts, idCpu);
+            ASMAtomicIncU32(&pSVGAState->cBusyDelayedEmts);
+            if (pThis->svga.fBusy)
+                rc = VMR3WaitForDeviceReady(pVM, idCpu);
+            ASMAtomicDecU32(&pSVGAState->cBusyDelayedEmts);
+            VMCPUSET_ATOMIC_DEL(&pSVGAState->BusyDelayedEmts, idCpu);
 #else
+
             /* Delay the EMT a bit so the FIFO and others can get some work done.
                This used to be a crude 50 ms sleep. The current code tries to be
@@ -808 +839 @@
             STAM_REL_PROFILE_STOP(&pSVGAState->StatBusyDelayEmts, EmtDelay);
 #endif
-        }
-        *pu32 = pThis->svga.fBusy != 0;
+            *pu32 = pThis->svga.fBusy != 0;
+        }
+        else
+            *pu32 = false;
         break;
 
@@ -1975 +2008 @@
     if (pSVGAState->cBusyDelayedEmts > 0)
     {
+#ifdef VMSVGA_USE_EMT_HALT_CODE
+        PVM pVM = PDMDevHlpGetVM(pThis->pDevInsR3);
+        VMCPUID idCpu = VMCpuSetFindLastPresentInternal(&pSVGAState->BusyDelayedEmts);
+        if (idCpu != NIL_VMCPUID)
+        {
+            VMR3NotifyCpuDeviceReady(pVM, idCpu);
+            while (idCpu-- > 0)
+                if (VMCPUSET_IS_PRESENT(&pSVGAState->BusyDelayedEmts, idCpu))
+                    VMR3NotifyCpuDeviceReady(pVM, idCpu);
+        }
+#else
         int rc2 = RTSemEventMultiSignal(pSVGAState->hBusyDelayedEmts);
         AssertRC(rc2);
+#endif
     }
 }
@@ -3766 +3811 @@
     if (pSVGAState)
     {
+# ifndef VMSVGA_USE_EMT_HALT_CODE
         if (pSVGAState->hBusyDelayedEmts != NIL_RTSEMEVENTMULTI)
         {
@@ -3771 +3817 @@
             pSVGAState->hBusyDelayedEmts = NIL_RTSEMEVENT;
         }
-
+# endif
         if (pSVGAState->Cursor.fActive)
             RTMemFree(pSVGAState->Cursor.pData);
@@ -3840 +3886 @@
     }
 
+# ifndef VMSVGA_USE_EMT_HALT_CODE
     /* Create semaphore for delaying EMTs wait for the FIFO to stop being busy. */
     rc = RTSemEventMultiCreate(&pSVGAState->hBusyDelayedEmts);
     AssertRCReturn(rc, rc);
+# endif
 
     /* Register caps. */