Skip to content

Commit

Permalink
virtio: console: Wake up outvq on host notifications
Browse files Browse the repository at this point in the history
The outvq needs to be woken up on host notifications so that buffers
consumed by the host can be reclaimed, outvq freed, and application
writes may proceed again.

The need for this is now finally noticed when I have qemu patches ready
to use nonblocking IO and flow control.

CC: Hans de Goede <hdegoede@redhat.com>
CC: stable@kernel.org
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Hans de Goede <hdegoede@redhat.com>
  • Loading branch information
Amit Shah authored and Rusty Russell committed Feb 8, 2011
1 parent afe8a88 commit 2770c5e
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions drivers/tty/hvc/virtio_console.c
Original file line number Diff line number Diff line change
Expand Up @@ -1462,6 +1462,17 @@ static void control_work_handler(struct work_struct *work)
spin_unlock(&portdev->cvq_lock);
}

static void out_intr(struct virtqueue *vq)
{
struct port *port;

port = find_port_by_vq(vq->vdev->priv, vq);
if (!port)
return;

wake_up_interruptible(&port->waitqueue);
}

static void in_intr(struct virtqueue *vq)
{
struct port *port;
Expand Down Expand Up @@ -1566,7 +1577,7 @@ static int init_vqs(struct ports_device *portdev)
*/
j = 0;
io_callbacks[j] = in_intr;
io_callbacks[j + 1] = NULL;
io_callbacks[j + 1] = out_intr;
io_names[j] = "input";
io_names[j + 1] = "output";
j += 2;
Expand All @@ -1580,7 +1591,7 @@ static int init_vqs(struct ports_device *portdev)
for (i = 1; i < nr_ports; i++) {
j += 2;
io_callbacks[j] = in_intr;
io_callbacks[j + 1] = NULL;
io_callbacks[j + 1] = out_intr;
io_names[j] = "input";
io_names[j + 1] = "output";
}
Expand Down

0 comments on commit 2770c5e

Please sign in to comment.