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

Commit d811bffe authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Greg Kroah-Hartman
Browse files

virtio_console: don't tie bufs to a vq 



[ Upstream commit 2855b33514d290c51d52d94e25d3ef942cd4d578 ]

an allocated buffer doesn't need to be tied to a vq -
only vq->vdev is ever used. Pass the function the
just what it needs - the vdev.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8688e0d2

drivers/char/virtio_console.c

+7 −7
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static void reclaim_dma_bufs(void) 
	}

}



static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size,

static struct port_buffer *alloc_buf(struct virtio_device *vdev, size_t buf_size,

				     int pages)

{

	struct port_buffer *buf;
@@ -445,7 +445,7 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size, 
		return buf;

	}



	if (is_rproc_serial(vq->vdev)) {

	if (is_rproc_serial(vdev)) {

		/*

		 * Allocate DMA memory from ancestor. When a virtio

		 * device is created by remoteproc, the DMA memory is
@@ -455,9 +455,9 @@ static struct port_buffer *alloc_buf(struct virtqueue *vq, size_t buf_size, 
		 * DMA_MEMORY_INCLUDES_CHILDREN had been supported

		 * in dma-coherent.c

		 */

		if (!vq->vdev->dev.parent || !vq->vdev->dev.parent->parent)

		if (!vdev->dev.parent || !vdev->dev.parent->parent)

			goto free_buf;

		buf->dev = vq->vdev->dev.parent->parent;

		buf->dev = vdev->dev.parent->parent;



		/* Increase device refcnt to avoid freeing it */

		get_device(buf->dev);
@@ -841,7 +841,7 @@ static ssize_t port_fops_write(struct file *filp, const char __user *ubuf, 


	count = min((size_t)(32 * 1024), count);



	buf = alloc_buf(port->out_vq, count, 0);

	buf = alloc_buf(port->portdev->vdev, count, 0);

	if (!buf)

		return -ENOMEM;
@@ -960,7 +960,7 @@ static ssize_t port_fops_splice_write(struct pipe_inode_info *pipe, 
	if (ret < 0)

		goto error_out;



	buf = alloc_buf(port->out_vq, 0, pipe->nrbufs);

	buf = alloc_buf(port->portdev->vdev, 0, pipe->nrbufs);

	if (!buf) {

		ret = -ENOMEM;

		goto error_out;
@@ -1377,7 +1377,7 @@ static unsigned int fill_queue(struct virtqueue *vq, spinlock_t *lock) 


	nr_added_bufs = 0;

	do {

		buf = alloc_buf(vq, PAGE_SIZE, 0);

		buf = alloc_buf(vq->vdev, PAGE_SIZE, 0);

		if (!buf)

			break;