Changeset 49434 in vbox for trunk/src/VBox

Timestamp:

Nov 11, 2013 11:09:01 AM (11 years ago)

Author:

vboxsync

Message:

VHWA: smp guests syncronization

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.h (modified) (1 diff)
• DevVGA_VBVA.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA.h

@@ -434 +434 @@
 
     struct {
-        uint32_t cPending;
+        volatile uint32_t cPending;
         uint32_t Padding1;
         union

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -813 +813 @@
 static void vbvaVHWACommandCompleteAllPending(PVGASTATE pVGAState, int rc)
 {
-    if (!pVGAState->pendingVhwaCommands.cPending)
+    if (!ASMAtomicUoReadU32(&pVGAState->pendingVhwaCommands.cPending))
         return;
 
     VBOX_VHWA_PENDINGCMD *pIter, *pNext;
+
+    PDMCritSectEnter(&pVGAState->lock, VERR_SEM_BUSY);
+
     RTListForEachSafe(&pVGAState->pendingVhwaCommands.PendingList, pIter, pNext, VBOX_VHWA_PENDINGCMD, Node)
     {
@@ -824 +827 @@
         /* the command is submitted/processed, remove from the pend list */
         RTListNodeRemove(&pIter->Node);
-        --pVGAState->pendingVhwaCommands.cPending;
+        ASMAtomicDecU32(&pVGAState->pendingVhwaCommands.cPending);
         RTMemFree(pIter);
     }
-}
-
-static void vbvaVHWACommandCClearAllPending(PVGASTATE pVGAState)
-{
-    if (!pVGAState->pendingVhwaCommands.cPending)
+
+    PDMCritSectLeave(&pVGAState->lock);
+}
+
+static void vbvaVHWACommandClearAllPending(PVGASTATE pVGAState)
+{
+    if (!ASMAtomicUoReadU32(&pVGAState->pendingVhwaCommands.cPending))
         return;
 
     VBOX_VHWA_PENDINGCMD *pIter, *pNext;
+
+    PDMCritSectEnter(&pVGAState->lock, VERR_SEM_BUSY);
+
     RTListForEachSafe(&pVGAState->pendingVhwaCommands.PendingList, pIter, pNext, VBOX_VHWA_PENDINGCMD, Node)
     {
         RTListNodeRemove(&pIter->Node);
-        --pVGAState->pendingVhwaCommands.cPending;
+        ASMAtomicDecU32(&pVGAState->pendingVhwaCommands.cPending);
         RTMemFree(pIter);
     }
+
+    PDMCritSectLeave(&pVGAState->lock);
 }
 
@@ -847 +857 @@
     int rc = VERR_BUFFER_OVERFLOW;
 
-    if (pVGAState->pendingVhwaCommands.cPending < VBOX_VHWA_MAX_PENDING_COMMANDS)
+    if (ASMAtomicUoReadU32(&pVGAState->pendingVhwaCommands.cPending) < VBOX_VHWA_MAX_PENDING_COMMANDS)
     {
         VBOX_VHWA_PENDINGCMD *pPend = (VBOX_VHWA_PENDINGCMD*)RTMemAlloc(sizeof (*pPend));
@@ -854 +864 @@
             pCommand->Flags |= VBOXVHWACMD_FLAG_HG_ASYNCH;
             pPend->pCommand = pCommand;
-            RTListAppend(&pVGAState->pendingVhwaCommands.PendingList, &pPend->Node);
-            ++pVGAState->pendingVhwaCommands.cPending;
-            return;
+            PDMCritSectEnter(&pVGAState->lock, VERR_SEM_BUSY);
+            if (ASMAtomicUoReadU32(&pVGAState->pendingVhwaCommands.cPending) < VBOX_VHWA_MAX_PENDING_COMMANDS)
+            {
+                RTListAppend(&pVGAState->pendingVhwaCommands.PendingList, &pPend->Node);
+                ASMAtomicIncU32(&pVGAState->pendingVhwaCommands.cPending);
+                PDMCritSectLeave(&pVGAState->lock);
+                return;
+            }
+            PDMCritSectLeave(&pVGAState->lock);
+            LogRel(("Pending command count has reached its threshold.. completing them all.."));
+            RTMemFree(pPend);
         }
         else
@@ -862 +880 @@
     }
     else
-    {
         LogRel(("Pending command count has reached its threshold, completing them all.."));
-    }
 
     vbvaVHWACommandCompleteAllPending(pVGAState, rc);
@@ -973 +989 @@
 static bool vbvaVHWACheckPendingCommands(PVGASTATE pVGAState)
 {
-    if (!pVGAState->pendingVhwaCommands.cPending)
+    if (!ASMAtomicUoReadU32(&pVGAState->pendingVhwaCommands.cPending))
         return true;
 
     VBOX_VHWA_PENDINGCMD *pIter, *pNext;
+
+    PDMCritSectEnter(&pVGAState->lock, VERR_SEM_BUSY);
+
     RTListForEachSafe(&pVGAState->pendingVhwaCommands.PendingList, pIter, pNext, VBOX_VHWA_PENDINGCMD, Node)
     {
         if (!vbvaVHWACommandSubmit(pVGAState, pIter->pCommand, true))
+        {
+            PDMCritSectLeave(&pVGAState->lock);
             return false; /* the command should be pended still */
+        }
 
         /* the command is submitted/processed, remove from the pend list */
         RTListNodeRemove(&pIter->Node);
-        --pVGAState->pendingVhwaCommands.cPending;
+        ASMAtomicDecU32(&pVGAState->pendingVhwaCommands.cPending);
         RTMemFree(pIter);
     }
+
+    PDMCritSectLeave(&pVGAState->lock);
 
     return true;
@@ -1045 +1069 @@
     pVGAState->pendingVhwaCommands.cPending = 0;
     RTListInit(&pVGAState->pendingVhwaCommands.PendingList);
+
     VBOXVHWACMD *pCmd = vbvaVHWAHHCommandCreate(pVGAState, VBOXVHWACMD_TYPE_HH_CONSTRUCT, 0, sizeof(VBOXVHWACMD_HH_CONSTRUCT));
     Assert(pCmd);
@@ -1098 +1123 @@
 int vbvaVHWAReset (PVGASTATE pVGAState)
 {
-    vbvaVHWACommandCClearAllPending(pVGAState);
+    vbvaVHWACommandClearAllPending(pVGAState);
 
     /* ensure we have all pending cmds processed and h->g cmds disabled */