Changeset 86491 in vbox for trunk

Timestamp:

Oct 8, 2020 10:09:52 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140802

Message:

USB: Mask out USB remote wake capability by default to avoid devices going unresponsive (see bugref:9839).

File:

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

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

@@ -1082 +1082 @@
         AssertRCReturn(rc, rc);
 
+    bool fEditRemoteWake;
+    rc = CFGMR3QueryBool(pCfg, "EditRemoteWake", &fEditRemoteWake);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        rc = CFGMR3QueryBool(pCfgGlobalDev, "EditRemoteWake", &fEditRemoteWake);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        fEditRemoteWake = true;    /* NB: On by default! */
+    else
+        AssertRCReturn(rc, rc);
+
     /*
      * If we're masking interfaces, edit the descriptors.
@@ -1181 +1190 @@
                     }
                 }
+        }
+    }
+
+    /*
+     * Disable remote wakeup capability, see @bugref{9839}. This is done on 
+     * a device/configuration level, no need to dig too deep through the descriptors. 
+     * On most backends, we can't perform a real selective suspend, and more importantly 
+     * can't receive a remote wake notification. If a guest suspends the device and waits 
+     * for a remote wake, the device is effectively dead.
+     */
+    if (fEditRemoteWake)
+    {
+        PVUSBDESCCONFIGEX paCfgs = pThis->paCfgDescs;
+        for (unsigned iCfg = 0; iCfg < pThis->DevDesc.bNumConfigurations; iCfg++)
+        {
+            Log(("usb-proxy: pProxyDev=%s configuration %d with bmAttr=%02X\n",
+                 pUsbIns->pszName, paCfgs[iCfg].Core.bmAttributes, iCfg));
+                 paCfgs[iCfg].Core.bmAttributes = paCfgs[iCfg].Core.bmAttributes & ~RT_BIT(5); /* Remote wakeup. */
+            fEdited = true;
+            LogRel(("VUSB: Disabled '%s' remote wakeup for configuration %d\n", pUsbIns->pszName, iCfg));
         }
     }