system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-11-05 18:23:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

n_tty: Fix stuck throttled driver

Browse source 
As noted in the following comment:

  /* FIXME: there is a tiny race here if the receive room check runs
     before the other work executes and empties the buffer (upping
     the receiving room and unthrottling. We then throttle and get
     stuck. This has been observed and traced down by Vincent Pillet/
     We need to address this when we sort out out the rx path locking */

Use new safe throttle/unthrottle functions to re-evaluate conditions
if interrupted by the complement flow control function.

Reported-by: Vincent Pillet <vincentx.pillet@intel.com>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2013-03-06 08:20:53 -05:00 committed by Greg Kroah-Hartman
parent 70bc126471
commit e91e52e428
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/tty/n_tty.c
View file

@ -1468,14 +1468,14 @@ static void n_tty_receive_buf(struct tty_struct *tty, const unsigned char *cp,
* mode. We don't want to throttle the driver if we're in * mode. We don't want to throttle the driver if we're in
* canonical mode and don't have a newline yet! * canonical mode and don't have a newline yet!
*/ */
if (tty->receive_room < TTY_THRESHOLD_THROTTLE) while (1) {
tty_throttle(tty); tty_set_flow_change(tty, TTY_THROTTLE_SAFE);
if (tty->receive_room >= TTY_THRESHOLD_THROTTLE)
/* FIXME: there is a tiny race here if the receive room check runs break;
before the other work executes and empties the buffer (upping if (!tty_throttle_safe(tty))
the receiving room and unthrottling. We then throttle and get break;
stuck. This has been observed and traced down by Vincent Pillet/ }
We need to address this when we sort out out the rx path locking */ __tty_set_flow_change(tty, 0);
} }
int is_ignored(int sig) int is_ignored(int sig)
@ -1944,11 +1944,17 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
* longer than TTY_THRESHOLD_UNTHROTTLE in canonical mode, * longer than TTY_THRESHOLD_UNTHROTTLE in canonical mode,
* we won't get any more characters. * we won't get any more characters.
*/ */
if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE) { while (1) {
tty_set_flow_change(tty, TTY_UNTHROTTLE_SAFE);
if (n_tty_chars_in_buffer(tty) > TTY_THRESHOLD_UNTHROTTLE)
break;
if (!tty->count)
break;
n_tty_set_room(tty); n_tty_set_room(tty);
if (tty->count) if (!tty_unthrottle_safe(tty))
tty_unthrottle(tty); break;
} }
__tty_set_flow_change(tty, 0);
if (b - buf >= minimum) if (b - buf >= minimum)
break; break;