Changeset 61246 in vbox for trunk

Timestamp:

May 27, 2016 2:30:58 PM (9 years ago)

Author:

vboxsync

Message:

VUSB: Retry after most errors during device enumeration in order to better support flaky devices. Thanks Dennis Wassenberg / secunet.

File:

• trunk/src/VBox/Devices/USB/USBProxyDevice.cpp (modified) (9 diffs)

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

@@ -55 +55 @@
 static void *GetStdDescSync(PUSBPROXYDEV pProxyDev, uint8_t iDescType, uint8_t iIdx, uint16_t LangId, uint16_t cbHint)
 {
-#define VUSBSTATUS_DNR_RETRIES 5
+#define GET_DESC_RETRIES 6
     int cRetries = 0;
+    uint16_t cbInitialHint = cbHint;
 
     LogFlow(("GetStdDescSync: pProxyDev=%s\n", pProxyDev->pUsbIns->pszName));
@@ -91 +92 @@
         pSetup->wLength = cbHint;
 
+        uint8_t *pbDesc = (uint8_t *)(pSetup + 1);
+        uint32_t cbDesc = 0;
+        PVUSBURB pUrbReaped = NULL;
+
         rc = pProxyDev->pOps->pfnUrbQueue(pProxyDev, &Urb);
         if (RT_FAILURE(rc))
-            break;
+        {
+            Log(("GetStdDescSync: pfnUrbReap failed, rc=%d\n", rc));
+            goto err;
+        }
 
         /* Don't wait forever, it's just a simple request that should
            return immediately. Since we're executing in the EMT thread
            it's important not to get stuck here. (Some of the builtin
-           iMac devices may not refuse respond for instance.) */
-        PVUSBURB pUrbReaped = pProxyDev->pOps->pfnUrbReap(pProxyDev, 10000 /* ms */);
+           iMac devices may refuse to respond for instance.) */
+        pUrbReaped = pProxyDev->pOps->pfnUrbReap(pProxyDev, 10000 /* ms */);
         if (!pUrbReaped)
         {
@@ -110 +118 @@
         {
             Log(("GetStdDescSync: pfnUrbReap failed, pUrbReaped=%p\n", pUrbReaped));
-            break;
+            goto err;
         }
 
@@ -116 +124 @@
         {
             Log(("GetStdDescSync: Urb.enmStatus=%d\n", Urb.enmStatus));
-
-            if (Urb.enmStatus == VUSBSTATUS_DNR)
-            {
-                cRetries++;
-                if (cRetries < VUSBSTATUS_DNR_RETRIES)
-                {
-                    Log(("GetStdDescSync: Retrying %u/%u\n", cRetries, VUSBSTATUS_DNR_RETRIES));
-                    continue;
-                }
-            }
-
-            break;
+            goto err;
         }
 
@@ -133 +130 @@
          * Check the length, config descriptors have total_length field
          */
-        uint8_t *pbDesc = (uint8_t *)(pSetup + 1);
-        uint32_t cbDesc;
         if (iDescType == VUSB_DT_CONFIG)
         {
@@ -140 +135 @@
             {
                 Log(("GetStdDescSync: Urb.cbData=%#x (min 4)\n", Urb.cbData));
-                break;
+                goto err;
             }
             cbDesc = RT_LE2H_U16(((uint16_t *)pbDesc)[1]);
@@ -149 +144 @@
             {
                 Log(("GetStdDescSync: Urb.cbData=%#x (min 1)\n", Urb.cbData));
-                break;
+                goto err;
             }
             cbDesc = ((uint8_t *)pbDesc)[0];
@@ -160 +155 @@
         {
             cbHint = cbDesc;
+            Log(("GetStdDescSync: Part descriptor, Urb.cbData=%u, cbDesc=%u cbHint=%u\n", Urb.cbData, cbDesc, cbHint));
+
             if (cbHint > sizeof(Urb.abData))
-            {
-                AssertMsgFailed(("cbHint=%u\n", cbHint));
-                break;
-            }
-            continue;
-        }
-        Assert(cbDesc <= Urb.cbData - sizeof(VUSBSETUP));
+                Log(("GetStdDescSync: cbHint=%u, Urb.abData=%u\n", cbHint, sizeof(Urb.abData)));
+
+            goto err;
+        }
+
+        if ((cbDesc > (Urb.cbData - sizeof(VUSBSETUP))))
+        {
+            Log(("GetStdDescSync: Descriptor length too short, cbDesc=%u, Urb.cbData=%u\n", cbDesc, Urb.cbData));
+            goto err;
+        }
+
+        if ((cbInitialHint != cbHint) &&
+                ((cbDesc != cbHint) || (Urb.cbData < cbInitialHint)))
+        {
+            Log(("GetStdDescSync: Descriptor length incorrect, cbDesc=%u, Urb.cbData=%u, cbHint=%u\n", cbDesc, Urb.cbData, cbHint));
+            goto err;
+        }
+
 #ifdef LOG_ENABLED
         vusbUrbTrace(&Urb, "GetStdDescSync", true);
@@ -176 +184 @@
          */
         return RTMemDup(pbDesc, cbDesc);
-    }
+
+err:
+        cRetries++;
+        if (cRetries < GET_DESC_RETRIES)
+        {
+            Log(("GetStdDescSync: Retrying %u/%u\n", cRetries, GET_DESC_RETRIES));
+            RTThreadSleep(100);
+            continue;
+        }
+        else
+        {
+            Log(("GetStdDescSync: Retries exceeded %u/%u. Giving up.\n", cRetries, GET_DESC_RETRIES));
+            break;
+        }
+    }
+
     return NULL;
 }