leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

virtio_vdpa: support the arg sizes of find_vqs()

Browse Source 
Virtio vdpa support the new parameter sizes of find_vqs().

Signed-off-by: Bo Liu <liubo03@inspur.com>
Message-Id: <20220810085151.7251-1-liubo03@inspur.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bo Liu 2022-08-10 04:51:51 -04:00 committed by Michael S. Tsirkin
parent ebe6a354fa
commit 99e8927d8a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/virtio/virtio_vdpa.c
View File

@ -131,7 +131,7 @@ static irqreturn_t virtio_vdpa_virtqueue_cb(void *private)
static struct virtqueue * static struct virtqueue *
virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index,
void (*callback)(struct virtqueue *vq), void (*callback)(struct virtqueue *vq),
const char *name, bool ctx) const char *name, u32 size, bool ctx)
{ {
struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vdev); struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vdev);
struct vdpa_device *vdpa = vd_get_vdpa(vdev); struct vdpa_device *vdpa = vd_get_vdpa(vdev);
@ -168,14 +168,17 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index,
goto error_new_virtqueue; goto error_new_virtqueue;
} }
if (!size || size > max_num)
size = max_num;
if (ops->get_vq_num_min) if (ops->get_vq_num_min)
min_num = ops->get_vq_num_min(vdpa); min_num = ops->get_vq_num_min(vdpa);
may_reduce_num = (max_num == min_num) ? false : true; may_reduce_num = (size == min_num) ? false : true;
/* Create the vring */ /* Create the vring */
align = ops->get_vq_align(vdpa); align = ops->get_vq_align(vdpa);
vq = vring_create_virtqueue(index, max_num, align, vdev, vq = vring_create_virtqueue(index, size, align, vdev,
true, may_reduce_num, ctx, true, may_reduce_num, ctx,
virtio_vdpa_notify, callback, name); virtio_vdpa_notify, callback, name);
if (!vq) { if (!vq) {
@ -285,9 +288,9 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
continue; continue;
} }
vqs[i] = virtio_vdpa_setup_vq(vdev, queue_idx++, vqs[i] = virtio_vdpa_setup_vq(vdev, queue_idx++, callbacks[i],
callbacks[i], names[i], ctx ? names[i], sizes ? sizes[i] : 0,
ctx[i] : false); ctx ? ctx[i] : false);
if (IS_ERR(vqs[i])) { if (IS_ERR(vqs[i])) {
err = PTR_ERR(vqs[i]); err = PTR_ERR(vqs[i]);
goto err_setup_vq; goto err_setup_vq;