usb: gadget: dummy_hcd: fix IRQs-disabled violation in dummy_timer()
PATCH 1/1 usb: gadget: dummy_hcd: fix IRQs-disabled violation in dummy_timer()
dummy_timer() acquires dum->lock using spin_lock_irqsave(), which disables local IRQs. Before invoking URB/request completion callbacks it drops the lock with plain spin_unlock(), which releases the spinlock but leaves IRQs disabled. The completion handlers (and any code they call) then execute with IRQs disabled.
This is illegal for any completion handler that uses spin_unlock_bh() or any other operation that requires IRQs to be enabled. In this case the call chain is:
dummy_timer [spin_lock_irqsave]
spin_unlock <- IRQs still disabled
usb_hcd_giveback_urb
carl9170_usb_rx_irq_complete
carl9170_tx_process_status
carl9170_get_queued_skb
spin_unlock_bh
__local_bh_enable_ip
lockdep_assert_irqs_enabled <- WARNFix this by replacing spin_unlock() with spin_unlock_irqrestore() before usb_hcd_giveback_urb(), so that IRQs are properly re-enabled before invoking callbacks and re-disabled after they return.
Function usb_gadget_giveback_request() calls fifo_complete() which does nothing, so just focus on this issue.
--- drivers/usb/gadget/udc/dummy_hcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/gadget/udc/dummy_hcd.c +2 -2
@@ -2001,9 +2001,9 @@ static enum hrtimer_restart dummy_timer(struct hrtimer *t) ep->already_seen = ep->setup_stage =0 ;usb_hcd_unlink_urb_from_ep (dummy_hcd_to_hcd (dum_hcd), urb); -spin_unlock (&dum->lock); +spin_unlock_irqrestore (&dum->lock, flags);usb_hcd_giveback_urb (dummy_hcd_to_hcd (dum_hcd), urb, status); -spin_lock (&dum->lock); +spin_lock_irqsave (&dum->lock, flags); goto restart; }
Signature · 1 line
2.37.3
Quoted 24 lines · Jiangong.Han
dummy_timer()acquiresdum->lockusingspin_lock_irqsave(), which disables local IRQs. Before invoking URB/request completion callbacks it drops the lock with plainspin_unlock(), which releases the spinlock but leaves IRQs disabled. The completion handlers (and any code they call) then execute with IRQs disabled.This is illegal for any completion handler that uses
spin_unlock_bh()or any other operation that requires IRQs to be enabled. In this case the call chain is:
dummy_timer[spin_lock_irqsave]spin_unlock <- IRQs still disabled usb_hcd_giveback_urb carl9170_usb_rx_irq_complete carl9170_tx_process_status carl9170_get_queued_skb spin_unlock_bh __local_bh_enable_ip lockdep_assert_irqs_enabled <- WARNFix this by replacing
spin_unlock()withspin_unlock_irqrestore()beforeusb_hcd_giveback_urb(), so that IRQs are properly re-enabled before invoking callbacks and re-disabled after they return.
Quoted 8 lines
Function
usb_gadget_giveback_request()callsfifo_complete()which does nothing, so just focus on this issue.Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Reported-by [email protected]Signed-off-by Jiangong.Han <[email protected]>---
This is not the right way to solve the problem observed in carl9170. It is documented that usb_hcd_giveback_urb() runs in atomic context, and drivers' completion handlers should not expect to be called with interrupts enabled. The problem lies in carl9170_get_queued_skb(); that's where it needs to be fixed.
Alan Stern
Quoted 5 lines · Alan Stern
This is not the right way to solve the problem observed in carl9170. It is documented that
usb_hcd_giveback_urb()runs in atomic context, and drivers' completion handlers should not expect to be called with interrupts enabled. The problem lies incarl9170_get_queued_skb(); that's where it needs to be fixed.
I guess we don't see this that often because the widely used HCDs have HCD_BH set.
I sort of think that we already did have this conversation about having unlock+lock with irq and not skipping it. But yes, while this would solve the problem _here_ we would still have the same warning on OHCI.
Take a look at other drivers in drivers/net/usb/, they delay their doing to napi/ workqueue/ tasklet.
Quoted 1 line
Alan Stern
Sebastian