Commit 9e82eb57 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

virtio_vdpa: Revert "virtio_vdpa: support the arg sizes of find_vqs()" 



This reverts commit 99e8927d:
proposed API isn't supported on all transports but no
effort was made to address this.

It might not be hard to fix if we want to: maybe just rename size to
size_hint and make sure legacy transports ignore the hint.

But it's not sure what the benefit is in any case, so let's drop it.

Fixes: 99e8927d ("virtio_vdpa: support the arg sizes of find_vqs()")
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Message-Id: <20220816053602.173815-6-mst@redhat.com>
parent 13aa8c6c

drivers/virtio/virtio_vdpa.c

+6 −9
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static irqreturn_t virtio_vdpa_virtqueue_cb(void *private) 
static struct virtqueue *

virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index,

		     void (*callback)(struct virtqueue *vq),

		     const char *name, u32 size, bool ctx)

		     const char *name, bool ctx)

{

	struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vdev);

	struct vdpa_device *vdpa = vd_get_vdpa(vdev);
@@ -168,17 +168,14 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, 
		goto error_new_virtqueue;

	}



	if (!size || size > max_num)

		size = max_num;



	if (ops->get_vq_num_min)

		min_num = ops->get_vq_num_min(vdpa);



	may_reduce_num = (size == min_num) ? false : true;

	may_reduce_num = (max_num == min_num) ? false : true;



	/* Create the vring */

	align = ops->get_vq_align(vdpa);

	vq = vring_create_virtqueue(index, size, align, vdev,

	vq = vring_create_virtqueue(index, max_num, align, vdev,

				    true, may_reduce_num, ctx,

				    virtio_vdpa_notify, callback, name);

	if (!vq) {
@@ -288,9 +285,9 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs, 
			continue;

		}



		vqs[i] = virtio_vdpa_setup_vq(vdev, queue_idx++, callbacks[i],

						  names[i], sizes ? sizes[i] : 0,

						  ctx ? ctx[i] : false);

		vqs[i] = virtio_vdpa_setup_vq(vdev, queue_idx++,

					      callbacks[i], names[i], ctx ?

					      ctx[i] : false);

		if (IS_ERR(vqs[i])) {

			err = PTR_ERR(vqs[i]);

			goto err_setup_vq;