aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@redhat.com>2011-01-31 02:36:36 -0500
committerRusty Russell <rusty@rustcorp.com.au>2011-02-08 16:49:53 -0500
commit2770c5ea501be69989a7acf54ec4cb3554c47191 (patch)
tree47c637a8e1dd803b6df7bd34ab30ea9a8f805a18
parentafe8a887550f7cc24eb16449670b93f6b43c32d8 (diff)
virtio: console: Wake up outvq on host notifications
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>
-rw-r--r--drivers/tty/hvc/virtio_console.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/drivers/tty/hvc/virtio_console.c b/drivers/tty/hvc/virtio_console.c
index 896a2ced1d27..ad2520b1e03f 100644
--- a/drivers/tty/hvc/virtio_console.c
+++ b/drivers/tty/hvc/virtio_console.c
@@ -1462,6 +1462,17 @@ static void control_work_handler(struct work_struct *work)
1462 spin_unlock(&portdev->cvq_lock); 1462 spin_unlock(&portdev->cvq_lock);
1463} 1463}
1464 1464
1465static void out_intr(struct virtqueue *vq)
1466{
1467 struct port *port;
1468
1469 port = find_port_by_vq(vq->vdev->priv, vq);
1470 if (!port)
1471 return;
1472
1473 wake_up_interruptible(&port->waitqueue);
1474}
1475
1465static void in_intr(struct virtqueue *vq) 1476static void in_intr(struct virtqueue *vq)
1466{ 1477{
1467 struct port *port; 1478 struct port *port;
@@ -1566,7 +1577,7 @@ static int init_vqs(struct ports_device *portdev)
1566 */ 1577 */
1567 j = 0; 1578 j = 0;
1568 io_callbacks[j] = in_intr; 1579 io_callbacks[j] = in_intr;
1569 io_callbacks[j + 1] = NULL; 1580 io_callbacks[j + 1] = out_intr;
1570 io_names[j] = "input"; 1581 io_names[j] = "input";
1571 io_names[j + 1] = "output"; 1582 io_names[j + 1] = "output";
1572 j += 2; 1583 j += 2;
@@ -1580,7 +1591,7 @@ static int init_vqs(struct ports_device *portdev)
1580 for (i = 1; i < nr_ports; i++) { 1591 for (i = 1; i < nr_ports; i++) {
1581 j += 2; 1592 j += 2;
1582 io_callbacks[j] = in_intr; 1593 io_callbacks[j] = in_intr;
1583 io_callbacks[j + 1] = NULL; 1594 io_callbacks[j + 1] = out_intr;
1584 io_names[j] = "input"; 1595 io_names[j] = "input";
1585 io_names[j + 1] = "output"; 1596 io_names[j + 1] = "output";
1586 } 1597 }