diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-10-16 13:51:30 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:48:00 -0800 |
| commit | a88f5eaa6802026c97ebe34c2b961d60ad9c5bfa (patch) | |
| tree | 1d39096a21ccf39db62d89e239314099efc8120a /drivers/tty | |
| parent | 33d90ee4d0318fb1ec5bba6a8b9f4fa2d5333d3c (diff) | |
| download | linux-3.10-a88f5eaa6802026c97ebe34c2b961d60ad9c5bfa.tar.gz linux-3.10-a88f5eaa6802026c97ebe34c2b961d60ad9c5bfa.tar.bz2 linux-3.10-a88f5eaa6802026c97ebe34c2b961d60ad9c5bfa.zip | |
tty: Fix high cpu load if tty is unreleaseable
commit 37b164578826406a173ca7c20d9ba7430134d23e upstream.
Kernel oops can cause the tty to be unreleaseable (for example, if
n_tty_read() crashes while on the read_wait queue). This will cause
tty_release() to endlessly loop without sleeping.
Use a killable sleep timeout which grows by 2n+1 jiffies over the interval
[0, 120 secs.) and then jumps to forever (but still killable).
NB: killable just allows for the task to be rewoken manually, not
to be terminated.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/tty_io.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 3723c0ebb31..d35afccdb6c 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -1698,6 +1698,7 @@ int tty_release(struct inode *inode, struct file *filp) int pty_master, tty_closing, o_tty_closing, do_sleep; int idx; char buf[64]; + long timeout = 0; if (tty_paranoia_check(tty, inode, __func__)) return 0; @@ -1782,7 +1783,11 @@ int tty_release(struct inode *inode, struct file *filp) __func__, tty_name(tty, buf)); tty_unlock_pair(tty, o_tty); mutex_unlock(&tty_mutex); - schedule(); + schedule_timeout_killable(timeout); + if (timeout < 120 * HZ) + timeout = 2 * timeout + 1; + else + timeout = MAX_SCHEDULE_TIMEOUT; } /* |