| From: "Michael S. Tsirkin" <mst@redhat.com> |
| Date: Fri, 20 Apr 2018 19:54:23 +0300 |
| Subject: virtio_console: don't tie bufs to a vq |
| |
| commit 2855b33514d290c51d52d94e25d3ef942cd4d578 upstream. |
| |
| 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. |
| |
| Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
| [bwh: Backported to 3.16: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/char/virtio_console.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/char/virtio_console.c |
| +++ b/drivers/char/virtio_console.c |
| @@ -417,7 +417,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; |
| @@ -440,7 +440,7 @@ static struct port_buffer *alloc_buf(str |
| 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 |
| @@ -450,9 +450,9 @@ static struct port_buffer *alloc_buf(str |
| * 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); |
| @@ -834,7 +834,7 @@ static ssize_t port_fops_write(struct fi |
| |
| 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; |
| |
| @@ -953,7 +953,7 @@ static ssize_t port_fops_splice_write(st |
| 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; |
| @@ -1370,7 +1370,7 @@ static unsigned int fill_queue(struct vi |
| |
| nr_added_bufs = 0; |
| do { |
| - buf = alloc_buf(vq, PAGE_SIZE, 0); |
| + buf = alloc_buf(vq->vdev, PAGE_SIZE, 0); |
| if (!buf) |
| break; |
| |