summaryrefslogtreecommitdiffstats
path: root/drivers/char/virtio_console.c
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2010-09-16 14:43:08 +0530
committerRusty Russell <rusty@rustcorp.com.au>2010-09-21 10:54:01 +0930
commit6df7aadcd9290807c464675098b5dd2dc9da5075 (patch)
tree0afe6d6010d3eac58b1b5d748da91355fbfa422c /drivers/char/virtio_console.c
parent2422084a94fcd5038406261b331672a13c92c050 (diff)
downloadblackbird-obmc-linux-6df7aadcd9290807c464675098b5dd2dc9da5075.tar.gz
blackbird-obmc-linux-6df7aadcd9290807c464675098b5dd2dc9da5075.zip
virtio: console: Fix poll blocking even though there is data to read
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 virtqueue. 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 <hdegoede@redhat.com> Signed-off-by: Amit Shah <amit.shah@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: stable@kernel.org
Diffstat (limited to 'drivers/char/virtio_console.c')
-rw-r--r--drivers/char/virtio_console.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 942a9826bd23..2f2e31b58b34 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -642,7 +642,7 @@ static unsigned int port_fops_poll(struct file *filp, poll_table *wait)
poll_wait(filp, &port->waitqueue, wait);
ret = 0;
- if (port->inbuf)
+ if (!will_read_block(port))
ret |= POLLIN | POLLRDNORM;
if (!will_write_block(port))
ret |= POLLOUT;
OpenPOWER on IntegriCloud