Changeset 52948 in vbox

Timestamp:

Oct 5, 2014 8:53:13 PM (10 years ago)

Author:

vboxsync

Message:

USBProxyDevice-linux: various fixes for the split URB code paths used on older Linux kernels

File:

• trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp (modified) (12 diffs)

trunk/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp

@@ -281 +281 @@
 static void usbProxyLinuxUrbLinkInFlight(PUSBPROXYDEVLNX pDevLnx, PUSBPROXYURBLNX pUrbLnx)
 {
+    LogFlowFunc(("pDevLnx=%p pUrbLnx=%p\n", pDevLnx, pUrbLnx));
     Assert(RTCritSectIsOwner(&pDevLnx->CritSect));
-    Assert(!pUrbLnx->pSplitHead);
+    Assert(!pUrbLnx->pSplitHead || pUrbLnx->pSplitHead == pUrbLnx);
     RTListAppend(&pDevLnx->ListInFlight, &pUrbLnx->NodeList);
 }
@@ -294 +295 @@
 static void usbProxyLinuxUrbUnlinkInFlight(PUSBPROXYDEVLNX pDevLnx, PUSBPROXYURBLNX pUrbLnx)
 {
+    LogFlowFunc(("pDevLnx=%p pUrbLnx=%p\n", pDevLnx, pUrbLnx));
     RTCritSectEnter(&pDevLnx->CritSect);
 
@@ -302 +304 @@
 
     RTListNodeRemove(&pUrbLnx->NodeList);
-    pUrbLnx->pSplitHead = pUrbLnx->pSplitNext = NULL;
 
     RTCritSectLeave(&pDevLnx->CritSect);
@@ -319 +320 @@
     PUSBPROXYURBLNX pUrbLnx;
 
+    LogFlowFunc(("pProxyDev=%p pSplitHead=%p\n", pProxyDev, pSplitHead));
+
     RTCritSectEnter(&pDevLnx->CritSect);
 
@@ -342 +345 @@
     pUrbLnx->fCanceledBySubmit = false;
     pUrbLnx->fSplitElementReaped = false;
+    LogFlowFunc(("returns pUrbLnx=%p\n", pUrbLnx));
     return pUrbLnx;
 }
@@ -356 +360 @@
     PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
 
+    LogFlowFunc(("pProxyDev=%p pUrbLnx=%p\n", pProxyDev, pUrbLnx));
+
+    /*
+     * Link it into the free list.
+     */
     RTCritSectEnter(&pDevLnx->CritSect);
-
-    /*
-     * Link it into the free list.
-     */
     RTListAppend(&pDevLnx->ListFree, &pUrbLnx->NodeList);
-
     RTCritSectLeave(&pDevLnx->CritSect);
 }
@@ -376 +380 @@
 {
     PUSBPROXYDEVLNX pDevLnx = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVLNX);
+
+    LogFlowFunc(("pProxyDev=%p pUrbLnx=%p\n", pProxyDev, pUrbLnx));
 
     RTCritSectEnter(&pDevLnx->CritSect);
@@ -1306 +1312 @@
     uint8_t             *pb = (uint8_t *)pCur->KUrb.buffer;
 
+    LogFlowFunc(("pProxyDev=%p pHead=%p pCur=%p\n", pProxyDev, pHead, pCur));
+
     Assert(cbLeft != 0);
     pNew = pCur->pSplitNext = usbProxyLinuxUrbAlloc(pProxyDev, pHead);
@@ -1324 +1332 @@
     Assert(cbLeft < INT32_MAX);
     pNew->cbSplitRemaining = cbLeft;
+    LogFlowFunc(("returns pNew=%p\n", pNew));
     return pNew;
 }
@@ -1523 +1532 @@
         if (errno == ENODEV)
         {
+            rc = RTErrConvertFromErrno(errno);
             Log(("usbProxyLinuxUrbQueue: ENODEV -> unplugged. pProxyDev=%s\n", usbProxyGetName(pProxyDev)));
             if (pUrb->enmType == VUSBXFERTYPE_MSG)
@@ -1530 +1540 @@
             usbProxyLinuxUrbFree(pProxyDev, pUrbLnx);
             usbProxLinuxUrbUnplugged(pProxyDev);
-            return RTErrConvertFromErrno(errno);
+            return rc;
         }
 
@@ -1792 +1802 @@
             }
             pUrb->cbData = pbEnd - &pUrb->abData[0];
+            usbProxyLinuxUrbUnlinkInFlight(pDevLnx, pUrbLnx);
             usbProxyLinuxUrbFreeSplitList(pProxyDev, pUrbLnx);
         }