xhci fixes for usb-linus
Subsystems (3)
cover xhci fixes for usb-linus
Hi Greg
A couple small xhci fixes for usb-linus 7.2-rc. Fix one memory leak, and one sleep in atomic during free.
Thanks
Mathias
Xu Rao (1):
xhci: sideband: fix ring sg table pages leak
胡连勤 (1):
usb: xhci: Fix sleep in atomic context in xhci_free_streams()
drivers/usb/host/xhci-sideband.c | 2 ++ drivers/usb/host/xhci.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-)
Signature · 1 line
2.43.0
PATCH 1/2 xhci: sideband: fix ring sg table pages leak
From: Xu Rao <[email protected]>
xhci_ring_to_sgtable() allocates a temporary pages array and uses it to build the returned sg_table with sg_alloc_table_from_pages().
The error paths free the pages array, but the success path returns the sg_table without freeing it. This leaks the temporary array every time a sideband client gets an endpoint or event ring buffer.
Free the pages array after sg_alloc_table_from_pages() succeeds. The returned sg_table has its own scatterlist entries and does not depend on the temporary array after construction.
--- drivers/usb/host/xhci-sideband.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/host/xhci-sideband.c +2 -0
@@ -58,6 +58,8 @@ xhci_ring_to_sgtable(struct xhci_sideband *sb, struct xhci_ring *ring)if (sg_alloc_table_from_pages (sgt, pages, n_pages,0 , sz,GFP_KERNEL )) goto err; +kvfree (pages); +/* * Save first segment dma address to sg dma_address field for the sideband * client to have access to the IOVA of the ring.
Signature · 1 line
2.43.0
PATCH 2/2 usb: xhci: Fix sleep in atomic context in xhci_free_streams()
In reply to Mathias NymanFrom: 胡连勤 <[email protected]>
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.
--- drivers/usb/host/xhci.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/usb/host/xhci.c +10 -1
@@ -3785,6 +3785,7 @@ static int xhci_free_streams(struct usb_hcd *hcd, struct usb_device *udev,struct xhci_virt_device *vdev;struct xhci_command *command;struct xhci_input_control_ctx *ctrl_ctx; +struct xhci_stream_info *stream_info[EP_CTX_PER_DEV ];unsigned int ep_index;unsigned long flags;u32 changed_ep_bitmask;
@@ -3845,10 +3846,15 @@ static int xhci_free_streams(struct usb_hcd *hcd, struct usb_device *udev,if (ret <0 )return ret; +/* +* dma_free_coherent() called by xhci_free_stream_info() may sleep, +* so save stream_info pointers and clear references under lock, +* then free the memory outside lock. +*/ spin_lock_irqsave (&xhci->lock, flags);for (i =0 ; i < num_eps; i++) { ep_index =xhci_get_endpoint_index (&eps[i]->desc); -xhci_free_stream_info (xhci, vdev->eps[ep_index].stream_info); + stream_info[i] = vdev->eps[ep_index].stream_info; vdev->eps[ep_index].stream_info =NULL ;/* FIXME Unset maxPstreams in endpoint context and * update deq ptr to point to normal string ring.
@@ -3858,6 +3864,9 @@ static int xhci_free_streams(struct usb_hcd *hcd, struct usb_device *udev, }spin_unlock_irqrestore (&xhci->lock, flags); +for (i =0 ; i < num_eps; i++) +xhci_free_stream_info (xhci, stream_info[i]); +return 0 ; }
Signature · 1 line
2.43.0