Changeset 40785 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Apr 6, 2012 5:42:14 AM (13 years ago)

Author:

vboxsync

Message:

wddm: fix smp racing

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Files:

• VBoxMPVdma.cpp (modified) (10 diffs)
• VBoxMPVdma.h (modified) (3 diffs)
• VBoxMPWddm.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.cpp

@@ -248 +248 @@
     }
     pHdr->enmType = enmType;
+    pHdr->cRefs = 1;
     return pHdr;
 }
@@ -280 +281 @@
 }
 
-DECLCALLBACK(VOID) vboxVdmaGgDdiCmdDestroy(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext)
-{
-    vboxVdmaGgCmdDestroy(pDevExt, (PVBOXVDMAPIPE_CMD_DR)pvContext);
+DECLCALLBACK(VOID) vboxVdmaGgDdiCmdRelease(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext)
+{
+    vboxVdmaGgCmdRelease(pDevExt, (PVBOXVDMAPIPE_CMD_DR)pvContext);
 }
 
@@ -831 +832 @@
     }
 
+    /* Corresponding Release is done by dma command completion handler */
+    vboxVdmaGgCmdAddRef(&pDmaCmd->Hdr);
+
     NTSTATUS tmpStatus = vboxVdmaGgCmdDmaNotifyCompleted(pDevExt, pDmaCmd, enmComplType);
-    Assert(tmpStatus == STATUS_SUCCESS);
-    if (Status != STATUS_MORE_PROCESSING_REQUIRED)
-    {
-        vboxVdmaGgCmdDestroy(pDevExt, &pDmaCmd->Hdr);
+    if (!NT_SUCCESS(tmpStatus))
+    {
+        WARN(("vboxVdmaGgCmdDmaNotifyCompleted failed, Status 0x%x", tmpStatus));
+        /* the command was NOT submitted, and thus will not be released, release it here */
+        vboxVdmaGgCmdRelease(pDevExt, &pDmaCmd->Hdr);
+        Status = tmpStatus;
     }
 
@@ -930 +936 @@
     }
 
-    vboxVdmaGgCmdDestroy(pDevExt, &pDmaCmd->Hdr);
+    vboxVdmaGgCmdRelease(pDevExt, &pDmaCmd->Hdr);
 
     return Status;
@@ -981 +987 @@
                             Status = vboxVdmaGgDirtyRectsProcess(pDevExt, pRects->pContext, pRects->pSwapchain, &pRects->ContextsRects);
                             Assert(Status == STATUS_SUCCESS);
-                            vboxVdmaGgCmdDestroy(pDevExt, pDr);
+                            vboxVdmaGgCmdRelease(pDevExt, pDr);
                             break;
                         }
@@ -995 +1001 @@
                                 WARN(("vboxVideoCmCmdWaitCompleted failedm Status (0x%x)", Status));
                             }
-                            vboxVdmaGgCmdDestroy(pDevExt, &pCmd->Hdr);
+                            vboxVdmaGgCmdRelease(pDevExt, &pCmd->Hdr);
                             break;
                         }
@@ -1009 +1015 @@
                             Assert(pCmd->pEvent);
                             KeSetEvent(pCmd->pEvent, 0, FALSE);
-                            vboxVdmaGgCmdDestroy(pDevExt, &pCmd->Hdr);
+                            vboxVdmaGgCmdRelease(pDevExt, &pCmd->Hdr);
                             break;
                         }
@@ -1083 +1089 @@
             break;
     }
+    /* correspondinf Release is done by the pipe command handler */
+    vboxVdmaGgCmdAddRef(pCmd);
     return vboxVdmaPipeCltCmdPut(&pDevExt->u.primary.Vdma.DmaGg.CmdPipe, &pCmd->PipeHdr);
 }
@@ -1142 +1150 @@
             WARN(("vboxVdmaGgCmdSubmit returned 0x%x", Status));
         }
+        vboxVdmaGgCmdRelease(pDevExt, &pCmd->Hdr);
     }
     else
@@ -1173 +1182 @@
             WARN(("vboxVdmaGgCmdSubmit returned 0x%x", Status));
         }
+        vboxVdmaGgCmdRelease(pDevExt, &pCmd->Hdr);
     }
     else

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVdma.h

@@ -170 +170 @@
     VBOXVDMAPIPE_CMD_HDR PipeHdr;
     VBOXVDMAPIPE_CMD_TYPE enmType;
+    volatile uint32_t cRefs;
 } VBOXVDMAPIPE_CMD_DR, *PVBOXVDMAPIPE_CMD_DR;
 
@@ -329 +330 @@
 NTSTATUS vboxVdmaGgCmdSubmit(PVBOXMP_DEVEXT pDevExt, PVBOXVDMAPIPE_CMD_DR pCmd);
 PVBOXVDMAPIPE_CMD_DR vboxVdmaGgCmdCreate(PVBOXMP_DEVEXT pDevExt, VBOXVDMAPIPE_CMD_TYPE enmType, uint32_t cbCmd);
+DECLINLINE(void) vboxVdmaGgCmdAddRef(PVBOXVDMAPIPE_CMD_DR pDr)
+{
+    ASMAtomicIncU32(&pDr->cRefs);
+}
 void vboxVdmaGgCmdDestroy(PVBOXMP_DEVEXT pDevExt, PVBOXVDMAPIPE_CMD_DR pDr);
+DECLINLINE(void) vboxVdmaGgCmdRelease(PVBOXMP_DEVEXT pDevExt, PVBOXVDMAPIPE_CMD_DR pDr)
+{
+    uint32_t cRefs = ASMAtomicDecU32(&pDr->cRefs);
+    Assert(cRefs < UINT32_MAX/2);
+    if (!cRefs)
+        vboxVdmaGgCmdDestroy(pDevExt, pDr);
+}
 NTSTATUS vboxVdmaGgCmdFinish(PVBOXMP_DEVEXT pDevExt, struct VBOXWDDM_CONTEXT *pContext, PKEVENT pEvent);
 NTSTATUS vboxVdmaGgCmdCancel(PVBOXMP_DEVEXT pDevExt, VBOXWDDM_CONTEXT *pContext, PVBOXWDDM_SWAPCHAIN pSwapchain);
@@ -345 +357 @@
 
 #define VBOXVDMAPIPE_CMD_DR_FROM_DDI_CMD(_pCmd) ((PVBOXVDMAPIPE_CMD_DR)(((uint8_t*)(_pCmd)) - RT_OFFSETOF(VBOXVDMAPIPE_CMD_DR, DdiCmd)))
-DECLCALLBACK(VOID) vboxVdmaGgDdiCmdDestroy(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext);
+DECLCALLBACK(VOID) vboxVdmaGgDdiCmdRelease(PVBOXMP_DEVEXT pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext);
 #endif /* #ifndef ___VBoxMPVdma_h___ */

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -2685 +2685 @@
     else
     {
-        vboxVdmaGgCmdDestroy(pDevExt, &pCmd->Hdr);
+        vboxVdmaGgCmdRelease(pDevExt, &pCmd->Hdr);
     }
     return Status;
@@ -2698 +2698 @@
     {
         VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pBlt->Blt.DstAlloc.srcId];
-        vboxVdmaGgCmdDmaNotifyInit(&pBltCmd->Hdr, pContext->NodeOrdinal, u32FenceId, NULL, NULL);
+        vboxVdmaGgCmdDmaNotifyInit(&pBltCmd->Hdr, pContext->NodeOrdinal, u32FenceId, vboxVdmaGgDdiCmdRelease, pBltCmd);
         pBltCmd->Hdr.fFlags = fBltFlags;
         pBltCmd->Hdr.pContext = pContext;
         pBltCmd->Hdr.enmCmd = VBOXVDMACMD_TYPE_DMA_PRESENT_BLT;
         memcpy(&pBltCmd->Blt, &pBlt->Blt, RT_OFFSETOF(VBOXVDMA_BLT, DstRects.UpdateRects.aRects[pBlt->Blt.DstRects.UpdateRects.cRects]));
-        vboxWddmSubmitCmd(pDevExt, &pBltCmd->Hdr);
+        Status = vboxWddmSubmitCmd(pDevExt, &pBltCmd->Hdr);
+        if (Status != STATUS_SUCCESS)
+        {
+            WARN(("vboxWddmSubmitCmd failed, Status 0x%x", Status));
+            Status = STATUS_SUCCESS;
+        }
+        vboxVdmaGgCmdRelease(pDevExt, &pBltCmd->Hdr.Hdr);
     }
     else
@@ -3026 +3032 @@
             {
                 VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pFlip->Flip.Alloc.srcId];
-                vboxVdmaGgCmdDmaNotifyInit(&pFlipCmd->Hdr, pContext->NodeOrdinal, pSubmitCommand->SubmissionFenceId, NULL, NULL);
+                vboxVdmaGgCmdDmaNotifyInit(&pFlipCmd->Hdr, pContext->NodeOrdinal, pSubmitCommand->SubmissionFenceId, vboxVdmaGgDdiCmdRelease, pFlipCmd);
                 pFlipCmd->Hdr.fFlags.Value = 0;
                 pFlipCmd->Hdr.fFlags.fVisibleRegions = 1;
@@ -3033 +3039 @@
                 memcpy(&pFlipCmd->Flip, &pFlip->Flip, sizeof (pFlipCmd->Flip));
                 Status = vboxWddmSubmitCmd(pDevExt, &pFlipCmd->Hdr);
-                Assert(Status == STATUS_SUCCESS);
+                if (Status != STATUS_SUCCESS)
+                    WARN(("vboxWddmSubmitCmd failed, Status 0x%x", Status));
+                vboxVdmaGgCmdRelease(pDevExt, &pFlipCmd->Hdr.Hdr);
             }
             else
@@ -3050 +3058 @@
             if (pCFCmd)
             {
-//                VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pFlip->Flip.Alloc.srcId];
-                vboxVdmaGgCmdDmaNotifyInit(&pCFCmd->Hdr, pContext->NodeOrdinal, pSubmitCommand->SubmissionFenceId, NULL, NULL);
+                vboxVdmaGgCmdDmaNotifyInit(&pCFCmd->Hdr, pContext->NodeOrdinal, pSubmitCommand->SubmissionFenceId, vboxVdmaGgDdiCmdRelease, pCFCmd);
                 pCFCmd->Hdr.fFlags.Value = 0;
                 pCFCmd->Hdr.fFlags.fRealOp = 1;
@@ -3058 +3065 @@
                 memcpy(&pCFCmd->ClrFill, &pCF->ClrFill, RT_OFFSETOF(VBOXVDMA_CLRFILL, Rects.aRects[pCF->ClrFill.Rects.cRects]));
                 Status = vboxWddmSubmitCmd(pDevExt, &pCFCmd->Hdr);
-                Assert(Status == STATUS_SUCCESS);
+                if (Status != STATUS_SUCCESS)
+                    WARN(("vboxWddmSubmitCmd failed, Status 0x%x", Status));
+                vboxVdmaGgCmdRelease(pDevExt, &pCFCmd->Hdr.Hdr);
+
             }
             else