tty: N_TTY SIGIO only works for read (ff8cb0fd) · Commits · 戴 / test

The N_TTY ldisc layer does not send SIGIO POLL_OUTs correctly when output is possible due to flawed handling of the TTY_DO_WRITE_WAKEUP bit. It will either send no SIGIOs at all or on every tty wakeup. The fix is to set the bit when the tty driver write would block and test and clear it on write wakeup. [Merged with existing N_TTY patches and a small buglet fixed -- Alan] Signed-off-by:

Thomas Pfaff <tpfaff@pcs.com> Signed-off-by:

Alan Cox <alan@redhat.com> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/char/n_tty.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1352,11 +1352,9 @@ static void n_tty_write_wakeup(struct tty_struct *tty)
		/* Write out any echoed characters that are still pending */
		process_echoes(tty);

		if (tty->fasync) {
		set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
		if (tty->fasync && test_and_clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags))
		kill_fasync(&tty->fasync, SIGIO, POLL_OUT);
		}
		}

		/**
		* n_tty_receive_buf - data receive
		@@ -2014,6 +2012,8 @@ static ssize_t n_tty_write(struct tty_struct tty, struct file file,
		break_out:
		__set_current_state(TASK_RUNNING);
		remove_wait_queue(&tty->write_wait, &wait);
		if (b - buf != nr && tty->fasync)
		set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
		return (b - buf) ? b - buf : retval;
		}

Admin message