pty_write: don't do a tty_wakeup() when the buffers are full

torvalds · torvalds · commit 202c4675c55d · 2009-09-18T07:05:58.000-07:00
Commit ac89a91 ("pty: don't limit the writes to 'pty_space()' inside 'pty_write()'") removed the pty_space() checking, in order to let the regular tty buffer code limit the buffering itself. That was all good, but as a subtle side effect it meant that we'd be doing a tty_wakeup() even in the case where the buffers were all filled up, and didn't actually make any progress on the write. Which sounds innocuous, but it interacts very badly with the ppp_async code, which has an infinite loop in ppp_async_push() that tries to push out data to the tty. When we call tty_wakeup(), that loop ends up thinking that progress was made (see the subtle interactions between XMIT_WAKEUP and 'tty_stuffed' for details). End result: one unhappy ppp user. Fixed by noticing when tty_insert_flip_string() didn't actually do anything, and then not doing any more processing (including, very much not calling tty_wakeup()). Bisected-and-tested-by: Peter Volkov <pva@gentoo.org> Cc: stable@kernel.org (2.6.31) Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
@@ -120,8 +120,10 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)
 		/* Stuff the data into the input queue of the other end */
 		c = tty_insert_flip_string(to, buf, c);
 		/* And shovel */
-		tty_flip_buffer_push(to);
-		tty_wakeup(tty);
+		if (c) {
+			tty_flip_buffer_push(to);
+			tty_wakeup(tty);
+		}
 	}
 	return c;
 }

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,10 @@ static int pty_write(struct tty_struct tty, const unsigned char buf, int c)`
`120`	`120`	`/* Stuff the data into the input queue of the other end */`
`121`	`121`	`c = tty_insert_flip_string(to, buf, c);`
`122`	`122`	`/* And shovel */`
`123`		`- tty_flip_buffer_push(to);`
`124`		`- tty_wakeup(tty);`
	`123`	`+ if (c) {`
	`124`	`+ tty_flip_buffer_push(to);`
	`125`	`+ tty_wakeup(tty);`
	`126`	`+ }`
`125`	`127`	`}`
`126`	`128`	`return c;`
`127`	`129`	`}`