Changeset 52513 in vbox

Timestamp:

Aug 28, 2014 1:14:13 PM (10 years ago)

Author:

vboxsync

Message:

USB: Serialize access to the extra state data for control pipes, fixes several assertions in debug builds

Location:

trunk/src/VBox/Devices/USB

Files:

• VUSBDevice.cpp (modified) (2 diffs)
• VUSBInternal.h (modified) (1 diff)
• VUSBUrb.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/USB/VUSBDevice.cpp

@@ -1225 +1225 @@
     pDev->pCurCfgDesc = NULL;
     for (unsigned i = 0; i < VUSB_PIPE_MAX; i++)
+    {
         vusbMsgFreeExtraData(pDev->aPipes[i].pCtrl);
+        RTCritSectDelete(&pDev->aPipes[i].CritSectCtrl);
+    }
     memset(pDev->aPipes, 0, sizeof(pDev->aPipes));
     return VINF_SUCCESS;
@@ -1711 +1714 @@
     pDev->paIfStates = NULL;
     memset(&pDev->aPipes[0], 0, sizeof(pDev->aPipes));
+    for (unsigned i = 0; i < RT_ELEMENTS(pDev->aPipes); i++)
+    {
+        int rc = RTCritSectInit(&pDev->aPipes[i].CritSectCtrl);
+        AssertRCReturn(rc, rc);
+    }
     pDev->pResetTimer = NULL;
 

trunk/src/VBox/Devices/USB/VUSBInternal.h

@@ -125 +125 @@
     /** Pointer to the extra state data required to run a control pipe. */
     PVUSBCTRLEXTRA      pCtrl;
+    /** Critical section serializing access to the extra state data for a control pipe. */
+    RTCRITSECT          CritSectCtrl;
     /** Count of active async transfers. */
     volatile uint32_t   async;

trunk/src/VBox/Devices/USB/VUSBUrb.cpp

@@ -935 +935 @@
             break;
     }
-    vusbUrbCompletionRh(pUrb);
 }
 
@@ -948 +947 @@
     PVUSBDEV        pDev   = pUrb->VUsb.pDev;
     PVUSBPIPE       pPipe  = &pDev->aPipes[pUrb->EndPt];
+
+    RTCritSectEnter(&pPipe->CritSectCtrl);
     PVUSBCTRLEXTRA  pExtra = pPipe->pCtrl;
 
@@ -977 +978 @@
     if (pUrb->enmState != VUSBURBSTATE_CANCELLED)
         pUrb->enmState = VUSBURBSTATE_ALLOCATED;
+    RTCritSectLeave(&pPipe->CritSectCtrl);
+
+    /* Complete the original control URB on the root hub now. */
+    vusbUrbCompletionRh(pCtrlUrb);
 }
 
@@ -1260 +1265 @@
 
     vusbCtrlCompletion(pUrb);
+    vusbUrbCompletionRh(pUrb);
 
     /*
@@ -1572 +1578 @@
     PVUSBDEV        pDev = pUrb->VUsb.pDev;
     PVUSBPIPE       pPipe = &pDev->aPipes[pUrb->EndPt];
+
+    RTCritSectEnter(&pPipe->CritSectCtrl);
     PVUSBCTRLEXTRA  pExtra = pPipe->pCtrl;
+
     if (!pExtra && !(pExtra = pPipe->pCtrl = vusbMsgAllocExtraData(pUrb)))
+    {
+        RTCritSectLeave(&pPipe->CritSectCtrl);
         return VERR_VUSB_NO_URB_MEMORY;
+    }
     PVUSBSETUP      pSetup = pExtra->pMsg;
 
@@ -1613 +1625 @@
             {
                 Log(("%s: vusbUrbSubmitCtrl: Stall at setup stage (dir=%#x)!!\n", pUrb->pszDesc, pUrb->enmDir));
-                return vusbMsgStall(pUrb);
+                vusbMsgStall(pUrb);
+                break;
             }
 
@@ -1622 +1635 @@
                 pUrb->enmStatus = VUSBSTATUS_DNR;
                 vusbUrbCompletionRh(pUrb);
-                return VINF_SUCCESS;
+                break;
             }
             if (pPipe->pCtrl != pExtra)
@@ -1680 +1693 @@
                 {
                     Log(("%s: vusbUrbSubmitCtrl: Stall at data stage!!\n", pUrb->pszDesc));
-                    return vusbMsgStall(pUrb);
+                    vusbMsgStall(pUrb);
+                    break;
                 }
             }
@@ -1747 +1761 @@
     }
 
+    RTCritSectLeave(&pPipe->CritSectCtrl);
     return VINF_SUCCESS;
 }