Browse Source

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>
Amit Shah 14 years ago
parent
commit
2770c5ea50
1 changed files with 13 additions and 2 deletions
  1. 13 2
      drivers/tty/hvc/virtio_console.c

+ 13 - 2
drivers/tty/hvc/virtio_console.c

@@ -1462,6 +1462,17 @@ static void control_work_handler(struct work_struct *work)
 	spin_unlock(&portdev->cvq_lock);
 	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)
 static void in_intr(struct virtqueue *vq)
 {
 {
 	struct port *port;
 	struct port *port;
@@ -1566,7 +1577,7 @@ static int init_vqs(struct ports_device *portdev)
 	 */
 	 */
 	j = 0;
 	j = 0;
 	io_callbacks[j] = in_intr;
 	io_callbacks[j] = in_intr;
-	io_callbacks[j + 1] = NULL;
+	io_callbacks[j + 1] = out_intr;
 	io_names[j] = "input";
 	io_names[j] = "input";
 	io_names[j + 1] = "output";
 	io_names[j + 1] = "output";
 	j += 2;
 	j += 2;
@@ -1580,7 +1591,7 @@ static int init_vqs(struct ports_device *portdev)
 		for (i = 1; i < nr_ports; i++) {
 		for (i = 1; i < nr_ports; i++) {
 			j += 2;
 			j += 2;
 			io_callbacks[j] = in_intr;
 			io_callbacks[j] = in_intr;
-			io_callbacks[j + 1] = NULL;
+			io_callbacks[j + 1] = out_intr;
 			io_names[j] = "input";
 			io_names[j] = "input";
 			io_names[j + 1] = "output";
 			io_names[j + 1] = "output";
 		}
 		}