Changeset 55078 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB

Timestamp:

Apr 1, 2015 2:50:42 PM (10 years ago)

Author:

vboxsync

Message:

5.0.0 Beta 1 (and backed out r99347 as it might have caused a regression)

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win

Files:

• cmn/VBoxDrvTool.cpp (modified) (1 diff)
• dev/VBoxUsbDev.h (modified) (1 diff)
• dev/VBoxUsbPnP.cpp (modified) (2 diffs)
• dev/VBoxUsbPwr.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxUSB/win/cmn/VBoxDrvTool.cpp

@@ -188 +188 @@
     Interval.QuadPart = -(int64_t) 2 /* ms */ * 10000;
     uint32_t cRefs;
-    size_t loops = 0; 
-    KTIMER kTimer;
-    NTSTATUS status = STATUS_SUCCESS;
-
-    KeInitializeTimer(&kTimer);
-    
-    while ((cRefs = ASMAtomicReadU32(&pRef->cRefs)) > u32Val && loops < 256)
+
+    while ((cRefs = ASMAtomicReadU32(&pRef->cRefs)) != u32Val)
     {
         Assert(cRefs >= u32Val);
         Assert(cRefs < UINT32_MAX/2);
 
-        KeSetTimer(&kTimer, Interval, NULL);
-        status = KeWaitForSingleObject(&kTimer, Executive, KernelMode, false, NULL);
-        Assert(NT_SUCCESS(status));
-        loops++;
+        KeDelayExecutionThread(KernelMode, FALSE, &Interval);
     }
 }

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h

@@ -190 +190 @@
 }
 
+static DECLHIDDEN(VOID) vboxUsbDdiStateWaitOtherCompleted(PVBOXUSBDEV_EXT pDevExt)
+{
+    /* Earlier we assumed that 1 request will be pending while we service
+       Device Power IRP which was leading to host hang when USB is connected
+       to VM.
+       With debugging found that at the point when host goes to sleep
+       state and USB is connected to VM,  two Power IRP requests are pending :
+       One for SYSTEM and other for DEVICE.
+    */
+    VBoxDrvToolRefWaitEqual(&pDevExt->DdiState.Ref, 3);
+}
+
 #endif /* #ifndef ___VBoxUsbDev_h___ */

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPnP.cpp

@@ -70 +70 @@
     ENMVBOXUSB_PNPSTATE enmState = vboxUsbPnPStateGet(pDevExt);
     NTSTATUS Status = STATUS_SUCCESS;
-   
-    IoCopyCurrentIrpStackLocationToNext(pIrp);
-    Status = VBoxDrvToolIoPostSync(pDevExt->pLowerDO, pIrp);
-    if (NT_SUCCESS(Status) && enmState == ENMVBOXUSB_PNPSTATE_STOP_PENDING)
-    {
-        vboxUsbPnPStateRestore(pDevExt);
-    }
-   
-    Status = STATUS_SUCCESS;
+    if (enmState == ENMVBOXUSB_PNPSTATE_STOP_PENDING)
+    {
+        IoCopyCurrentIrpStackLocationToNext(pIrp);
+        Status = VBoxDrvToolIoPostSync(pDevExt->pLowerDO, pIrp);
+        if (NT_SUCCESS(Status))
+        {
+            vboxUsbPnPStateRestore(pDevExt);
+        }
+    }
+    else
+    {
+        Assert(0);
+        Assert(enmState == ENMVBOXUSB_PNPSTATE_STARTED);
+    }
+
     VBoxDrvToolIoComplete(pIrp, Status, 0);
     vboxUsbDdiStateRelease(pDevExt);
@@ -138 +144 @@
     ENMVBOXUSB_PNPSTATE enmState = vboxUsbPnPStateGet(pDevExt);
     NTSTATUS Status = STATUS_SUCCESS;
-    IoCopyCurrentIrpStackLocationToNext(pIrp);
-    
-    Status = VBoxDrvToolIoPostSync(pDevExt->pLowerDO, pIrp);
-
-    if (NT_SUCCESS(Status) &&
-        enmState == ENMVBOXUSB_PNPSTATE_REMOVE_PENDING)
-    {
-        vboxUsbPnPStateRestore(pDevExt);
-    }
-    
-    Status = STATUS_SUCCESS;
+    if (enmState == ENMVBOXUSB_PNPSTATE_REMOVE_PENDING)
+    {
+        IoCopyCurrentIrpStackLocationToNext(pIrp);
+        Status = VBoxDrvToolIoPostSync(pDevExt->pLowerDO, pIrp);
+        if (NT_SUCCESS(Status))
+        {
+            vboxUsbPnPStateRestore(pDevExt);
+        }
+    }
+    else
+    {
+        Assert(0);
+        Assert(enmState == ENMVBOXUSB_PNPSTATE_STARTED);
+    }
+
     VBoxDrvToolIoComplete(pIrp, Status, 0);
     vboxUsbDdiStateRelease(pDevExt);

trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbPwr.cpp

@@ -210 +210 @@
     PIRP pIrp = pCtx->pIrp;
 
+    vboxUsbDdiStateWaitOtherCompleted(pDevExt);
+
     vboxUsbPwrIoPostDev(pDevExt, pIrp);