Skip to content

Commit 4903fde

Browse files
cael-ligregkh
authored andcommitted
tty: fix hang on tty device with no_room set
It is possible to hang pty devices in this case, the reader was blocking at epoll on master side, the writer was sleeping at wait_woken inside n_tty_write on slave side, and the write buffer on tty_port was full, we found that the reader and writer would never be woken again and blocked forever. The problem was caused by a race between reader and kworker: n_tty_read(reader): n_tty_receive_buf_common(kworker): copy_from_read_buf()| |room = N_TTY_BUF_SIZE - (ldata->read_head - tail) |room <= 0 n_tty_kick_worker() | |ldata->no_room = true After writing to slave device, writer wakes up kworker to flush data on tty_port to reader, and the kworker finds that reader has no room to store data so room <= 0 is met. At this moment, reader consumes all the data on reader buffer and calls n_tty_kick_worker to check ldata->no_room which is false and reader quits reading. Then kworker sets ldata->no_room=true and quits too. If write buffer is not full, writer will wake kworker to flush data again after following writes, but if write buffer is full and writer goes to sleep, kworker will never be woken again and tty device is blocked. This problem can be solved with a check for read buffer size inside n_tty_receive_buf_common, if read buffer is empty and ldata->no_room is true, a call to n_tty_kick_worker is necessary to keep flushing data to reader. Cc: <stable@vger.kernel.org> Fixes: 42458f4 ("n_tty: Ensure reader restarts worker for next reader") Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Hui Li <caelli@tencent.com> Message-ID: <1680749090-14106-1-git-send-email-caelli@tencent.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cef0967 commit 4903fde

1 file changed

Lines changed: 21 additions & 4 deletions

File tree

drivers/tty/n_tty.c

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ static void n_tty_kick_worker(struct tty_struct *tty)
203203
struct n_tty_data *ldata = tty->disc_data;
204204

205205
/* Did the input worker stop? Restart it */
206-
if (unlikely(ldata->no_room)) {
207-
ldata->no_room = 0;
206+
if (unlikely(READ_ONCE(ldata->no_room))) {
207+
WRITE_ONCE(ldata->no_room, 0);
208208

209209
WARN_RATELIMIT(tty->port->itty == NULL,
210210
"scheduling with invalid itty\n");
@@ -1697,7 +1697,7 @@ n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp,
16971697
if (overflow && room < 0)
16981698
ldata->read_head--;
16991699
room = overflow;
1700-
ldata->no_room = flow && !room;
1700+
WRITE_ONCE(ldata->no_room, flow && !room);
17011701
} else
17021702
overflow = 0;
17031703

@@ -1728,6 +1728,17 @@ n_tty_receive_buf_common(struct tty_struct *tty, const unsigned char *cp,
17281728
} else
17291729
n_tty_check_throttle(tty);
17301730

1731+
if (unlikely(ldata->no_room)) {
1732+
/*
1733+
* Barrier here is to ensure to read the latest read_tail in
1734+
* chars_in_buffer() and to make sure that read_tail is not loaded
1735+
* before ldata->no_room is set.
1736+
*/
1737+
smp_mb();
1738+
if (!chars_in_buffer(tty))
1739+
n_tty_kick_worker(tty);
1740+
}
1741+
17311742
up_read(&tty->termios_rwsem);
17321743

17331744
return rcvd;
@@ -2281,8 +2292,14 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
22812292
if (time)
22822293
timeout = time;
22832294
}
2284-
if (old_tail != ldata->read_tail)
2295+
if (old_tail != ldata->read_tail) {
2296+
/*
2297+
* Make sure no_room is not read in n_tty_kick_worker()
2298+
* before setting ldata->read_tail in copy_from_read_buf().
2299+
*/
2300+
smp_mb();
22852301
n_tty_kick_worker(tty);
2302+
}
22862303
up_read(&tty->termios_rwsem);
22872304

22882305
remove_wait_queue(&tty->read_wait, &wait);

0 commit comments

Comments
 (0)