Skip to content

Commit 1e45aa7

Browse files
LianqinHugregkh
authored andcommitted
usb: xhci: Fix sleep in atomic context in xhci_free_streams()
commit 42c37c4 upstream. When a USB device with active stream endpoints is disconnected, xhci_free_streams() is called from the hub_event workqueue to free the stream resources. It calls xhci_free_stream_info() while holding xhci->lock with irqs disabled. xhci_free_stream_info() invokes xhci_free_stream_ctx(), which calls dma_free_coherent() for large stream context arrays. dma_free_coherent() can sleep (e.g. via vunmap), triggering a BUG when called from atomic context. Call trace: dma_free_attrs+0x174/0x220 xhci_free_stream_info+0xd0/0x11c xhci_free_streams+0x278/0x37c usb_free_streams+0x98/0xc0 usb_unbind_interface+0x1b8/0x2f8 device_release_driver_internal+0x1d4/0x2cc device_release_driver+0x18/0x28 bus_remove_device+0x160/0x1a4 device_del+0x1ec/0x350 usb_disable_device+0x98/0x214 usb_disconnect+0xf0/0x35c hub_event+0xab4/0x19ec process_one_work+0x278/0x63c Fix this by saving the stream_info pointers and clearing the ep references under the lock, then calling xhci_free_stream_info() outside the lock where sleeping is allowed. Fixes: 8df75f4 ("USB: xhci: Add memory allocation for USB3 bulk streams.") Cc: stable <stable@kernel.org> Signed-off-by: Lianqin Hu <hulianqin@vivo.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://patch.msgid.link/20260703144033.483286-3-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 48aeda9 commit 1e45aa7

1 file changed

Lines changed: 10 additions & 1 deletion

File tree

drivers/usb/host/xhci.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3723,6 +3723,7 @@ static int xhci_free_streams(struct usb_hcd *hcd, struct usb_device *udev,
37233723
struct xhci_virt_device *vdev;
37243724
struct xhci_command *command;
37253725
struct xhci_input_control_ctx *ctrl_ctx;
3726+
struct xhci_stream_info *stream_info[EP_CTX_PER_DEV];
37263727
unsigned int ep_index;
37273728
unsigned long flags;
37283729
u32 changed_ep_bitmask;
@@ -3783,10 +3784,15 @@ static int xhci_free_streams(struct usb_hcd *hcd, struct usb_device *udev,
37833784
if (ret < 0)
37843785
return ret;
37853786

3787+
/*
3788+
* dma_free_coherent() called by xhci_free_stream_info() may sleep,
3789+
* so save stream_info pointers and clear references under lock,
3790+
* then free the memory outside lock.
3791+
*/
37863792
spin_lock_irqsave(&xhci->lock, flags);
37873793
for (i = 0; i < num_eps; i++) {
37883794
ep_index = xhci_get_endpoint_index(&eps[i]->desc);
3789-
xhci_free_stream_info(xhci, vdev->eps[ep_index].stream_info);
3795+
stream_info[i] = vdev->eps[ep_index].stream_info;
37903796
vdev->eps[ep_index].stream_info = NULL;
37913797
/* FIXME Unset maxPstreams in endpoint context and
37923798
* update deq ptr to point to normal string ring.
@@ -3796,6 +3802,9 @@ static int xhci_free_streams(struct usb_hcd *hcd, struct usb_device *udev,
37963802
}
37973803
spin_unlock_irqrestore(&xhci->lock, flags);
37983804

3805+
for (i = 0; i < num_eps; i++)
3806+
xhci_free_stream_info(xhci, stream_info[i]);
3807+
37993808
return 0;
38003809
}
38013810

0 commit comments

Comments
 (0)