[lkml]   [2010]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[27/80] virtio: console: Fix poll blocking even though there is data to read
2.6.35-stable review patch.  If anyone has any objections, please let us know.


From: Hans de Goede <>

commit 6df7aadcd9290807c464675098b5dd2dc9da5075 upstream.

I found this while working on a Linux agent for spice, the symptom I was
seeing was select blocking on the spice vdagent virtio serial port even
though there were messages queued up there.

virtio_console's port_fops_poll checks port->inbuf != NULL to determine
if read won't block. However if an application reads enough bytes from
inbuf through port_fops_read, to empty the current port->inbuf,
port->inbuf will be NULL even though there may be buffers left in the

This causes poll() to block even though there is data to be read,
this patch fixes this by using will_read_block(port) instead of the
port->inbuf != NULL check.

Signed-off-By: Hans de Goede <>
Signed-off-by: Amit Shah <>
Signed-off-by: Rusty Russell <>
Signed-off-by: Greg Kroah-Hartman <>

drivers/char/virtio_console.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -646,7 +646,7 @@ static unsigned int port_fops_poll(struc
poll_wait(filp, &port->waitqueue, wait);

ret = 0;
- if (port->inbuf)
+ if (!will_read_block(port))
if (!will_write_block(port))
ret |= POLLOUT;

 \ /
  Last update: 2010-09-27 20:09    [W:0.249 / U:3.252 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site