Skip to content

Commit 77dae61

Browse files
wyqkpgregkh
authored andcommitted
tty: pty: Fix ldisc flush after userspace become aware of the data already
While using emacs, cat or others' commands in konsole with recent kernels, I have met many times that CTRL-C freeze konsole. After konsole freeze I can't type anything, then I have to open a new one, it is very annoying. See bug report: https://bugs.kde.org/show_bug.cgi?id=175283 The platform in that bug report is Solaris, but now the pty in linux has the same problem or the same behavior as Solaris :) It has high possibility to trigger the problem follow steps below: Note: In my test, BigFile is a text file whose size is bigger than 1G 1:open konsole 1:cat BigFile 2:CTRL-C After some digging, I find out the reason is that commit 1d1d14d ("pty: Fix buffer flush deadlock") changes the behavior of pty_flush_buffer. Thread A Thread B -------- -------- 1:n_tty_poll return POLLIN 2:CTRL-C trigger pty_flush_buffer tty_buffer_flush n_tty_flush_buffer 3:attempt to check count of chars: ioctl(fd, TIOCINQ, &available) available is equal to 0 4:read(fd, buffer, avaiable) return 0 5:konsole close fd Yes, I know we could use the same patch included in the BUG report as a workaround for linux platform too. But I think the data in ldisc is belong to application of another side, we shouldn't clear it when we want to flush write buffer of this side in pty_flush_buffer. So I think it is better to disable ldisc flush in pty_flush_buffer, because its new hehavior bring no benefit except that it mess up the behavior between POLLIN, and TIOCINQ or FIONREAD. Also I find no flush_buffer function in others' tty driver has the same behavior as current pty_flush_buffer. Fixes: 1d1d14d ("pty: Fix buffer flush deadlock") CC: [email protected] # v4.0+ Signed-off-by: Wang YanQing <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent b44b96a commit 77dae61

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

drivers/tty/pty.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,16 +216,11 @@ static int pty_signal(struct tty_struct *tty, int sig)
216216
static void pty_flush_buffer(struct tty_struct *tty)
217217
{
218218
struct tty_struct *to = tty->link;
219-
struct tty_ldisc *ld;
220219

221220
if (!to)
222221
return;
223222

224-
ld = tty_ldisc_ref(to);
225-
tty_buffer_flush(to, ld);
226-
if (ld)
227-
tty_ldisc_deref(ld);
228-
223+
tty_buffer_flush(to, NULL);
229224
if (to->packet) {
230225
spin_lock_irq(&tty->ctrl_lock);
231226
tty->ctrl_status |= TIOCPKT_FLUSHWRITE;

0 commit comments

Comments
 (0)