| Message ID | 20180416122930.15697-2-felipe.balbi@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 16.04.2018 15:29, Felipe Balbi wrote: > Instead of allocating urb priv and, maybe, bail out due to xhci being > in DYING state, we can move the check earlier and avoid the memory > allocation altogether. This also moves checking for DYING outside the lock. Most cases set DYING with lock held, so if we first get the lock before checking DYING we have a better chance of not being in the process of dying. Small thing, but so is this cleanup, so not sure its worth the change -Mathias > > While at that, also remove an unnecessary empty line. > > Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> > --- > drivers/usb/host/xhci.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c > index 65c454b94165..39e67b7bece1 100644 > --- a/drivers/usb/host/xhci.c > +++ b/drivers/usb/host/xhci.c > @@ -1299,6 +1299,12 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag > true, true, __func__) <= 0) > return -EINVAL; > > + if (xhci->xhc_state & XHCI_STATE_DYING) { > + xhci_dbg(xhci, "Ep 0x%x: URB %p submitted for non-responsive xHCI host.\n", > + urb->ep->desc.bEndpointAddress, urb); > + return -ESHUTDOWN; > + } > + > slot_id = urb->dev->slot_id; > ep_index = xhci_get_endpoint_index(&urb->ep->desc); > ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state; > @@ -1347,12 +1353,6 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag > > spin_lock_irqsave(&xhci->lock, flags); > > - if (xhci->xhc_state & XHCI_STATE_DYING) { > - xhci_dbg(xhci, "Ep 0x%x: URB %p submitted for non-responsive xHCI host.\n", > - urb->ep->desc.bEndpointAddress, urb); > - ret = -ESHUTDOWN; > - goto free_priv; > - } > if (*ep_state & EP_SOFT_CLEAR_TOGGLE) { > xhci_warn(xhci, "Can't enqueue URB while manually clearing toggle\n"); > ret = -EINVAL; > @@ -1360,7 +1360,6 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag > } > > switch (usb_endpoint_type(&urb->ep->desc)) { > - > case USB_ENDPOINT_XFER_CONTROL: > ret = xhci_queue_ctrl_tx(xhci, GFP_ATOMIC, urb, > slot_id, ep_index); > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, Mathias Nyman <mathias.nyman@linux.intel.com> writes: > On 16.04.2018 15:29, Felipe Balbi wrote: >> Instead of allocating urb priv and, maybe, bail out due to xhci being >> in DYING state, we can move the check earlier and avoid the memory >> allocation altogether. > > This also moves checking for DYING outside the lock. > > Most cases set DYING with lock held, so if we first get the lock before > checking DYING we have a better chance of not being in the process of dying. pretty sure that's atomic, though. > Small thing, but so is this cleanup, so not sure its worth the change Look at the result. With this change we don't need to take a lock, allocate memory, search for endpoint index, search for endpoint state. All of those are needed for proper operation of the function, but if the controller has already died, there's no point in going any further.
On 17.04.2018 10:07, Felipe Balbi wrote: > > Hi, > > Mathias Nyman <mathias.nyman@linux.intel.com> writes: >> On 16.04.2018 15:29, Felipe Balbi wrote: >>> Instead of allocating urb priv and, maybe, bail out due to xhci being >>> in DYING state, we can move the check earlier and avoid the memory >>> allocation altogether. >> >> This also moves checking for DYING outside the lock. >> >> Most cases set DYING with lock held, so if we first get the lock before >> checking DYING we have a better chance of not being in the process of dying. > > pretty sure that's atomic, though. That's not what I'm after, your fix is cleaning up code in the case where DYING flag is set before xhci_urb_enqueue() is called. I'm worried about the case when setting DYING flag races with xhci_urb_enqueue(). i.e. xhci_urb_enqueue() is spinning on the lock, waiting, while some other part of the driver is desperately trying to access hw with lock held, failing, finally setting DYING flag, and then releasing lock. If the check is done before taking the lock then the URB might be queued on dying device, at a time when xhci_hc_died already started cancelling and giving back all queued URB > >> Small thing, but so is this cleanup, so not sure its worth the change > > Look at the result. With this change we don't need to take a lock, > allocate memory, search for endpoint index, search for endpoint > state. All of those are needed for proper operation of the function, but > if the controller has already died, there's no point in going any > further. But we might miss the fact that host died, and go even further, adding URB to list, writing TRBs to ringbuffers etc. In code we save one line, goto: free_priv -Mathias -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, Mathias Nyman <mathias.nyman@linux.intel.com> writes: > On 17.04.2018 10:07, Felipe Balbi wrote: >> >> Hi, >> >> Mathias Nyman <mathias.nyman@linux.intel.com> writes: >>> On 16.04.2018 15:29, Felipe Balbi wrote: >>>> Instead of allocating urb priv and, maybe, bail out due to xhci being >>>> in DYING state, we can move the check earlier and avoid the memory >>>> allocation altogether. >>> >>> This also moves checking for DYING outside the lock. >>> >>> Most cases set DYING with lock held, so if we first get the lock before >>> checking DYING we have a better chance of not being in the process of dying. >> >> pretty sure that's atomic, though. > > That's not what I'm after, your fix is cleaning up code in the case where DYING flag is > set before xhci_urb_enqueue() is called. I'm worried about the case when setting DYING flag races > with xhci_urb_enqueue(). i.e. xhci_urb_enqueue() is spinning on the lock, waiting, while > some other part of the driver is desperately trying to access hw with lock held, failing, > finally setting DYING flag, and then releasing lock. > > If the check is done before taking the lock then the URB might be queued on dying device, > at a time when xhci_hc_died already started cancelling and giving back all queued URB this can only happen if checking that bit isn't an atomic operation which, AFAICT, it is. IOW, it would be the same if you were to change: if (a & b) return -1; to: if (test_bit(b, &a)) return -1; right? Now, if this isn't an atomic operation, I'm happy to be educated. >>> Small thing, but so is this cleanup, so not sure its worth the change >> >> Look at the result. With this change we don't need to take a lock, >> allocate memory, search for endpoint index, search for endpoint >> state. All of those are needed for proper operation of the function, but >> if the controller has already died, there's no point in going any >> further. > > But we might miss the fact that host died, and go even further, adding URB to list, > writing TRBs to ringbuffers etc. > > In code we save one line, > goto: free_priv We're saving a lot more than that, actually. All of the following ends up being skipped. All of these are unnecessary work when xHC has already died: 8<------------------------------------------------------------------------ slot_id = urb->dev->slot_id; ep_index = xhci_get_endpoint_index(&urb->ep->desc); ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state; if (!HCD_HW_ACCESSIBLE(hcd)) { if (!in_interrupt()) xhci_dbg(xhci, "urb submitted during PCI suspend\n"); return -ESHUTDOWN; } if (usb_endpoint_xfer_isoc(&urb->ep->desc)) num_tds = urb->number_of_packets; else if (usb_endpoint_is_bulk_out(&urb->ep->desc) && urb->transfer_buffer_length > 0 && urb->transfer_flags & URB_ZERO_PACKET && !(urb->transfer_buffer_length % usb_endpoint_maxp(&urb->ep->desc))) num_tds = 2; else num_tds = 1; urb_priv = kzalloc(sizeof(struct urb_priv) + num_tds * sizeof(struct xhci_td), mem_flags); if (!urb_priv) return -ENOMEM; urb_priv->num_tds = num_tds; urb_priv->num_tds_done = 0; urb->hcpriv = urb_priv; trace_xhci_urb_enqueue(urb); if (usb_endpoint_xfer_control(&urb->ep->desc)) { /* Check to see if the max packet size for the default control * endpoint changed during FS device enumeration */ if (urb->dev->speed == USB_SPEED_FULL) { ret = xhci_check_maxpacket(xhci, slot_id, ep_index, urb); if (ret < 0) { xhci_urb_free_priv(urb_priv); urb->hcpriv = NULL; return ret; } } } spin_lock_irqsave(&xhci->lock, flags); 8<------------------------------------------------------------------------
On 02.05.2018 14:46, Felipe Balbi wrote: > > Hi, > > Mathias Nyman <mathias.nyman@linux.intel.com> writes: >> On 17.04.2018 10:07, Felipe Balbi wrote: >>> >>> Hi, >>> >>> Mathias Nyman <mathias.nyman@linux.intel.com> writes: >>>> On 16.04.2018 15:29, Felipe Balbi wrote: >>>>> Instead of allocating urb priv and, maybe, bail out due to xhci being >>>>> in DYING state, we can move the check earlier and avoid the memory >>>>> allocation altogether. >>>> >>>> This also moves checking for DYING outside the lock. >>>> >>>> Most cases set DYING with lock held, so if we first get the lock before >>>> checking DYING we have a better chance of not being in the process of dying. >>> >>> pretty sure that's atomic, though. >> >> That's not what I'm after, your fix is cleaning up code in the case where DYING flag is >> set before xhci_urb_enqueue() is called. I'm worried about the case when setting DYING flag races >> with xhci_urb_enqueue(). i.e. xhci_urb_enqueue() is spinning on the lock, waiting, while >> some other part of the driver is desperately trying to access hw with lock held, failing, >> finally setting DYING flag, and then releasing lock. >> >> If the check is done before taking the lock then the URB might be queued on dying device, >> at a time when xhci_hc_died already started cancelling and giving back all queued URB > > this can only happen if checking that bit isn't an atomic operation > which, AFAICT, it is. IOW, it would be the same if you were to change: > > if (a & b) > return -1; > > to: > > if (test_bit(b, &a)) > return -1; > > right? Now, if this isn't an atomic operation, I'm happy to be educated. Again, it's not about being atomic. As an example lets take the get port status request racing with queueing a URB. After this patch the following is possible: CPU:0 CPU:1 get port status queue URB xhci_hub_control() xhci_queue_urb() spin_lock(lock), got it XHCI_STATE_DYING? no, continue temp = readl(port_array[wIndex]) spin_lock(lock), already taken, spin here if (temp == ~(u32)0) { xhci_hc_died(xhci) xhc_state |= XHCI_STATE_DYING cleanup_command_queue() kill_endpoint_urbs() spin_unlock(lock) // at URB giveback spin_lock(lock) got it, finally allocate urb_priv, plus other stuff xhci_queue_*_tx() count_trbs_needed(urb) prepare_transfer() queue_trb() // for each trb So its more likely we end up queuing URBs on a dead host, a host that the driver already started tearing down, freeing URBs. xhci_hub_control() was just one example, you can replace it with almost any function that calls xhci_hc_died() > >>>> Small thing, but so is this cleanup, so not sure its worth the change >>> >>> Look at the result. With this change we don't need to take a lock, >>> allocate memory, search for endpoint index, search for endpoint >>> state. All of those are needed for proper operation of the function, but >>> if the controller has already died, there's no point in going any >>> further. >> >> But we might miss the fact that host died, and go even further, adding URB to list, >> writing TRBs to ringbuffers etc. >> >> In code we save one line, >> goto: free_priv > > We're saving a lot more than that, actually. All of the following ends > up being skipped. All of these are unnecessary work when xHC has already > died: In lines of code in the driver it's just one line. In extra code being run it's a gamble. Before the patch we ran the below code, after the patch it's either nothing, or the below code plus all the URB/TRB queuing code. > > 8<------------------------------------------------------------------------ > > slot_id = urb->dev->slot_id; > ep_index = xhci_get_endpoint_index(&urb->ep->desc); > ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state; > > if (!HCD_HW_ACCESSIBLE(hcd)) { > if (!in_interrupt()) > xhci_dbg(xhci, "urb submitted during PCI suspend\n"); > return -ESHUTDOWN; > } > > if (usb_endpoint_xfer_isoc(&urb->ep->desc)) > num_tds = urb->number_of_packets; > else if (usb_endpoint_is_bulk_out(&urb->ep->desc) && > urb->transfer_buffer_length > 0 && > urb->transfer_flags & URB_ZERO_PACKET && > !(urb->transfer_buffer_length % usb_endpoint_maxp(&urb->ep->desc))) > num_tds = 2; > else > num_tds = 1; > > urb_priv = kzalloc(sizeof(struct urb_priv) + > num_tds * sizeof(struct xhci_td), mem_flags); > if (!urb_priv) > return -ENOMEM; > > urb_priv->num_tds = num_tds; > urb_priv->num_tds_done = 0; > urb->hcpriv = urb_priv; > > trace_xhci_urb_enqueue(urb); > > if (usb_endpoint_xfer_control(&urb->ep->desc)) { > /* Check to see if the max packet size for the default control > * endpoint changed during FS device enumeration > */ > if (urb->dev->speed == USB_SPEED_FULL) { > ret = xhci_check_maxpacket(xhci, slot_id, > ep_index, urb); > if (ret < 0) { > xhci_urb_free_priv(urb_priv); > urb->hcpriv = NULL; > return ret; > } > } > } > > spin_lock_irqsave(&xhci->lock, flags); > > 8<------------------------------------------------------------------------ > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2 May 2018, Felipe Balbi wrote: > >> Look at the result. With this change we don't need to take a lock, > >> allocate memory, search for endpoint index, search for endpoint > >> state. All of those are needed for proper operation of the function, but > >> if the controller has already died, there's no point in going any > >> further. > > > > But we might miss the fact that host died, and go even further, adding URB to list, > > writing TRBs to ringbuffers etc. > > > > In code we save one line, > > goto: free_priv > > We're saving a lot more than that, actually. All of the following ends > up being skipped. All of these are unnecessary work when xHC has already > died: > > 8<------------------------------------------------------------------------ > > slot_id = urb->dev->slot_id; > ep_index = xhci_get_endpoint_index(&urb->ep->desc); > ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state; > > if (!HCD_HW_ACCESSIBLE(hcd)) { > if (!in_interrupt()) > xhci_dbg(xhci, "urb submitted during PCI suspend\n"); > return -ESHUTDOWN; > } > > if (usb_endpoint_xfer_isoc(&urb->ep->desc)) > num_tds = urb->number_of_packets; > else if (usb_endpoint_is_bulk_out(&urb->ep->desc) && > urb->transfer_buffer_length > 0 && > urb->transfer_flags & URB_ZERO_PACKET && > !(urb->transfer_buffer_length % usb_endpoint_maxp(&urb->ep->desc))) > num_tds = 2; > else > num_tds = 1; > > urb_priv = kzalloc(sizeof(struct urb_priv) + > num_tds * sizeof(struct xhci_td), mem_flags); > if (!urb_priv) > return -ENOMEM; > > urb_priv->num_tds = num_tds; > urb_priv->num_tds_done = 0; > urb->hcpriv = urb_priv; > > trace_xhci_urb_enqueue(urb); > > if (usb_endpoint_xfer_control(&urb->ep->desc)) { > /* Check to see if the max packet size for the default control > * endpoint changed during FS device enumeration > */ > if (urb->dev->speed == USB_SPEED_FULL) { > ret = xhci_check_maxpacket(xhci, slot_id, > ep_index, urb); > if (ret < 0) { > xhci_urb_free_priv(urb_priv); > urb->hcpriv = NULL; > return ret; > } > } > } > > spin_lock_irqsave(&xhci->lock, flags); > > 8<------------------------------------------------------------------------ Regardless, how often does it happen that an xHCI host controller dies? A few times a day for every xHCI controller in the world seems like a gross overestimate. But even if it isn't, who cares if we end up executing the code above a few extra times per day? It's the "almost never used" path. :-) Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 65c454b94165..39e67b7bece1 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1299,6 +1299,12 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag true, true, __func__) <= 0) return -EINVAL; + if (xhci->xhc_state & XHCI_STATE_DYING) { + xhci_dbg(xhci, "Ep 0x%x: URB %p submitted for non-responsive xHCI host.\n", + urb->ep->desc.bEndpointAddress, urb); + return -ESHUTDOWN; + } + slot_id = urb->dev->slot_id; ep_index = xhci_get_endpoint_index(&urb->ep->desc); ep_state = &xhci->devs[slot_id]->eps[ep_index].ep_state; @@ -1347,12 +1353,6 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag spin_lock_irqsave(&xhci->lock, flags); - if (xhci->xhc_state & XHCI_STATE_DYING) { - xhci_dbg(xhci, "Ep 0x%x: URB %p submitted for non-responsive xHCI host.\n", - urb->ep->desc.bEndpointAddress, urb); - ret = -ESHUTDOWN; - goto free_priv; - } if (*ep_state & EP_SOFT_CLEAR_TOGGLE) { xhci_warn(xhci, "Can't enqueue URB while manually clearing toggle\n"); ret = -EINVAL; @@ -1360,7 +1360,6 @@ static int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flag } switch (usb_endpoint_type(&urb->ep->desc)) { - case USB_ENDPOINT_XFER_CONTROL: ret = xhci_queue_ctrl_tx(xhci, GFP_ATOMIC, urb, slot_id, ep_index);
Instead of allocating urb priv and, maybe, bail out due to xhci being in DYING state, we can move the check earlier and avoid the memory allocation altogether. While at that, also remove an unnecessary empty line. Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> --- drivers/usb/host/xhci.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)