usb_wwan: some improvement on write and resume
Subsystems (2)
PATCH 1/1 usb_wwan: some improvement on write and resume
When enable usb serial for modem data, sometimes the tty is blocked in tty_wait_until_sent because portdata->out_busy always is set and have no chance to be cleared.
We have found two scenarios lead to portdata->out_busy problem.
1. usb_wwan_write set portdata->out_busy firstly, then try autopm async with error. No out urb submit and no usb_wwan_outdat_callback to this write, portdata->out_busy can't be cleared.
2. usb_wwan_resume run play_delayed() and spin_unlock, but intfdata->suspended still is not set to zero. At this time usb_wwan_write is called and anchor the urb to delay list. Then resume keep running but the delayed urb have no chance to be commit until next resume. If the time of next resume is far away, tty will be blocked in tty_wait_until_sent during time.
The patch make some enhancement on write and resume.
1. clear portdata->out_busy if usb_wwan_write try autopm async with error.
2. put play_Delayed and intfdata->suspended together in the spinlock, it's to avoid the write race during resume.
--- drivers/usb/serial/usb_wwan.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/usb/serial/usb_wwan.c +5 -7
@@ -228,8 +228,10 @@ int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port, usb_pipeendpoint(this_urb->pipe), i); err =usb_autopm_get_interface_async (port->serial->interface); -if (err <0 ) +if (err <0 ) { +clear_bit (i, &portdata->out_busy);break ; + }/* send the data */ memcpy (this_urb->transfer_buffer, buf, todo);
@@ -661,17 +663,15 @@ int usb_wwan_resume(struct usb_serial *serial) } } +spin_lock_irq (&intfdata->susp_lock);for (i =0 ; i < serial->num_ports; i++) {/* walk all ports */ port = serial->port[i]; portdata =usb_get_serial_port_data (port);/* skip closed ports */ -spin_lock_irq (&intfdata->susp_lock); -if (!portdata || !portdata->opened) { -spin_unlock_irq (&intfdata->susp_lock); +if (!portdata || !portdata->opened)continue ; - }for (j =0 ; j <N_IN_URB ; j++) { urb = portdata->in_urbs[j];
@@ -684,9 +684,7 @@ int usb_wwan_resume(struct usb_serial *serial) } }play_delayed (port); -spin_unlock_irq (&intfdata->susp_lock); } -spin_lock_irq (&intfdata->susp_lock); intfdata->suspended =0 ;spin_unlock_irq (&intfdata->susp_lock); err_out:
Signature · 1 line
1.7.9.5
Quoted 4 lines · xiao jin
When enable usb serial for modem data, sometimes the tty is blocked in
tty_wait_until_sentbecauseportdata->out_busyalways is set and have no chance to be cleared.
Quoted 10 lines
We have found two scenarios lead to
portdata->out_busyproblem.
1.usb_wwan_writesetportdata->out_busyfirstly, then try autopm async with error. No out urb submit and nousb_wwan_outdat_callbackto this write,portdata->out_busycan't be cleared.
2.usb_wwan_resumerunplay_delayed()andspin_unlock, butintfdata->suspendedstill is not set to zero. At this timeusb_wwan_writeis called and anchor the urb to delay list. Then resume keep running but the delayed urb have no chance to be commit until next resume. If the time of next resume is far away, tty will be blocked intty_wait_until_sentduring time.
First of all, good catch of both of these issues.
They are however two distinct bugs and should be fixed separately. Could you split the fixes into two patches and resubmit?
Please also include a more descriptive subject line for each patch, for example:
"USB: usb_wwan: fix urb leak in write error path" "USB: usb_wwan: fix race between write and resume"
You should probably point out that the write-resume race could also lead to writes being reordered in the description of that patch.
Quoted 5 lines
The patch make some enhancement on write and resume.
1. clearportdata->out_busyifusb_wwan_writetry autopm async with error.
2. putplay_Delayedandintfdata->suspendedtogether in the spinlock, it's to avoid the write race during resume.
As I mentioned in the cdc-acm PM thread, there are a few more issues with autosuspend in usb-serial so I'll include your patches in a series that I'm preparing. Some other stuff got in the way this week, but hopefully I'll find the time to finish it this week.
Thanks,
Johan
Quoted 5 lines
They are however two distinct bugs and should be fixed separately. Could you split the fixes into two patches and resubmit?
Quoted 9 lines
Please also include a more descriptive subject line for each patch, for example:
"USB:
usb_wwan: fix urb leak in write error path" "USB:usb_wwan: fix race between write and resume"You should probably point out that the write-resume race could also lead to writes being reordered in the description of that patch.
Thanks. I will resubmit two patches.
Jin
Quoted 6 lines · Xiao Jin
Quoted 6 lines
They are however two distinct bugs and should be fixed separately. Could you split the fixes into two patches and resubmit?
Please also include a more descriptive subject line for each patch, for example:
Quoted 8 lines
Quoted 6 lines
"USB:
usb_wwan: fix urb leak in write error path" "USB:usb_wwan: fix race between write and resume"You should probably point out that the write-resume race could also lead to writes being reordered in the description of that patch.
Thanks. I will resubmit two patches.
Thanks for resending. I'll include them in the autosuspend series I'll hopefully be able to post shortly.
Johan