diff options
author | Peter Hurley <peter@hurleysoftware.com> | 2014-10-16 13:51:30 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-05 19:14:09 -0500 |
commit | 37b164578826406a173ca7c20d9ba7430134d23e (patch) | |
tree | c3e53ae6a03334b9600929f6b6bac919b7390b87 | |
parent | 547039ec502076e60034eeb79611df3433a99b7d (diff) |
tty: Fix high cpu load if tty is unreleaseable
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.
Cc: <stable@vger.kernel.org> # since before 2.6.32
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 16a2c0237dd6..4021c10d9908 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c | |||
@@ -1709,6 +1709,7 @@ int tty_release(struct inode *inode, struct file *filp) | |||
1709 | int pty_master, tty_closing, o_tty_closing, do_sleep; | 1709 | int pty_master, tty_closing, o_tty_closing, do_sleep; |
1710 | int idx; | 1710 | int idx; |
1711 | char buf[64]; | 1711 | char buf[64]; |
1712 | long timeout = 0; | ||
1712 | 1713 | ||
1713 | if (tty_paranoia_check(tty, inode, __func__)) | 1714 | if (tty_paranoia_check(tty, inode, __func__)) |
1714 | return 0; | 1715 | return 0; |
@@ -1793,7 +1794,11 @@ int tty_release(struct inode *inode, struct file *filp) | |||
1793 | __func__, tty_name(tty, buf)); | 1794 | __func__, tty_name(tty, buf)); |
1794 | tty_unlock_pair(tty, o_tty); | 1795 | tty_unlock_pair(tty, o_tty); |
1795 | mutex_unlock(&tty_mutex); | 1796 | mutex_unlock(&tty_mutex); |
1796 | schedule(); | 1797 | schedule_timeout_killable(timeout); |
1798 | if (timeout < 120 * HZ) | ||
1799 | timeout = 2 * timeout + 1; | ||
1800 | else | ||
1801 | timeout = MAX_SCHEDULE_TIMEOUT; | ||
1797 | } | 1802 | } |
1798 | 1803 | ||
1799 | /* | 1804 | /* |