Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe75d24 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Rusty Russell
Browse files

virtio/console: Wait until the port is ready on splice 



Wait if the port is not connected or full on splice
like as write is doing.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Acked-by: default avatarAmit Shah <amit.shah@redhat.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent ec8fc870

drivers/char/virtio_console.c

+27 −12
Original line number Diff line number Diff line
@@ -724,6 +724,26 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf, 
	return fill_readbuf(port, ubuf, count, true);

}



static int wait_port_writable(struct port *port, bool nonblock)

{

	int ret;



	if (will_write_block(port)) {

		if (nonblock)

			return -EAGAIN;



		ret = wait_event_freezable(port->waitqueue,

					   !will_write_block(port));

		if (ret < 0)

			return ret;

	}

	/* Port got hot-unplugged. */

	if (!port->guest_connected)

		return -ENODEV;



	return 0;

}



static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,

			       size_t count, loff_t *offp)

{
@@ -740,18 +760,9 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, 


	nonblock = filp->f_flags & O_NONBLOCK;



	if (will_write_block(port)) {

		if (nonblock)

			return -EAGAIN;



		ret = wait_event_freezable(port->waitqueue,

					   !will_write_block(port));

	ret = wait_port_writable(port, nonblock);

	if (ret < 0)

		return ret;

	}

	/* Port got hot-unplugged. */

	if (!port->guest_connected)

		return -ENODEV;



	count = min((size_t)(32 * 1024), count);
@@ -851,6 +862,10 @@ static ssize_t port_fops_splice_write(struct pipe_inode_info *pipe, 
		.u.data = &sgl,

	};



	ret = wait_port_writable(port, filp->f_flags & O_NONBLOCK);

	if (ret < 0)

		return ret;



	sgl.n = 0;

	sgl.len = 0;

	sgl.sg = kmalloc(sizeof(struct scatterlist) * MAX_SPLICE_PAGES,