Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1608392
| From | Mathias Nyman <mathias.nyman@linux.intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [RFT PATCH] xhci: Manually give back cancelled URBs if queuing for cancel fails |
| Date | 2017-03-24 14:20 +0100 |
| Message-ID | <toxih-239-5@gated-at.bofh.it> (permalink) |
| References | <toez0-5me-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Manually give back URB if we are not able to add it to cancel queue and
stop the endpoint normally.
This can happen if device just reset before URB timed out and dequeued,
leading to missing endpoint ring.
This caused a hang on Dell Inspiron 5558/0VNM2T at resume from suspend
as urb was never returned.
[ 245.270505] INFO: task rtsx_usb_ms_1:254 blocked for more than 120 seconds.
[ 245.272244] Tainted: G W 4.11.0-rc3-ARCH #2
[ 245.273983] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
[ 245.275737] rtsx_usb_ms_1 D 0 254 2 0x00000000
[ 245.277524] Call Trace:
[ 245.279278] __schedule+0x2d3/0x8a0
[ 245.281077] schedule+0x3d/0x90
[ 245.281961] usb_kill_urb.part.3+0x6c/0xa0 [usbcore]
[ 245.282861] ? wake_atomic_t_function+0x60/0x60
[ 245.283760] usb_kill_urb+0x21/0x30 [usbcore]
[ 245.284649] usb_start_wait_urb+0xe5/0x170 [usbcore]
[ 245.285541] ? try_to_del_timer_sync+0x53/0x80
[ 245.286434] usb_bulk_msg+0xbd/0x160 [usbcore]
[ 245.287326] rtsx_usb_send_cmd+0x63/0x90 [rtsx_usb]
Reported-by: diego.viola@gmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
---
drivers/usb/host/xhci.c | 43 +++++++++++++++++++++++++------------------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 50aee8b..953fd8f 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1477,6 +1477,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
struct xhci_ring *ep_ring;
struct xhci_virt_ep *ep;
struct xhci_command *command;
+ struct xhci_virt_device *vdev;
xhci = hcd_to_xhci(hcd);
spin_lock_irqsave(&xhci->lock, flags);
@@ -1485,15 +1486,27 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
/* Make sure the URB hasn't completed or been unlinked already */
ret = usb_hcd_check_unlink_urb(hcd, urb, status);
- if (ret || !urb->hcpriv)
+ if (ret)
goto done;
+
+ /* give back URB now if we can't queue it for cancel */
+ vdev = xhci->devs[urb->dev->slot_id];
+ urb_priv = urb->hcpriv;
+ if (!vdev || !urb_priv)
+ goto err_giveback;
+
+ ep_index = xhci_get_endpoint_index(&urb->ep->desc);
+ ep = &vdev->eps[ep_index];
+ ep_ring = xhci_urb_to_transfer_ring(xhci, urb);
+ if (!ep || !ep_ring)
+ goto err_giveback;
+
temp = readl(&xhci->op_regs->status);
if (temp == 0xffffffff || (xhci->xhc_state & XHCI_STATE_HALTED)) {
xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
"HW died, freeing TD.");
- urb_priv = urb->hcpriv;
for (i = urb_priv->num_tds_done;
- i < urb_priv->num_tds && xhci->devs[urb->dev->slot_id];
+ i < urb_priv->num_tds;
i++) {
td = &urb_priv->td[i];
if (!list_empty(&td->td_list))
@@ -1501,23 +1514,9 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
if (!list_empty(&td->cancelled_td_list))
list_del_init(&td->cancelled_td_list);
}
-
- usb_hcd_unlink_urb_from_ep(hcd, urb);
- spin_unlock_irqrestore(&xhci->lock, flags);
- usb_hcd_giveback_urb(hcd, urb, -ESHUTDOWN);
- xhci_urb_free_priv(urb_priv);
- return ret;
+ goto err_giveback;
}
- ep_index = xhci_get_endpoint_index(&urb->ep->desc);
- ep = &xhci->devs[urb->dev->slot_id]->eps[ep_index];
- ep_ring = xhci_urb_to_transfer_ring(xhci, urb);
- if (!ep_ring) {
- ret = -EINVAL;
- goto done;
- }
-
- urb_priv = urb->hcpriv;
i = urb_priv->num_tds_done;
if (i < urb_priv->num_tds)
xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
@@ -1554,6 +1553,14 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
done:
spin_unlock_irqrestore(&xhci->lock, flags);
return ret;
+
+err_giveback:
+ if (urb_priv)
+ xhci_urb_free_priv(urb_priv);
+ usb_hcd_unlink_urb_from_ep(hcd, urb);
+ spin_unlock_irqrestore(&xhci->lock, flags);
+ usb_hcd_giveback_urb(hcd, urb, -ESHUTDOWN);
+ return ret;
}
/* Drop an endpoint from a new bandwidth configuration for this device.
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Alan Stern <stern@rowland.harvard.edu> - 2017-03-17 17:30 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-17 18:00 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-17 21:20 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-19 22:40 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Mathias Nyman <mathias.nyman@linux.intel.com> - 2017-03-20 15:30 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-20 16:50 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Mathias Nyman <mathias.nyman@linux.intel.com> - 2017-03-20 17:40 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-20 19:30 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-21 00:20 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-21 14:10 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-21 16:40 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-22 00:00 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Mathias Nyman <mathias.nyman@linux.intel.com> - 2017-03-22 18:50 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Mathias Nyman <mathias.nyman@linux.intel.com> - 2017-03-23 18:10 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-23 18:20 +0100
[RFT PATCH] xhci: Manually give back cancelled URBs if queuing for cancel fails Mathias Nyman <mathias.nyman@linux.intel.com> - 2017-03-24 14:20 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Diego Viola <diego.viola@gmail.com> - 2017-03-24 17:30 +0100
Re: Dell Inspiron 5558/0VNM2T hangs at resume from suspend when USB 3 is enabled Mathias Nyman <mathias.nyman@intel.com> - 2017-03-27 09:10 +0200
csiph-web