Changeset 39354 in vbox for trunk/src/VBox

Timestamp:

Nov 17, 2011 5:03:18 PM (13 years ago)

Author:

vboxsync

Message:

Solaris/VBoxUSB: locking fixes.

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c (modified) (10 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c

@@ -298 +298 @@
 LOCAL void vboxUSBSolarisDestroyEndPoint(vboxusb_state_t *pState, vboxusb_ep_t *pEp);
 LOCAL void vboxUSBSolarisCloseAllPipes(vboxusb_state_t *pState, bool fControlPipe);
-LOCAL void vboxUSBSolarisCloseInterface(vboxusb_state_t *pState, uint8_t bInterface);
 LOCAL int vboxUSBSolarisOpenPipe(vboxusb_state_t *pState, vboxusb_ep_t *pEp);
 LOCAL void vboxUSBSolarisClosePipe(vboxusb_state_t *pState, vboxusb_ep_t *pEp);
@@ -328 +327 @@
 LOCAL int vboxUSBSolarisCloseDevice(vboxusb_state_t *pState, VBOXUSB_RESET_LEVEL enmReset);
 LOCAL int vboxUSBSolarisAbortPipe(vboxusb_state_t *pState, uint8_t bEndpoint);
-LOCAL bool vboxUSBSolarisIsAnyPipeOpen(vboxusb_state_t *pState);
 LOCAL int vboxUSBSolarisGetConfigIndex(vboxusb_state_t *pState, uint_t uCfgValue);
 
@@ -703 +701 @@
              */
             vboxUSBSolarisCloseAllPipes(pState, true /* ControlPipe */);
+            pState->fClosed = true;
 
             /*
@@ -1723 +1722 @@
             if (RT_FAILURE(rc))
             {
-                freemsg(pUrb->pMsg);
+                mutex_enter(&pState->Mtx);
+                if (pUrb->pMsg)
+                {
+                    freemsg(pUrb->pMsg);
+                    pUrb->pMsg = NULL;
+                }
 
                 if (   pUrb->enmType == VUSBXFERTYPE_ISOC
@@ -1736 +1740 @@
                     pUrb->enmState = VBOXUSB_URB_STATE_FREE;
                 }
+                mutex_exit(&pState->Mtx);
             }
         }
@@ -2591 +2596 @@
 
 /**
- * Closes all pipes for a given interface.
- *
- * @param   pState          The USB device instance.
- * @param   bInterface      The Interface.
- */
-LOCAL void vboxUSBSolarisCloseInterface(vboxusb_state_t *pState, uint8_t bInterface)
-{
-    LogFunc((DEVICE_NAME ":vboxUSBSolarisCloseInterface pState=%p bInterface=%#x\n", pState, bInterface));
-
-    for (int i = 1; i < VBOXUSB_MAX_ENDPOINTS; i++)
-    {
-        vboxusb_ep_t *pEp = &pState->aEps[i];
-        if (   pEp
-            && pEp->pPipe
-            && pEp->uInterface == bInterface)
-        {
-            Log((DEVICE_NAME ":vboxUSBSolarisCloseInterface closing[%d]\n", i));
-            vboxUSBSolarisClosePipe(pState, pEp);
-        }
-    }
-}
-
-
-/**
  * Open the pipe for an Endpoint.
  *
@@ -2747 +2728 @@
 
     Assert(pEp->pPipe == NULL);
-}
-
-
-/**
- * Check if any non-default Endpoints are open.
- *
- * @param   pState          The USB device instance.
- *
- * @returns Returns true if any non-default Endpoint is open, otherwise false.
- */
-LOCAL bool vboxUSBSolarisIsAnyPipeOpen(vboxusb_state_t *pState)
-{
-    LogFunc((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p\n", pState));
-
-    for (int i = 1; i < VBOXUSB_MAX_ENDPOINTS; i++)
-    {
-        vboxusb_ep_t *pEp = &pState->aEps[i];
-        if (pEp->pPipe)
-        {
-            Log((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p pEp=%p returns true.\n", pState, pEp));
-            return true;
-        }
-    }
-
-    Log((DEVICE_NAME ":vboxUSBSolarisIsAnyPipeOpen pState=%p returns false.\n", pState));
-    return false;
 }
 
@@ -2879 +2834 @@
             && pUrb->enmState != VBOXUSB_URB_STATE_FREE))
     {
-        mutex_exit(&pState->Mtx);
         pUrb = RTMemAllocZ(sizeof(vboxusb_urb_t));
         if (RT_UNLIKELY(!pUrb))
         {
+            mutex_exit(&pState->Mtx);
             LogRel((DEVICE_NAME ":vboxUSBSolarisQueueURB failed to alloc %d bytes.\n", sizeof(vboxusb_urb_t)));
             return NULL;
         }
-        mutex_enter(&pState->Mtx);
     }
     else
@@ -2901 +2855 @@
 
     pUrb->enmState = VBOXUSB_URB_STATE_INFLIGHT;
-
-    mutex_exit(&pState->Mtx);
 
     Assert(pUrb->pMsg == NULL);
@@ -2926 +2878 @@
         pUrb->pMsg = pMsg;
     }
+
+    mutex_exit(&pState->Mtx);
 
     return pUrb;