usb: dwc3: gadget: fix IRQ storm on invalid event buffer count
Subsystems (3)
PATCH 1/1 usb: dwc3: gadget: fix IRQ storm on invalid event buffer count
When dwc3_check_event_buf() reads a GEVNTCOUNT value exceeding the event buffer length, commit 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length") returns IRQ_NONE without writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in dwc3_event_buffers_setup(), and schedule a soft disconnect via softcon_work to recover the controller state.
--- drivers/usb/dwc3/core.h | 2 ++ drivers/usb/dwc3/gadget.c | 23 ++++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-)
drivers/usb/dwc3/core.h +2 -0
@@ -1004,6 +1004,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @softcon_work: workqueue used for soft connect/disconnect recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests
@@ -1189,6 +1190,7 @@ struct dwc3_glue_ops {*/ struct dwc3 {struct work_struct drd_work; +struct work_struct softcon_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;
drivers/usb/dwc3/gadget.c +22 -1
@@ -4669,7 +4669,18 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)if (count > evt->length) {dev_err_ratelimited (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , count, evt->length); -return IRQ_NONE ; +/* +* The DWC3 interrupt is level-triggered. Returning IRQ_NONE +* without clearing the IRQ source leaves the line asserted, +* causing a tight IRQ storm that triggers spurious.c:184 BUG. +* Write the bogus count back to GEVNTCOUNT to clear the source, +* consistent with the stale event clearing in +* dwc3_event_buffers_setup(), then schedule a soft disconnect +* to recover the controller state. +*/ +dwc3_writel (dwc->regs,DWC3_GEVNTCOUNT (0 ), count); +schedule_work (&dwc->softcon_work); +return IRQ_HANDLED ; } evt->count = count;
@@ -4729,6 +4740,14 @@ static void dwc_gadget_release(struct device *dev)kfree (gadget); } +static void dwc3_softcon_work (struct work_struct *work) +{ + struct dwc3 *dwc = container_of(work, struct dwc3, softcon_work); + +dev_err (dwc->dev,"event buffer error: performing soft disconnect\n" ); +dwc3_gadget_soft_disconnect (dwc); +} +/** * dwc3_gadget_init - initializes gadget related registers * @dwc: pointer to our controller context structure
@@ -4772,6 +4791,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) }init_completion (&dwc->ep0_in_setup); +INIT_WORK (&dwc->softcon_work, dwc3_softcon_work); dwc->gadget = kzalloc_obj(struct usb_gadget);if (!dwc->gadget) { ret = -ENOMEM ;
@@ -4868,6 +4888,7 @@ void dwc3_gadget_exit(struct dwc3 *dwc)if (!dwc->gadget)return ; +cancel_work_sync (&dwc->softcon_work);dwc3_enable_susphy (dwc, true);usb_del_gadget (dwc->gadget);dwc3_gadget_free_endpoints (dwc);
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v2 1/1 usb: dwc3: gadget: fix IRQ storm on invalid event buffer count
From: Jiazi Liu <[email protected]>
When dwc3_check_event_buf() reads a GEVNTCOUNT value exceeding the event buffer length, commit 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length") returns IRQ_NONE without writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.
The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184
To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <DWC3_BASE + 0xc40c> 4 0x1004
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.
exceed event buffer length")
---
Changes in v2:
- Rename softcon_work to err_recovery_work
- Use dev_err instead of dev_err_ratelimited
- Update comment to document driver/controller out-of-sync fatal error condition rather than describing IRQ storm behavior
- Remove dev_err from work handler; error message belongs at the call site where the specific failure is known
- Follow dwc3_gadget_suspend/resume logic in recovery work handler
- Add err_dying state to reject gadget driver requests during recovery
- Add err_recovery_count counter and stop scheduling recovery after DWC3_ERR_RECOVERY_MAX attempts to prevent infinite retry loops
- Add synchronize_irq() before soft_disconnect to ensure IRQ handler has completed before reinitializing the controller
- Define DWC3_ERR_RECOVERY_MAX in core.h alongside other global constants
- Fix sparse warning: use dwc as first argument to dwc3_writel, not dwc->regs
--- drivers/usb/dwc3/core.h | 7 +++++++ drivers/usb/dwc3/gadget.c | 41 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.h +7 -0
@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096
@@ -1004,6 +1005,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests
@@ -1171,6 +1173,7 @@ struct dwc3_glue_ops {* @wakeup_configured: set if the device is configured for remote wakeup. * @suspended: set to track suspend event due to U3/L2. * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY +* @err_dying: true when controller is in error recovery, reject all requests * before PM suspend. * @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable.
@@ -1186,9 +1189,11 @@ struct dwc3_glue_ops {* @wakeup_pending_funcs: Indicates whether any interface has requested for * function wakeup in bitmap format where bit position * represents interface_id. +* @err_recovery_count: number of consecutive error recovery attempts */ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;
@@ -1420,6 +1425,7 @@ struct dwc3 { unsigned wakeup_configured:1; unsigned suspended:1; unsigned susphy_state:1; + unsigned err_dying:1;u16 imod_interval;
@@ -1429,6 +1435,7 @@ struct dwc3 {struct dentry *debug_root;u32 gsbuscfg0_reqinfo;u32 wakeup_pending_funcs; +u32 err_recovery_count; };#define INCRX_BURST_MODE 0
drivers/usb/dwc3/gadget.c +39 -2
72 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
Quoted 2 lines · Jiazi Liu
From: Jiazi Liu <[email protected]>
[...]
Quoted 26 lines
--- drivers/usb/dwc3/core.h | 7 +++++++ drivers/usb/dwc3/gadget.c | 41 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)drivers/usb/dwc3/core.h +2
-0@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096@@ -1004,6 +1005,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests
drivers/usb/dwc3/core.h struct dwc3_glue_ops { · line 1177
Quoted 5 lines
drivers/usb/dwc3/core.h +1
-0@@ -1171,6 +1173,7 @@ struct dwc3_glue_ops {* @wakeup_configured: set if the device is configured for remote wakeup. * @suspended: set to track suspend event due to U3/L2. * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY +* @err_dying: true when controller is in error recovery, reject all requests * before PM suspend.
How about gadget_dying or gadget_died (similar to hc_died in xhci). The variable "err_dyring"is misleading.
Quoted 35 lines
drivers/usb/dwc3/core.h +4
-0* @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable. @@ -1186,9 +1189,11 @@ struct dwc3_glue_ops {* @wakeup_pending_funcs: Indicates whether any interface has requested for * function wakeup in bitmap format where bit position * represents interface_id. +* @err_recovery_count: number of consecutive error recovery attempts */ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;@@ -1420,6 +1425,7 @@ struct dwc3 { unsigned wakeup_configured:1; unsigned suspended:1; unsigned susphy_state:1; + unsigned err_dying:1;u16 imod_interval;@@ -1429,6 +1435,7 @@ struct dwc3 {struct dentry *debug_root;u32 gsbuscfg0_reqinfo;u32 wakeup_pending_funcs; +u32 err_recovery_count; };#define INCRX_BURST_MODE 0drivers/usb/dwc3/gadget.c +0
-0
drivers/usb/dwc3/gadget.c static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request, · line 2059
Quoted 6 lines
drivers/usb/dwc3/gadget.c +3
-0@@ -2054,6 +2054,9 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,int ret; +if (dwc->err_dying) +return -ESHUTDOWN ; +
Not sure but should this check be added for all gadget_ops ?
Regards,
Krishna,
Thinh Nguyen
maintainerHi,
Sorry for the delay response.
Quoted 24 lines · Jiazi Liu
From: Jiazi Liu <[email protected]>
When
dwc3_check_event_buf()reads a GEVNTCOUNT value exceeding the event buffer length, commit63ccd26cd1f6("usb: dwc3: gadget: check that event count does not exceed event buffer length") returnsIRQ_NONEwithout writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <
DWC3_BASE+0xc40c> 40x1004
Quoted 7 lines
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in
dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.Fixes 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does notexceed event buffer length")
Fixes tag should be single line.
Quoted 2 lines
Signed-off-by Jiazi Liu <[email protected]>
Your email from Signed-off-by is mismatching your From: line above.
Quoted 62 lines
---
Changes in v2:
- Renamesoftcon_worktoerr_recovery_work
- Usedev_errinstead ofdev_err_ratelimited
- Update comment to document driver/controller out-of-sync fatal error condition rather than describing IRQ storm behavior
- Removedev_errfrom work handler; error message belongs at the call site where the specific failure is known
- Follow dwc3_gadget_suspend/resume logic in recovery work handler
- Adderr_dyingstate to reject gadget driver requests during recovery
- Adderr_recovery_countcounter and stop scheduling recovery afterDWC3_ERR_RECOVERY_MAXattempts to prevent infinite retry loops
- Addsynchronize_irq()beforesoft_disconnectto ensure IRQ handler has completed before reinitializing the controller
- DefineDWC3_ERR_RECOVERY_MAXincore.halongside other global constants
- Fix sparse warning: use dwc as first argument todwc3_writel, notdwc->regs--- drivers/usb/dwc3/core.h | 7 +++++++ drivers/usb/dwc3/gadget.c | 41 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)drivers/usb/dwc3/core.h +5
-0@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096@@ -1004,6 +1005,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests @@ -1171,6 +1173,7 @@ struct dwc3_glue_ops {* @wakeup_configured: set if the device is configured for remote wakeup. * @suspended: set to track suspend event due to U3/L2. * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY +* @err_dying: true when controller is in error recovery, reject all requests * before PM suspend. * @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable. @@ -1186,9 +1189,11 @@ struct dwc3_glue_ops {* @wakeup_pending_funcs: Indicates whether any interface has requested for * function wakeup in bitmap format where bit position * represents interface_id. +* @err_recovery_count: number of consecutive error recovery attempts */ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;
drivers/usb/dwc3/core.h struct dwc3 { · line 1428
Quoted 4 lines
drivers/usb/dwc3/core.h +1
-0@@ -1420,6 +1425,7 @@ struct dwc3 { unsigned wakeup_configured:1; unsigned suspended:1; unsigned susphy_state:1; + unsigned err_dying:1;
Can we change this to enum dwc3_err_state err_state where
enum dwc3_err_state {
DWC3_ERR_NONE = 0,
DWC3_ERR_RECOVERY,
DWC3_ERR_UNRECOVERABLE,
};Then we can set err_state to DWC3_ERR_RECOVERY before scheduling the recovery work, and set it to DWC3_ERR_NONE when the recovery work is done. If we hit the max number of retries, we can set it to DWC3_ERR_UNRECOVERABLE. This will make it clearer what state the controller is in.
Quoted 16 lines
drivers/usb/dwc3/core.h +1
-0u16 imod_interval;@@ -1429,6 +1435,7 @@ struct dwc3 {struct dentry *debug_root;u32 gsbuscfg0_reqinfo;u32 wakeup_pending_funcs; +u32 err_recovery_count; };#define INCRX_BURST_MODE 0drivers/usb/dwc3/gadget.c +0
-0
drivers/usb/dwc3/gadget.c static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request, · line 2059
Quoted 6 lines
drivers/usb/dwc3/gadget.c +3
-0@@ -2054,6 +2054,9 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,int ret; +if (dwc->err_dying) +return -ESHUTDOWN ; +
As Krishna brought up, may need to double check, but I think all the gadget and ep ops need to be guarded.
Quoted 12 lines
drivers/usb/dwc3/gadget.c +2
-2spin_lock_irqsave (&dwc->lock, flags); ret =__dwc3_gadget_ep_queue (dep, req);spin_unlock_irqrestore (&dwc->lock, flags);@@ -4667,9 +4670,22 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)return IRQ_NONE ;if (count > evt->length) { -dev_err_ratelimited (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , +dev_err (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , count, evt->length); -return IRQ_NONE ; +/*
drivers/usb/dwc3/gadget.c static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt) · line 4685
Quoted 10 lines
drivers/usb/dwc3/gadget.c +10
-0+* This is a fatal error - the driver and controller are out of +* sync on which event has been consumed. Reinitializing the +* controller is required to recover. Write the bogus count back +* to GEVNTCOUNT to clear the IRQ source, consistent with the +* stale event clearing in dwc3_event_buffers_setup(), then +* schedule error recovery. +*/ +dwc3_writel (dwc,DWC3_GEVNTCOUNT (0 ), count); + dwc->err_dying = true; + dwc->err_recovery_count++;
This increment should be done in dwc3_err_recovery_work(). Reset the count to 0 after err_state transition to DWC3_ERR_NONE and on reset event interrupt.
drivers/usb/dwc3/gadget.c static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt) · line 4686
Quoted 1 line
drivers/usb/dwc3/gadget.c +1
-0+if (dwc->err_recovery_count <=DWC3_ERR_RECOVERY_MAX )
The dwc->err_recovery_count check here should be checked in the dwc3_err_recovery_work, to check whether to perform soft connect or not. Set the err_state to unrecoverable and print a dev_err() if soft_connect or soft_disconnect fails or if recovery count exceeds the max.
Quoted 6 lines
drivers/usb/dwc3/gadget.c +2
-0+schedule_work (&dwc->err_recovery_work); +return IRQ_HANDLED ; } evt->count = count;
drivers/usb/dwc3/gadget.c static void dwc_gadget_release(struct device *dev) · line 4753
Quoted 9 lines
drivers/usb/dwc3/gadget.c +6
-0@@ -4729,6 +4745,25 @@ static void dwc_gadget_release(struct device *dev)kfree (gadget); } +static void dwc3_err_recovery_work (struct work_struct *work) +{ + struct dwc3 *dwc = container_of(work, struct dwc3, err_recovery_work); +int ret; + +synchronize_irq (dwc->irq_gadget);
I think we should use disable_irq_nosync() before soft_disconnect and re-enabling it after soft_connect succeeds. Leave it disabled if DWC3_ERR_RECOVERY_MAX is reached or soft_connect fails or is skipped.
Quoted 35 lines
drivers/usb/dwc3/gadget.c +15
-0+ + ret =dwc3_gadget_soft_disconnect (dwc); +if (ret) +return ; + +dwc3_disconnect_gadget_sleepable (dwc); + + dwc->err_dying = false; + +if (dwc->softconnect) +dwc3_gadget_soft_connect (dwc); +} +/** * dwc3_gadget_init - initializes gadget related registers * @dwc: pointer to our controller context structure @@ -4772,6 +4807,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) }init_completion (&dwc->ep0_in_setup); +INIT_WORK (&dwc->err_recovery_work, dwc3_err_recovery_work); dwc->gadget = kzalloc_obj(struct usb_gadget);if (!dwc->gadget) { ret = -ENOMEM ;@@ -4868,6 +4904,7 @@ void dwc3_gadget_exit(struct dwc3 *dwc)if (!dwc->gadget)return ; +cancel_work_sync (&dwc->err_recovery_work);dwc3_enable_susphy (dwc, true);usb_del_gadget (dwc->gadget);dwc3_gadget_free_endpoints (dwc);Signature · 1 line
2.50.1 (Apple Git-155)
Thanks,
Thinh
Hi @[email protected] , Krishna,
Thanks for the detailed review.
For the gadget ops protection, I propose adding the check only in dwc3_gadget_ep_queue.
This covers two scenarios:
1. The window between error detection and soft_disconnect completing.
2. After soft_disconnect, existing checks on connected/pullups_connected/endpoint.desc naturally block all ops. This is also consistent with how other gadget handles it.
Brs
Jiazi
Quoted 244 lines · Thinh Nguyen <[email protected]> 于2026年8月28日周五 10:36写道:
Hi,
Sorry for the delay response.
Quoted 24 lines · Jiazi Liu
From: Jiazi Liu <[email protected]>
When
dwc3_check_event_buf()reads a GEVNTCOUNT value exceeding the event buffer length, commit63ccd26cd1f6("usb: dwc3: gadget: check that event count does not exceed event buffer length") returnsIRQ_NONEwithout writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <
DWC3_BASE+0xc40c> 40x1004Quoted 7 lines
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in
dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.Fixes 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does notexceed event buffer length")
Fixes tag should be single line.
Quoted 2 lines
Signed-off-by Jiazi Liu <[email protected]>Your email from Signed-off-by is mismatching your From: line above.
Quoted 62 lines
---
Changes in v2:
- Renamesoftcon_worktoerr_recovery_work
- Usedev_errinstead ofdev_err_ratelimited
- Update comment to document driver/controller out-of-sync fatal error condition rather than describing IRQ storm behavior
- Removedev_errfrom work handler; error message belongs at the call site where the specific failure is known
- Follow dwc3_gadget_suspend/resume logic in recovery work handler
- Adderr_dyingstate to reject gadget driver requests during recovery
- Adderr_recovery_countcounter and stop scheduling recovery afterDWC3_ERR_RECOVERY_MAXattempts to prevent infinite retry loops
- Addsynchronize_irq()beforesoft_disconnectto ensure IRQ handler has completed before reinitializing the controller
- DefineDWC3_ERR_RECOVERY_MAXincore.halongside other global constants
- Fix sparse warning: use dwc as first argument todwc3_writel, notdwc->regs--- drivers/usb/dwc3/core.h | 7 +++++++ drivers/usb/dwc3/gadget.c | 41 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)drivers/usb/dwc3/core.h +5
-0@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096@@ -1004,6 +1005,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests @@ -1171,6 +1173,7 @@ struct dwc3_glue_ops {* @wakeup_configured: set if the device is configured for remote wakeup. * @suspended: set to track suspend event due to U3/L2. * @susphy_state: state of DWC3_GUSB2PHYCFG_SUSPHY + DWC3_GUSB3PIPECTL_SUSPHY +* @err_dying: true when controller is in error recovery, reject all requests * before PM suspend. * @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable. @@ -1186,9 +1189,11 @@ struct dwc3_glue_ops {* @wakeup_pending_funcs: Indicates whether any interface has requested for * function wakeup in bitmap format where bit position * represents interface_id. +* @err_recovery_count: number of consecutive error recovery attempts */ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;drivers/usb/dwc3/core.h struct dwc3 { · line 1428
Quoted 4 lines
drivers/usb/dwc3/core.h +1
-0@@ -1420,6 +1425,7 @@ struct dwc3 { unsigned wakeup_configured:1; unsigned suspended:1; unsigned susphy_state:1; + unsigned err_dying:1;Can we change this to enum
dwc3_err_stateerr_statewhereenum dwc3_err_state { DWC3_ERR_NONE = 0, DWC3_ERR_RECOVERY, DWC3_ERR_UNRECOVERABLE, };Then we can set
err_statetoDWC3_ERR_RECOVERYbefore scheduling the recovery work, and set it toDWC3_ERR_NONEwhen the recovery work is done. If we hit the max number of retries, we can set it toDWC3_ERR_UNRECOVERABLE. This will make it clearer what state the controller is in.Quoted 16 lines
drivers/usb/dwc3/core.h +1
-0u16 imod_interval;@@ -1429,6 +1435,7 @@ struct dwc3 {struct dentry *debug_root;u32 gsbuscfg0_reqinfo;u32 wakeup_pending_funcs; +u32 err_recovery_count; };#define INCRX_BURST_MODE 0drivers/usb/dwc3/gadget.c +0
-0drivers/usb/dwc3/gadget.c static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request, · line 2059
Quoted 6 lines
drivers/usb/dwc3/gadget.c +3
-0@@ -2054,6 +2054,9 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,int ret; +if (dwc->err_dying) +return -ESHUTDOWN ; +As Krishna brought up, may need to double check, but I think all the gadget and ep ops need to be guarded.
Quoted 12 lines
drivers/usb/dwc3/gadget.c +2
-2spin_lock_irqsave (&dwc->lock, flags); ret =__dwc3_gadget_ep_queue (dep, req);spin_unlock_irqrestore (&dwc->lock, flags);@@ -4667,9 +4670,22 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)return IRQ_NONE ;if (count > evt->length) { -dev_err_ratelimited (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , +dev_err (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , count, evt->length); -return IRQ_NONE ; +/* drivers/usb/dwc3/gadget.c static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt) · line 4685
Quoted 10 lines
drivers/usb/dwc3/gadget.c +10
-0+* This is a fatal error - the driver and controller are out of +* sync on which event has been consumed. Reinitializing the +* controller is required to recover. Write the bogus count back +* to GEVNTCOUNT to clear the IRQ source, consistent with the +* stale event clearing in dwc3_event_buffers_setup(), then +* schedule error recovery. +*/ +dwc3_writel (dwc,DWC3_GEVNTCOUNT (0 ), count); + dwc->err_dying = true; + dwc->err_recovery_count++;This increment should be done in
dwc3_err_recovery_work(). Reset the count to 0 aftererr_statetransition toDWC3_ERR_NONEand on reset event interrupt.drivers/usb/dwc3/gadget.c static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt) · line 4686
Quoted 1 line
drivers/usb/dwc3/gadget.c +1
-0+if (dwc->err_recovery_count <=DWC3_ERR_RECOVERY_MAX )The
dwc->err_recovery_countcheck here should be checked in thedwc3_err_recovery_work, to check whether to perform soft connect or not. Set theerr_stateto unrecoverable and print adev_err()ifsoft_connectorsoft_disconnectfails or if recovery count exceeds the max.Quoted 6 lines
drivers/usb/dwc3/gadget.c +2
-0+schedule_work (&dwc->err_recovery_work); +return IRQ_HANDLED ; } evt->count = count;drivers/usb/dwc3/gadget.c static void dwc_gadget_release(struct device *dev) · line 4753
Quoted 9 lines
drivers/usb/dwc3/gadget.c +6
-0@@ -4729,6 +4745,25 @@ static void dwc_gadget_release(struct device *dev)kfree (gadget); } +static void dwc3_err_recovery_work (struct work_struct *work) +{ + struct dwc3 *dwc = container_of(work, struct dwc3, err_recovery_work); +int ret; + +synchronize_irq (dwc->irq_gadget);I think we should use
disable_irq_nosync()beforesoft_disconnectand re-enabling it aftersoft_connectsucceeds. Leave it disabled ifDWC3_ERR_RECOVERY_MAXis reached orsoft_connectfails or is skipped.Quoted 33 lines
drivers/usb/dwc3/gadget.c +15
-1+ + ret =dwc3_gadget_soft_disconnect (dwc); +if (ret) +return ; + +dwc3_disconnect_gadget_sleepable (dwc); + + dwc->err_dying = false; + +if (dwc->softconnect) +dwc3_gadget_soft_connect (dwc); +} +/** * dwc3_gadget_init - initializes gadget related registers * @dwc: pointer to our controller context structure @@ -4772,6 +4807,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) }init_completion (&dwc->ep0_in_setup); +INIT_WORK (&dwc->err_recovery_work, dwc3_err_recovery_work); dwc->gadget = kzalloc_obj(struct usb_gadget);if (!dwc->gadget) { ret = -ENOMEM ;@@ -4868,6 +4904,7 @@ void dwc3_gadget_exit(struct dwc3 *dwc)if (!dwc->gadget)return ; +cancel_work_sync (&dwc->err_recovery_work);dwc3_enable_susphy (dwc, true);usb_del_gadget (dwc->gadget);dwc3_gadget_free_endpoints (dwc); --Quoted 2 lines
2.50.1 (Apple Git-155)
Thanks,
Thinh
Thinh Nguyen
maintainerHi Liu,
Quoted 11 lines · Liu Jiazi
Hi @[email protected] , Krishna,
Thanks for the detailed review.
For the gadget ops protection, I propose adding the check only indwc3_gadget_ep_queue.
This covers two scenarios:
1. The window between error detection andsoft_disconnectcompleting.
2. Aftersoft_disconnect, existing checks on connected/pullups_connected/endpoint.desc naturally block all ops. This is also consistent with how other gadget handles it.
Looking at the change more closely, especially the gadget_ops and ep_ops. We need to consider the followings:
1) We need a mutex to prevent a race against dwc3_gadget_pullup()
2) ep_enable, ep_queue, ep_set_halt/wedge, wakeup, and function_wakeup need to be guarded. The other ones are for cleanup and should be left alone.
3) We shouldn't use disable_irq_nosync() as suggested previously because we need the event interrupt to drain the GEVENTCOUNT to allow the controller to halt after clearing the DCTL.RUN_STOP bit. But we should move the synchronize_irq() before the soft_connect.
Can you try the change below (not tested).
Thanks,
Thinh
drivers/usb/dwc3/core.h +19 -0
@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096
@@ -841,6 +842,12 @@ enum dwc3_link_state { DWC3_LINK_STATE_MASK = 0x0f, }; +enum dwc3_err_state { +DWC3_ERR_NONE =0 , +DWC3_ERR_RECOVERY , +DWC3_ERR_UNRECOVERABLE , +}; +/* TRB Length, PCM and Status */ #define DWC3_TRB_SIZE_MASK (0x00ffffff)#define DWC3_TRB_SIZE_LENGTH (n) ((n) & DWC3_TRB_SIZE_MASK)
@@ -1004,6 +1011,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests
@@ -1013,6 +1021,7 @@ struct dwc3_glue_ops {* @ep0_in_setup: one control transfer is completed and enter setup phase * @lock: for synchronizing * @mutex: for mode switching +* @connect_mutex: for the pull-up and err_recovery_work * @dev: pointer to our struct device * @sysdev: pointer to the DMA-capable device * @xhci: pointer to our xHCI child
@@ -1079,6 +1088,9 @@ struct dwc3_glue_ops {* @ep0_next_event: hold the next expected event * @ep0state: state of endpoint zero * @link_state: link state +* @err_state: current error recovery state. +* @err_recovery_count: number of consecutive error recovery attempts until +* confirmed healthy and reset to 0 on reset event. * @speed: device speed (super, high, full, low) * @hwparams: copy of hwparams registers * @regset: debugfs pointer to regdump file
@@ -1189,6 +1201,7 @@ struct dwc3_glue_ops {*/ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;
@@ -1203,6 +1216,9 @@ struct dwc3 {/* mode switching lock */ struct mutex mutex; +/* serializes pull-up run/stop vs error recovery */ +struct mutex connect_mutex; +struct device *dev;struct device *sysdev;
@@ -1332,6 +1348,9 @@ struct dwc3 {enum dwc3_ep0_next ep0_next_event;enum dwc3_ep0_state ep0state;enum dwc3_link_state link_state; +enum dwc3_err_state err_state; + +u32 err_recovery_count;u16 u2sel;u16 u2pel;
drivers/usb/dwc3/ep0.c +9 -0
@@ -200,6 +200,11 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { + ret = -ESHUTDOWN ; + goto out; + } +if (!dep->endpoint.desc || !dwc->pullups_connected || !dwc->connected) {dev_err (dwc->dev,"%s: can't queue to disabled endpoint\n" , dep->name);
@@ -271,6 +276,10 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep0_set_halt (ep, value);spin_unlock_irqrestore (&dwc->lock, flags);
drivers/usb/dwc3/gadget.c +102 -2
187 lines not on this page · raw message
Hi @Thinh Nguyen
Tested on our device with the patch you provided. Trigger the error by writing a bogus value to GEVNTCOUNT and the controller recovers successfully
USB re-enumrates and ADB comes back. No kernel panic observed.
uart print:
[ 1892.781261][ C0] dwc3 b1800000.usb: invalid count(61436) > evt->length(4096) [ 1892.834341][ T6793] dwc3 b1800000.usb: request ffffff81475856c0 was not queued to ep0out [ 1895.042752][ T9114] ffs_data_put(): freeing [ 1896.206669][ T9142] read descriptors [ 1896.207465][ T9142] bcdVersion must be 0x0100, stored in Little Endian order. Userspace driver should be fixed, accepting 0x0001 for compatibility. [ 1896.209638][ T9142] bcdVersion must be 0x0100, stored in Little Endian order. Userspace driver should be fixed, accepting 0x0001 for compatibility. [ 1896.211754][ T9142] read strings [ 1897.244130][ T9123] FFS endpoints ready, proceeding with UDC bind [ 1897.258493][ T9123] bcdVersion must be 0x0100, stored in Little Endian order. Userspace driver should be fixed, accepting 0x0001 for compatibility. [ 1897.260970][ T9123] bcdVersion must be 0x0100, stored in Little
Endian order. Userspace driver should be
fixed, accepting 0x0001 for compatibility.
Brs
Jiazi
Quoted 345 lines · Thinh Nguyen <[email protected]> 于2026年8月29日周六 08:31写道:
Hi Liu,
Quoted 11 lines · Liu Jiazi
Hi @[email protected] , Krishna,
Thanks for the detailed review.
For the gadget ops protection, I propose adding the check only indwc3_gadget_ep_queue.
This covers two scenarios:
1. The window between error detection andsoft_disconnectcompleting.
2. Aftersoft_disconnect, existing checks on connected/pullups_connected/endpoint.desc naturally block all ops. This is also consistent with how other gadget handles it.Looking at the change more closely, especially the
gadget_opsandep_ops. We need to consider the followings:1) We need a mutex to prevent a race against
dwc3_gadget_pullup()
2)ep_enable,ep_queue, ep_set_halt/wedge, wakeup, andfunction_wakeupneed to be guarded. The other ones are for cleanup and should be left alone.
3) We shouldn't usedisable_irq_nosync()as suggested previously because we need the event interrupt to drain the GEVENTCOUNT to allow the controller to halt after clearing the DCTL.RUN_STOP bit. But we should move thesynchronize_irq()before thesoft_connect.Can you try the change below (not tested).
Thanks,
Thinhdrivers/usb/dwc3/core.h +19
-0@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096@@ -841,6 +842,12 @@ enum dwc3_link_state { DWC3_LINK_STATE_MASK = 0x0f, }; +enum dwc3_err_state { +DWC3_ERR_NONE =0 , +DWC3_ERR_RECOVERY , +DWC3_ERR_UNRECOVERABLE , +}; +/* TRB Length, PCM and Status */ #define DWC3_TRB_SIZE_MASK (0x00ffffff)#define DWC3_TRB_SIZE_LENGTH (n) ((n) & DWC3_TRB_SIZE_MASK)@@ -1004,6 +1011,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests @@ -1013,6 +1021,7 @@ struct dwc3_glue_ops {* @ep0_in_setup: one control transfer is completed and enter setup phase * @lock: for synchronizing * @mutex: for mode switching +* @connect_mutex: for the pull-up and err_recovery_work * @dev: pointer to our struct device * @sysdev: pointer to the DMA-capable device * @xhci: pointer to our xHCI child @@ -1079,6 +1088,9 @@ struct dwc3_glue_ops {* @ep0_next_event: hold the next expected event * @ep0state: state of endpoint zero * @link_state: link state +* @err_state: current error recovery state. +* @err_recovery_count: number of consecutive error recovery attempts until +* confirmed healthy and reset to 0 on reset event. * @speed: device speed (super, high, full, low) * @hwparams: copy of hwparams registers * @regset: debugfs pointer to regdump file @@ -1189,6 +1201,7 @@ struct dwc3_glue_ops {*/ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;@@ -1203,6 +1216,9 @@ struct dwc3 {/* mode switching lock */ struct mutex mutex; +/* serializes pull-up run/stop vs error recovery */ +struct mutex connect_mutex; +struct device *dev;struct device *sysdev;@@ -1332,6 +1348,9 @@ struct dwc3 {enum dwc3_ep0_next ep0_next_event;enum dwc3_ep0_state ep0state;enum dwc3_link_state link_state; +enum dwc3_err_state err_state; + +u32 err_recovery_count;u16 u2sel;u16 u2pel;drivers/usb/dwc3/ep0.c +9
-0@@ -200,6 +200,11 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { + ret = -ESHUTDOWN ; + goto out; + } +if (!dep->endpoint.desc || !dwc->pullups_connected || !dwc->connected) {dev_err (dwc->dev,"%s: can't queue to disabled endpoint\n" , dep->name);@@ -271,6 +276,10 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep0_set_halt (ep, value);spin_unlock_irqrestore (&dwc->lock, flags);drivers/usb/dwc3/gadget.c +102
-2@@ -1149,6 +1149,10 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,return 0 ;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep_enable (dep,DWC3_DEPCFG_ACTION_INIT );spin_unlock_irqrestore (&dwc->lock, flags);@@ -2055,6 +2059,10 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep_queue (dep, req);spin_unlock_irqrestore (&dwc->lock, flags);@@ -2287,6 +2295,10 @@ static int dwc3_gadget_ep_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep_set_halt (dep, value, false);spin_unlock_irqrestore (&dwc->lock, flags);@@ -2301,6 +2313,10 @@ static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } dep->flags |=DWC3_EP_WEDGE ;if (dep->number ==0 || dep->number ==1 )@@ -2432,6 +2448,10 @@ static int dwc3_gadget_wakeup(struct usb_gadget *g) }spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + }if (!dwc->gadget->wakeup_armed) {dev_err (dwc->dev,"not armed for remote wakeup\n" );spin_unlock_irqrestore (&dwc->lock, flags);@@ -2459,6 +2479,10 @@ static int dwc3_gadget_func_wakeup(struct usb_gadget *g, int intf_id) }spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + }/* * If the link is in U3, signal for remote wakeup and wait for the * link to transition to U0 before sending device notification. @@ -2828,10 +2852,13 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)synchronize_irq (dwc->irq_gadget); +/* Serialize against dwc3_err_recovery_work() */ +mutex_lock (&dwc->connect_mutex);if (!is_on) ret =dwc3_gadget_soft_disconnect (dwc);else ret =dwc3_gadget_soft_connect (dwc); +mutex_unlock (&dwc->connect_mutex);pm_runtime_put (dwc->dev);@@ -4148,6 +4175,10 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc) dwc->suspended = false; +/* The controller is recovered. */ +if (dwc->err_state ==DWC3_ERR_NONE ) + dwc->err_recovery_count =0 ; +/* * Ideally, dwc3_reset_gadget() would trigger the function * drivers to stop any active transfers through ep disable. @@ -4635,6 +4666,12 @@ static irqreturn_t dwc3_thread_interrupt(int irq, void *_evt)return ret; } +static void dwc3_schedule_err_recovery (struct dwc3 *dwc) +{ + dwc->err_state =DWC3_ERR_RECOVERY ; +schedule_work (&dwc->err_recovery_work); +} +static irqreturn_t dwc3_check_event_buf (struct dwc3_event_buffer *evt) {struct dwc3 *dwc = evt->dwc;@@ -4668,9 +4705,21 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)return IRQ_NONE ;if (count > evt->length) { -dev_err_ratelimited (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , +dev_err (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , count, evt->length); -return IRQ_NONE ; +/* +* This is a fatal error - the driver and controller are out of +* sync on which event has been consumed. Reinitializing the +* controller is required to recover. Write the bogus count back +* to GEVNTCOUNT to clear the IRQ source, consistent with the +* stale event clearing in dwc3_event_buffers_setup(), then +* schedule error recovery. +*/ +spin_lock (&dwc->lock); +dwc3_schedule_err_recovery (dwc); +spin_unlock (&dwc->lock); +dwc3_writel (dwc,DWC3_GEVNTCOUNT (0 ), count); +return IRQ_HANDLED ; } evt->count = count;@@ -4730,6 +4779,53 @@ static void dwc_gadget_release(struct device *dev)kfree (gadget); } +static void dwc3_err_recovery_work (struct work_struct *work) +{ + struct dwc3 *dwc = container_of(work, struct dwc3, err_recovery_work); +unsigned long flags; +int ret; + + dwc->err_recovery_count++; + +/* serializes against dwc3_gadget_pullup() */ +mutex_lock (&dwc->connect_mutex); + + ret =dwc3_gadget_soft_disconnect (dwc); +if (ret) + goto err_unrecoverable; + +dwc3_disconnect_gadget_sleepable (dwc); + +if (dwc->err_recovery_count >DWC3_ERR_RECOVERY_MAX ) + goto err_unrecoverable; + +if (dwc->softconnect) { +/* +* Wait irq to finish before soft_connect resets evt->lpos and +* the event buffer registers to avoid racing with +* dwc3_process_event_buf(). +*/ +synchronize_irq (dwc->irq_gadget); + + ret =dwc3_gadget_soft_connect (dwc); +if (ret) + goto err_unrecoverable; + } +mutex_unlock (&dwc->connect_mutex); + +spin_lock_irqsave (&dwc->lock, flags); + dwc->err_state =DWC3_ERR_NONE ; +spin_unlock_irqrestore (&dwc->lock, flags); +return ; + +err_unrecoverable: +dev_err (dwc->dev,"Unable to recover the controller\n" ); +mutex_unlock (&dwc->connect_mutex); +spin_lock_irqsave (&dwc->lock, flags); + dwc->err_state =DWC3_ERR_UNRECOVERABLE ; +spin_unlock_irqrestore (&dwc->lock, flags); +} +/** * dwc3_gadget_init - initializes gadget related registers * @dwc: pointer to our controller context structure @@ -4773,6 +4869,8 @@ int dwc3_gadget_init(struct dwc3 *dwc) }init_completion (&dwc->ep0_in_setup); +INIT_WORK (&dwc->err_recovery_work, dwc3_err_recovery_work); +mutex_init (&dwc->connect_mutex); dwc->gadget = kzalloc_obj(struct usb_gadget);if (!dwc->gadget) { ret = -ENOMEM ;@@ -4869,6 +4967,8 @@ void dwc3_gadget_exit(struct dwc3 *dwc)if (!dwc->gadget)return ; +cancel_work_sync (&dwc->err_recovery_work); +mutex_destroy (&dwc->connect_mutex);dwc3_enable_susphy (dwc, true);usb_del_gadget (dwc->gadget);dwc3_gadget_free_endpoints (dwc);
Thinh Nguyen
maintainerQuoted 26 lines · Liu Jiazi
Hi @Thinh Nguyen
Tested on our device with the patch you provided. Trigger the error by writing a bogus value to GEVNTCOUNT and the controller recovers successfully
USB re-enumrates and ADB comes back. No kernel panic observed.uart print:
[ 1892.781261][ C0] dwc3 b1800000.usb: invalid count(61436) > evt->length(4096) [ 1892.834341][ T6793] dwc3 b1800000.usb: request ffffff81475856c0 was not queued to ep0out [ 1895.042752][ T9114] ffs_data_put(): freeing [ 1896.206669][ T9142] read descriptors [ 1896.207465][ T9142] bcdVersion must be 0x0100, stored in Little Endian order. Userspace driver should be fixed, accepting 0x0001 for compatibility. [ 1896.209638][ T9142] bcdVersion must be 0x0100, stored in Little Endian order. Userspace driver should be fixed, accepting 0x0001 for compatibility. [ 1896.211754][ T9142] read strings [ 1897.244130][ T9123] FFS endpoints ready, proceeding with UDC bind [ 1897.258493][ T9123] bcdVersion must be 0x0100, stored in Little Endian order. Userspace driver should be fixed, accepting 0x0001 for compatibility. [ 1897.260970][ T9123] bcdVersion must be 0x0100, stored in Little
Quoted 3 lines
Endian order. Userspace driver should be
fixed, accepting0x0001for compatibility.
Thanks for testing and for verifying the fix.
If there are no remaining concerns, could you please submit the patch? Otherwise, let me know if you notice anything else that needs to be addressed.
Thanks,
Thinh
PATCH v3 1/1 usb: dwc3: gadget: fix IRQ storm on invalid event buffer count
In reply to Jiazi LiuFrom: Jiazi Liu <[email protected]>
When dwc3_check_event_buf() reads a GEVNTCOUNT value exceeding the event buffer length, commit 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length") returns IRQ_NONE without writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.
The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184
To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <DWC3_BASE + 0xc40c> 4 0x1004
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.
--- drivers/usb/dwc3/core.h | 19 +++++++ drivers/usb/dwc3/ep0.c | 9 ++++ drivers/usb/dwc3/gadget.c | 104 +++++++++++++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.h +19 -0
@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096
@@ -841,6 +842,12 @@ enum dwc3_link_state { DWC3_LINK_STATE_MASK = 0x0f, }; +enum dwc3_err_state { +DWC3_ERR_NONE =0 , +DWC3_ERR_RECOVERY , +DWC3_ERR_UNRECOVERABLE , +}; +/* TRB Length, PCM and Status */ #define DWC3_TRB_SIZE_MASK (0x00ffffff)#define DWC3_TRB_SIZE_LENGTH (n) ((n) & DWC3_TRB_SIZE_MASK)
@@ -1004,6 +1011,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests
@@ -1013,6 +1021,7 @@ struct dwc3_glue_ops {* @ep0_in_setup: one control transfer is completed and enter setup phase * @lock: for synchronizing * @mutex: for mode switching +* @connect_mutex: for the pull-up and err_recovery_work * @dev: pointer to our struct device * @sysdev: pointer to the DMA-capable device * @xhci: pointer to our xHCI child
@@ -1079,6 +1088,9 @@ struct dwc3_glue_ops {* @ep0_next_event: hold the next expected event * @ep0state: state of endpoint zero * @link_state: link state +* @err_state: current error recovery state. +* @err_recovery_count: number of consecutive error recovery attempts until +* confirmed healthy and reset to 0 on reset event. * @speed: device speed (super, high, full, low) * @hwparams: copy of hwparams registers * @regset: debugfs pointer to regdump file
@@ -1189,6 +1201,7 @@ struct dwc3_glue_ops {*/ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;
@@ -1203,6 +1216,9 @@ struct dwc3 {/* mode switching lock */ struct mutex mutex; +/* serializes pull-up run/stop vs error recovery */ +struct mutex connect_mutex; +struct device *dev;struct device *sysdev;
@@ -1332,6 +1348,9 @@ struct dwc3 {enum dwc3_ep0_next ep0_next_event;enum dwc3_ep0_state ep0state;enum dwc3_link_state link_state; +enum dwc3_err_state err_state; + +u32 err_recovery_count;u16 u2sel;u16 u2pel;
drivers/usb/dwc3/ep0.c +9 -0
@@ -200,6 +200,11 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { + ret = -ESHUTDOWN ; + goto out; + } +if (!dep->endpoint.desc || !dwc->pullups_connected || !dwc->connected) {dev_err (dwc->dev,"%s: can't queue to disabled endpoint\n" , dep->name);
@@ -271,6 +276,10 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep0_set_halt (ep, value);spin_unlock_irqrestore (&dwc->lock, flags);
drivers/usb/dwc3/gadget.c +102 -2
187 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
Thinh Nguyen
maintainerHi,
Quoted 1 line · Jiazi Liu
From: Jiazi Liu <[email protected]>
Can you fix your email to match the From and Signed-off-by tag?
Quoted 23 lines
When
dwc3_check_event_buf()reads a GEVNTCOUNT value exceeding the event buffer length, commit63ccd26cd1f6("usb: dwc3: gadget: check that event count does not exceed event buffer length") returnsIRQ_NONEwithout writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <
DWC3_BASE+0xc40c> 40x1004
Quoted 8 lines
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in
dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.Fixes 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length")Tested-by Jiazi Liu <[email protected]>
Remove Tested-by tag as it should be implied by the Signed-off-by tag.
Quoted 255 lines
Signed-off-by Jiazi Liu <[email protected]>--- drivers/usb/dwc3/core.h | 19 +++++++ drivers/usb/dwc3/ep0.c | 9 ++++ drivers/usb/dwc3/gadget.c | 104 +++++++++++++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 2 deletions(-)drivers/usb/dwc3/core.h +19
-0@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096@@ -841,6 +842,12 @@ enum dwc3_link_state { DWC3_LINK_STATE_MASK = 0x0f, }; +enum dwc3_err_state { +DWC3_ERR_NONE =0 , +DWC3_ERR_RECOVERY , +DWC3_ERR_UNRECOVERABLE , +}; +/* TRB Length, PCM and Status */ #define DWC3_TRB_SIZE_MASK (0x00ffffff)#define DWC3_TRB_SIZE_LENGTH (n) ((n) & DWC3_TRB_SIZE_MASK)@@ -1004,6 +1011,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests @@ -1013,6 +1021,7 @@ struct dwc3_glue_ops {* @ep0_in_setup: one control transfer is completed and enter setup phase * @lock: for synchronizing * @mutex: for mode switching +* @connect_mutex: for the pull-up and err_recovery_work * @dev: pointer to our struct device * @sysdev: pointer to the DMA-capable device * @xhci: pointer to our xHCI child @@ -1079,6 +1088,9 @@ struct dwc3_glue_ops {* @ep0_next_event: hold the next expected event * @ep0state: state of endpoint zero * @link_state: link state +* @err_state: current error recovery state. +* @err_recovery_count: number of consecutive error recovery attempts until +* confirmed healthy and reset to 0 on reset event. * @speed: device speed (super, high, full, low) * @hwparams: copy of hwparams registers * @regset: debugfs pointer to regdump file @@ -1189,6 +1201,7 @@ struct dwc3_glue_ops {*/ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;@@ -1203,6 +1216,9 @@ struct dwc3 {/* mode switching lock */ struct mutex mutex; +/* serializes pull-up run/stop vs error recovery */ +struct mutex connect_mutex; +struct device *dev;struct device *sysdev;@@ -1332,6 +1348,9 @@ struct dwc3 {enum dwc3_ep0_next ep0_next_event;enum dwc3_ep0_state ep0state;enum dwc3_link_state link_state; +enum dwc3_err_state err_state; + +u32 err_recovery_count;u16 u2sel;u16 u2pel;drivers/usb/dwc3/ep0.c +9
-0@@ -200,6 +200,11 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { + ret = -ESHUTDOWN ; + goto out; + } +if (!dep->endpoint.desc || !dwc->pullups_connected || !dwc->connected) {dev_err (dwc->dev,"%s: can't queue to disabled endpoint\n" , dep->name);@@ -271,6 +276,10 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep0_set_halt (ep, value);spin_unlock_irqrestore (&dwc->lock, flags);drivers/usb/dwc3/gadget.c +57
-2@@ -1149,6 +1149,10 @@ static int dwc3_gadget_ep_enable(struct usb_ep *ep,return 0 ;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep_enable (dep,DWC3_DEPCFG_ACTION_INIT );spin_unlock_irqrestore (&dwc->lock, flags);@@ -2055,6 +2059,10 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep_queue (dep, req);spin_unlock_irqrestore (&dwc->lock, flags);@@ -2287,6 +2295,10 @@ static int dwc3_gadget_ep_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep_set_halt (dep, value, false);spin_unlock_irqrestore (&dwc->lock, flags);@@ -2301,6 +2313,10 @@ static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } dep->flags |=DWC3_EP_WEDGE ;if (dep->number ==0 || dep->number ==1 )@@ -2432,6 +2448,10 @@ static int dwc3_gadget_wakeup(struct usb_gadget *g) }spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + }if (!dwc->gadget->wakeup_armed) {dev_err (dwc->dev,"not armed for remote wakeup\n" );spin_unlock_irqrestore (&dwc->lock, flags);@@ -2459,6 +2479,10 @@ static int dwc3_gadget_func_wakeup(struct usb_gadget *g, int intf_id) }spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + }/* * If the link is in U3, signal for remote wakeup and wait for the * link to transition to U0 before sending device notification. @@ -2828,10 +2852,13 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)synchronize_irq (dwc->irq_gadget); +/* Serialize against dwc3_err_recovery_work() */ +mutex_lock (&dwc->connect_mutex);if (!is_on) ret =dwc3_gadget_soft_disconnect (dwc);else ret =dwc3_gadget_soft_connect (dwc); +mutex_unlock (&dwc->connect_mutex);pm_runtime_put (dwc->dev);@@ -4147,6 +4174,10 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc) dwc->suspended = false; +/* The controller is recovered. */ +if (dwc->err_state ==DWC3_ERR_NONE ) + dwc->err_recovery_count =0 ; +/* * Ideally, dwc3_reset_gadget() would trigger the function * drivers to stop any active transfers through ep disable. @@ -4634,6 +4665,12 @@ static irqreturn_t dwc3_thread_interrupt(int irq, void *_evt)return ret; } +static void dwc3_schedule_err_recovery (struct dwc3 *dwc) +{ + dwc->err_state =DWC3_ERR_RECOVERY ; +schedule_work (&dwc->err_recovery_work); +} +static irqreturn_t dwc3_check_event_buf (struct dwc3_event_buffer *evt) {struct dwc3 *dwc = evt->dwc;@@ -4667,9 +4704,21 @@ static irqreturn_t dwc3_check_event_buf(struct dwc3_event_buffer *evt)return IRQ_NONE ;if (count > evt->length) { -dev_err_ratelimited (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , +dev_err (dwc->dev,"invalid count(%u) > evt->length(%u)\n" , count, evt->length); -return IRQ_NONE ; +/* +* This is a fatal error - the driver and controller are out of +* sync on which event has been consumed. Reinitializing the +* controller is required to recover. Write the bogus count back +* to GEVNTCOUNT to clear the IRQ source, consistent with the +* stale event clearing in dwc3_event_buffers_setup(), then +* schedule error recovery. +*/ +spin_lock (&dwc->lock); +dwc3_schedule_err_recovery (dwc); +spin_unlock (&dwc->lock); +dwc3_writel (dwc,DWC3_GEVNTCOUNT (0 ), count); +return IRQ_HANDLED ; } evt->count = count;@@ -4729,6 +4778,53 @@ static void dwc_gadget_release(struct device *dev)kfree (gadget); } +static void dwc3_err_recovery_work (struct work_struct *work) +{ + struct dwc3 *dwc = container_of(work, struct dwc3, err_recovery_work); +unsigned long flags; +int ret; +
drivers/usb/dwc3/gadget.c static void dwc_gadget_release(struct device *dev) · line 4796
Quoted 10 lines
drivers/usb/dwc3/gadget.c +10
-0+ dwc->err_recovery_count++; + +/* serializes against dwc3_gadget_pullup() */ +mutex_lock (&dwc->connect_mutex); + + ret =dwc3_gadget_soft_disconnect (dwc); +if (ret) + goto err_unrecoverable; + +dwc3_disconnect_gadget_sleepable (dwc);
Can we also call dwc3_disconnect_gadget_sleepable() in the unrecoverable err to ensure the gadget driver is notified of the disconnect?
ret = dwc3_gadget_soft_disconnect(dwc); dwc3_disconnect_gadget_sleepable(dwc); if (ret) goto err_unrecoverable;
Quoted 21 lines
drivers/usb/dwc3/gadget.c +21
-0+ +if (dwc->err_recovery_count >DWC3_ERR_RECOVERY_MAX ) + goto err_unrecoverable; + +if (dwc->softconnect) { +/* +* Wait irq to finish before soft_connect resets evt->lpos and +* the event buffer registers to avoid racing with +* dwc3_process_event_buf(). +*/ +synchronize_irq (dwc->irq_gadget); + + ret =dwc3_gadget_soft_connect (dwc); +if (ret) + goto err_unrecoverable; + } +mutex_unlock (&dwc->connect_mutex); + +spin_lock_irqsave (&dwc->lock, flags); + dwc->err_state =DWC3_ERR_NONE ; +spin_unlock_irqrestore (&dwc->lock, flags);
drivers/usb/dwc3/gadget.c static void dwc_gadget_release(struct device *dev) · line 4827
Quoted 10 lines
drivers/usb/dwc3/gadget.c +10
-0+return ; + +err_unrecoverable: +dev_err (dwc->dev,"Unable to recover the controller\n" ); +mutex_unlock (&dwc->connect_mutex); +spin_lock_irqsave (&dwc->lock, flags); + dwc->err_state =DWC3_ERR_UNRECOVERABLE ; +spin_unlock_irqrestore (&dwc->lock, flags); +} +
Thanks,
Thinh
PATCH v3 1/1 usb: dwc3: gadget: fix IRQ storm on invalid event buffer count
In reply to Jiazi LiuWhen dwc3_check_event_buf() reads a GEVNTCOUNT value exceeding the event buffer length, commit 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length") returns IRQ_NONE without writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.
The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184
To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <DWC3_BASE + 0xc40c> 4 0x1004
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.
--- drivers/usb/dwc3/core.h | 19 +++++++ drivers/usb/dwc3/ep0.c | 9 ++++ drivers/usb/dwc3/gadget.c | 104 +++++++++++++++++++++++++++++++++++++- 3 files changed, 130 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.h +19 -0
@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096
@@ -841,6 +842,12 @@ enum dwc3_link_state { DWC3_LINK_STATE_MASK = 0x0f, }; +enum dwc3_err_state { +DWC3_ERR_NONE =0 , +DWC3_ERR_RECOVERY , +DWC3_ERR_UNRECOVERABLE , +}; +/* TRB Length, PCM and Status */ #define DWC3_TRB_SIZE_MASK (0x00ffffff)#define DWC3_TRB_SIZE_LENGTH (n) ((n) & DWC3_TRB_SIZE_MASK)
@@ -1004,6 +1011,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests
@@ -1013,6 +1021,7 @@ struct dwc3_glue_ops {* @ep0_in_setup: one control transfer is completed and enter setup phase * @lock: for synchronizing * @mutex: for mode switching +* @connect_mutex: for the pull-up and err_recovery_work * @dev: pointer to our struct device * @sysdev: pointer to the DMA-capable device * @xhci: pointer to our xHCI child
@@ -1079,6 +1088,9 @@ struct dwc3_glue_ops {* @ep0_next_event: hold the next expected event * @ep0state: state of endpoint zero * @link_state: link state +* @err_state: current error recovery state. +* @err_recovery_count: number of consecutive error recovery attempts until +* confirmed healthy and reset to 0 on reset event. * @speed: device speed (super, high, full, low) * @hwparams: copy of hwparams registers * @regset: debugfs pointer to regdump file
@@ -1189,6 +1201,7 @@ struct dwc3_glue_ops {*/ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;
@@ -1203,6 +1216,9 @@ struct dwc3 {/* mode switching lock */ struct mutex mutex; +/* serializes pull-up run/stop vs error recovery */ +struct mutex connect_mutex; +struct device *dev;struct device *sysdev;
@@ -1332,6 +1348,9 @@ struct dwc3 {enum dwc3_ep0_next ep0_next_event;enum dwc3_ep0_state ep0state;enum dwc3_link_state link_state; +enum dwc3_err_state err_state; + +u32 err_recovery_count;u16 u2sel;u16 u2pel;
drivers/usb/dwc3/ep0.c +9 -0
@@ -200,6 +200,11 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { + ret = -ESHUTDOWN ; + goto out; + } +if (!dep->endpoint.desc || !dwc->pullups_connected || !dwc->connected) {dev_err (dwc->dev,"%s: can't queue to disabled endpoint\n" , dep->name);
@@ -271,6 +276,10 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep0_set_halt (ep, value);spin_unlock_irqrestore (&dwc->lock, flags);
drivers/usb/dwc3/gadget.c +102 -2
187 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v4 1/1 usb: dwc3: gadget: fix IRQ storm on invalid event buffer count
In reply to Jiazi LiuWhen dwc3_check_event_buf() reads a GEVNTCOUNT value exceeding the event buffer length, commit 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length") returns IRQ_NONE without writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.
The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184
To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <DWC3_BASE + 0xc40c> 4 0x1004
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.
--- drivers/usb/dwc3/core.h | 19 +++++++ drivers/usb/dwc3/ep0.c | 9 ++++ drivers/usb/dwc3/gadget.c | 105 +++++++++++++++++++++++++++++++++++++- 3 files changed, 131 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.h +19 -0
@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096
@@ -841,6 +842,12 @@ enum dwc3_link_state { DWC3_LINK_STATE_MASK = 0x0f, }; +enum dwc3_err_state { +DWC3_ERR_NONE =0 , +DWC3_ERR_RECOVERY , +DWC3_ERR_UNRECOVERABLE , +}; +/* TRB Length, PCM and Status */ #define DWC3_TRB_SIZE_MASK (0x00ffffff)#define DWC3_TRB_SIZE_LENGTH (n) ((n) & DWC3_TRB_SIZE_MASK)
@@ -1004,6 +1011,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests
@@ -1013,6 +1021,7 @@ struct dwc3_glue_ops {* @ep0_in_setup: one control transfer is completed and enter setup phase * @lock: for synchronizing * @mutex: for mode switching +* @connect_mutex: for the pull-up and err_recovery_work * @dev: pointer to our struct device * @sysdev: pointer to the DMA-capable device * @xhci: pointer to our xHCI child
@@ -1079,6 +1088,9 @@ struct dwc3_glue_ops {* @ep0_next_event: hold the next expected event * @ep0state: state of endpoint zero * @link_state: link state +* @err_state: current error recovery state. +* @err_recovery_count: number of consecutive error recovery attempts until +* confirmed healthy and reset to 0 on reset event. * @speed: device speed (super, high, full, low) * @hwparams: copy of hwparams registers * @regset: debugfs pointer to regdump file
@@ -1189,6 +1201,7 @@ struct dwc3_glue_ops {*/ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;
@@ -1203,6 +1216,9 @@ struct dwc3 {/* mode switching lock */ struct mutex mutex; +/* serializes pull-up run/stop vs error recovery */ +struct mutex connect_mutex; +struct device *dev;struct device *sysdev;
@@ -1332,6 +1348,9 @@ struct dwc3 {enum dwc3_ep0_next ep0_next_event;enum dwc3_ep0_state ep0state;enum dwc3_link_state link_state; +enum dwc3_err_state err_state; + +u32 err_recovery_count;u16 u2sel;u16 u2pel;
drivers/usb/dwc3/ep0.c +9 -0
@@ -200,6 +200,11 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { + ret = -ESHUTDOWN ; + goto out; + } +if (!dep->endpoint.desc || !dwc->pullups_connected || !dwc->connected) {dev_err (dwc->dev,"%s: can't queue to disabled endpoint\n" , dep->name);
@@ -271,6 +276,10 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep0_set_halt (ep, value);spin_unlock_irqrestore (&dwc->lock, flags);
drivers/usb/dwc3/gadget.c +103 -2
188 lines not on this page · raw message
Signature · 1 line
2.50.1 (Apple Git-155)
Greg KH
maintainerQuoted 27 lines · Jiazi Liu
When
dwc3_check_event_buf()reads a GEVNTCOUNT value exceeding the event buffer length, commit63ccd26cd1f6("usb: dwc3: gadget: check that event count does not exceed event buffer length") returnsIRQ_NONEwithout writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <
DWC3_BASE+0xc40c> 40x1004Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in
dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.
Quoted 4 lines
Fixes 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length")Co-developed-by Thinh Nguyen <[email protected]>Signed-off-by Thinh Nguyen <[email protected]>
I missed where Thinh signed off on this, where did that happen?
confused,
greg k-h
Thinh Nguyen
maintainerHi,
Quoted 27 lines · Jiazi Liu
When
dwc3_check_event_buf()reads a GEVNTCOUNT value exceeding the event buffer length, commit63ccd26cd1f6("usb: dwc3: gadget: check that event count does not exceed event buffer length") returnsIRQ_NONEwithout writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <
DWC3_BASE+0xc40c> 40x1004Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in
dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.
Quoted 4 lines
Fixes 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length")Co-developed-by Thinh Nguyen <[email protected]>Signed-off-by Thinh Nguyen <[email protected]>
Please remove my Co-developed-by or Signed-off-by tags.
You can add this:
[...]
One of my test bots reported a potential race involving err_recovery_count updates between dwc3_err_recovery_work() and the reset interrupt handler.
Can we adjust it as follows?
drivers/usb/dwc3/gadget.c +8 -5
@@ -4790,8 +4790,6 @@ static void dwc3_err_recovery_work(struct work_struct *work)unsigned long flags;int ret; - dwc->err_recovery_count++; -/* serializes against dwc3_gadget_pullup() */ mutex_lock (&dwc->connect_mutex);
@@ -4802,10 +4800,8 @@ static void dwc3_err_recovery_work(struct work_struct *work)if (ret) goto err_unrecoverable; -if (dwc->err_recovery_count >DWC3_ERR_RECOVERY_MAX ) - goto err_unrecoverable; -if (dwc->softconnect) { +u32 count;/* * Wait irq to finish before soft_connect resets evt->lpos and * the event buffer registers to avoid racing with
@@ -4813,6 +4809,13 @@ static void dwc3_err_recovery_work(struct work_struct *work)*/ synchronize_irq (dwc->irq_gadget); +spin_lock_irqsave (&dwc->lock, flags); + count = ++dwc->err_recovery_count; +spin_unlock_irqrestore (&dwc->lock, flags); + +if (count >DWC3_ERR_RECOVERY_MAX ) + goto err_unrecoverable; + ret =dwc3_gadget_soft_connect (dwc);if (ret) goto err_unrecoverable;
---
Thanks,
Thinh
PATCH v5 1/1 usb: dwc3: gadget: fix IRQ storm on invalid event buffer count
In reply to Jiazi LiuWhen dwc3_check_event_buf() reads a GEVNTCOUNT value exceeding the event buffer length, commit 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length") returns IRQ_NONE without writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.
The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184
To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <DWC3_BASE + 0xc40c> 4 0x1004
Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.
--- drivers/usb/dwc3/core.h | 19 +++++++ drivers/usb/dwc3/ep0.c | 9 ++++ drivers/usb/dwc3/gadget.c | 108 +++++++++++++++++++++++++++++++++++++- 3 files changed, 134 insertions(+), 2 deletions(-)
drivers/usb/dwc3/core.h +19 -0
@@ -49,6 +49,7 @@#define DWC3_ENDPOINTS_NUM 32#define DWC3_XHCI_RESOURCES_NUM 2#define DWC3_ISOC_MAX_RETRIES 5 +#define DWC3_ERR_RECOVERY_MAX 3#define DWC3_SCRATCHBUF_SIZE 4096/* each buffer is assumed to be 4KiB */ #define DWC3_EVENT_BUFFERS_SIZE 4096
@@ -841,6 +842,12 @@ enum dwc3_link_state { DWC3_LINK_STATE_MASK = 0x0f, }; +enum dwc3_err_state { +DWC3_ERR_NONE =0 , +DWC3_ERR_RECOVERY , +DWC3_ERR_UNRECOVERABLE , +}; +/* TRB Length, PCM and Status */ #define DWC3_TRB_SIZE_MASK (0x00ffffff)#define DWC3_TRB_SIZE_LENGTH (n) ((n) & DWC3_TRB_SIZE_MASK)
@@ -1004,6 +1011,7 @@ struct dwc3_glue_ops {/** * struct dwc3 - representation of our controller * @drd_work: workqueue used for role swapping +* @err_recovery_work: workqueue used for controller error recovery * @ep0_trb: trb which is used for the ctrl_req * @bounce: address of bounce buffer * @setup_buf: used while precessing STD USB requests
@@ -1013,6 +1021,7 @@ struct dwc3_glue_ops {* @ep0_in_setup: one control transfer is completed and enter setup phase * @lock: for synchronizing * @mutex: for mode switching +* @connect_mutex: for the pull-up and err_recovery_work * @dev: pointer to our struct device * @sysdev: pointer to the DMA-capable device * @xhci: pointer to our xHCI child
@@ -1079,6 +1088,9 @@ struct dwc3_glue_ops {* @ep0_next_event: hold the next expected event * @ep0state: state of endpoint zero * @link_state: link state +* @err_state: current error recovery state. +* @err_recovery_count: number of consecutive error recovery attempts until +* confirmed healthy and reset to 0 on reset event. * @speed: device speed (super, high, full, low) * @hwparams: copy of hwparams registers * @regset: debugfs pointer to regdump file
@@ -1189,6 +1201,7 @@ struct dwc3_glue_ops {*/ struct dwc3 {struct work_struct drd_work; +struct work_struct err_recovery_work;struct dwc3_trb *ep0_trb;void *bounce;u8 *setup_buf;
@@ -1203,6 +1216,9 @@ struct dwc3 {/* mode switching lock */ struct mutex mutex; +/* serializes pull-up run/stop vs error recovery */ +struct mutex connect_mutex; +struct device *dev;struct device *sysdev;
@@ -1332,6 +1348,9 @@ struct dwc3 {enum dwc3_ep0_next ep0_next_event;enum dwc3_ep0_state ep0state;enum dwc3_link_state link_state; +enum dwc3_err_state err_state; + +u32 err_recovery_count;u16 u2sel;u16 u2pel;
drivers/usb/dwc3/ep0.c +9 -0
@@ -200,6 +200,11 @@ int dwc3_gadget_ep0_queue(struct usb_ep *ep, struct usb_request *request,int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { + ret = -ESHUTDOWN ; + goto out; + } +if (!dep->endpoint.desc || !dwc->pullups_connected || !dwc->connected) {dev_err (dwc->dev,"%s: can't queue to disabled endpoint\n" , dep->name);
@@ -271,6 +276,10 @@ int dwc3_gadget_ep0_set_halt(struct usb_ep *ep, int value)int ret;spin_lock_irqsave (&dwc->lock, flags); +if (dwc->err_state !=DWC3_ERR_NONE ) { +spin_unlock_irqrestore (&dwc->lock, flags); +return -ESHUTDOWN ; + } ret =__dwc3_gadget_ep0_set_halt (ep, value);spin_unlock_irqrestore (&dwc->lock, flags);
drivers/usb/dwc3/gadget.c +106 -2
191 lines not on this page · raw message
Signature · 1 line
2.54.0 (Apple Git-157)
Quoted 31 lines · Jiazi Liu
When
dwc3_check_event_buf()reads a GEVNTCOUNT value exceeding the event buffer length, commit63ccd26cd1f6("usb: dwc3: gadget: check that event count does not exceed event buffer length") returnsIRQ_NONEwithout writing back GEVNTCOUNT. Since the DWC3 interrupt is level-triggered, the uncleared IRQ source keeps the line asserted, causing a tight IRQ storm that accumulates 99,900 unhandled interrupts and triggers spurious.c:184 BUG -> kernel panic.The resulting call stack:
__report_bad_irq+0xac/0xc8 note_interrupt+0x340/0x468 handle_irq_event+0xac/0xc0 handle_fasteoi_irq+0x120/0x228 gic_handle_irq+0x68/0x108 ... kernel BUG at kernel/irq/spurious.c:184To reproduce, write a bogus value exceeding the event buffer length directly to the GEVNTCOUNT register:
devmem <
DWC3_BASE+0xc40c> 40x1004Write the bogus count back to GEVNTCOUNT to clear the IRQ source, consistent with the stale event clearing pattern in
dwc3_event_buffers_setup(), and schedule error recovery to reinitialize the controller.Fixes 63ccd26cd1f6 ("usb: dwc3: gadget: check that event count does not exceed event buffer length")Suggested-by Thinh Nguyen <[email protected]>Signed-off-by Jiazi Liu <[email protected]>
Quoted 6 lines
--- drivers/usb/dwc3/core.h | 19 +++++++ drivers/usb/dwc3/ep0.c | 9 ++++ drivers/usb/dwc3/gadget.c | 108 +++++++++++++++++++++++++++++++++++++- 3 files changed, 134 insertions(+), 2 deletions(-)
Thanks,
Thinh