Changeset 19420 in vbox

Timestamp:

May 6, 2009 11:07:11 AM (16 years ago)

Author:

vboxsync

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

46945

Message:

Action flag updates

Location:

trunk

Files:

• include/VBox/vm.h (modified) (2 diffs)
• src/VBox/VMM/EM.cpp (modified) (1 diff)
• src/VBox/VMM/PDM.cpp (modified) (1 diff)
• src/VBox/VMM/PDMQueue.cpp (modified) (1 diff)
• src/VBox/VMM/VMReq.cpp (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -203 +203 @@
 #define VM_FF_TIMER                         RT_BIT_32(2)
 /** PDM Queues are pending. */
-#define VM_FF_PDM_QUEUES                    RT_BIT_32(3)
+#define VM_FF_PDM_QUEUES_BIT                3
+#define VM_FF_PDM_QUEUES                    RT_BIT_32(VM_FF_PDM_QUEUES_BIT)
 /** PDM DMA transfers are pending. */
-#define VM_FF_PDM_DMA                       RT_BIT_32(4)
+#define VM_FF_PDM_DMA_BIT                   4
+#define VM_FF_PDM_DMA                       RT_BIT_32(VM_FF_PDM_DMA_BIT)
 /** PDM critical section unlocking is pending, process promptly upon return to R3. */
 #define VM_FF_PDM_CRITSECT                  RT_BIT_32(5)
@@ -390 +392 @@
 #define VM_FF_ISPENDING(pVM, fFlags)        ((pVM)->fGlobalForcedActions & (fFlags))
 
+/** @def VM_FF_TESTANDCLEAR
+ * Checks if one (!) force action in the specified set is pending and clears it atomically
+ *
+ * @returns true if the bit was set.
+ * @returns false if the bit was clear.
+ * @param   pVM     VM Handle.
+ * @param   iBit    Bit position to check and clear
+ */
+#define VM_FF_TESTANDCLEAR(pVM, iBit)        (ASMBitTestAndClear(&(pVM)->fGlobalForcedActions, iBit))
+
 /** @def VMCPU_FF_ISPENDING
  * Checks if one or more force action in the specified set is pending for the given VCPU.

trunk/src/VBox/VMM/EM.cpp

@@ -967 +967 @@
              * imporant FFs while we were busy switching the state. So, check again.
              */
-            if (VM_FF_ISPENDING(pVM, VM_FF_REQUEST | VM_FF_TIMER | VM_FF_PDM_QUEUES | VM_FF_DBGF | VM_FF_TERMINATE | VM_FF_RESET))
+            if (    VM_FF_ISPENDING(pVM, VM_FF_REQUEST | VM_FF_TIMER | VM_FF_PDM_QUEUES | VM_FF_DBGF | VM_FF_TERMINATE | VM_FF_RESET)
+                ||  VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_REQUEST))
             {
                 LogFlow(("emR3RemExecute: Skipping run, because FF is set. %#x\n", pVM->fGlobalForcedActions));

trunk/src/VBox/VMM/PDM.cpp

@@ -1330 +1330 @@
 VMMR3DECL(void) PDMR3DmaRun(PVM pVM)
 {
-    VM_FF_CLEAR(pVM, VM_FF_PDM_DMA);
-    if (pVM->pdm.s.pDmac)
-    {
-        bool fMore = pVM->pdm.s.pDmac->Reg.pfnRun(pVM->pdm.s.pDmac->pDevIns);
-        if (fMore)
-            VM_FF_SET(pVM, VM_FF_PDM_DMA);
+    /** @note Not really SMP safe; restrict it to VCPU 0? */
+    if (VMMGetCpuId(pVM) != 0)
+        return;
+
+    if (VM_FF_TESTANDCLEAR(pVM, VM_FF_PDM_DMA_BIT))
+    {
+        if (pVM->pdm.s.pDmac)
+        {
+            bool fMore = pVM->pdm.s.pDmac->Reg.pfnRun(pVM->pdm.s.pDmac->pDevIns);
+            if (fMore)
+                VM_FF_SET(pVM, VM_FF_PDM_DMA);
+        }
     }
 }

trunk/src/VBox/VMM/PDMQueue.cpp

@@ -617 +617 @@
     LogFlow(("PDMR3QueuesFlush:\n"));
 
-    VM_FF_CLEAR(pVM, VM_FF_PDM_QUEUES);
-    for (PPDMQUEUE pCur = pVM->pdm.s.pQueuesForced; pCur; pCur = pCur->pNext)
-    {
-        if (    pCur->pPendingR3
-            ||  pCur->pPendingR0
-            ||  pCur->pPendingRC)
-        {
-            if (    pdmR3QueueFlush(pCur)
-                &&  pCur->pPendingR3)
-                /* new items arrived while flushing. */
-                pdmR3QueueFlush(pCur);
+    /* Use atomic test and clear to prevent useless checks; pdmR3QueueFlush is SMP safe. */
+    if (VM_FF_TESTANDCLEAR(pVM, VM_FF_PDM_QUEUES_BIT))
+    {
+        for (PPDMQUEUE pCur = pVM->pdm.s.pQueuesForced; pCur; pCur = pCur->pNext)
+        {
+            if (    pCur->pPendingR3
+                ||  pCur->pPendingR0
+                ||  pCur->pPendingRC)
+            {
+                if (    pdmR3QueueFlush(pCur)
+                    &&  pCur->pPendingR3)
+                    /* new items arrived while flushing. */
+                    pdmR3QueueFlush(pCur);
+            }
         }
     }

trunk/src/VBox/VMM/VMReq.cpp

@@ -837 +837 @@
      * We do not repeat the outer loop if we've got an informational status code
      * since that code needs processing by our caller.
+     */
+    /**
+     * @note SMP safe (multiple EMTs trying to satisfy VM_FF_REQUESTs)
      */
     int rc = VINF_SUCCESS;