Commit efa08cb4 authored by Eli Cohen's avatar Eli Cohen Committed by Michael S. Tsirkin
Browse files

virtio/vdpa: clear the virtqueue state during probe 



Clear the available index as part of the initialization process to
clear and values that might be left from previous usage of the device.
For example, if the device was previously used by vhost_vdpa and now
probed by vhost_vdpa, you want to start with indices.

Fixes: c043b4a8 ("virtio: introduce a vDPA based transport")
Signed-off-by: default avatarEli Cohen <elic@nvidia.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210602021536.39525-5-jasowang@redhat.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarEli Cohen <elic@nvidia.com>
parent 1225c216

drivers/virtio/virtio_vdpa.c

+15 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, 
	struct vdpa_callback cb;

	struct virtqueue *vq;

	u64 desc_addr, driver_addr, device_addr;

	/* Assume split virtqueue, switch to packed if necessary */

	struct vdpa_vq_state state = {0};

	unsigned long flags;

	u32 align, num;

	int err;
@@ -191,6 +193,19 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index, 
		goto err_vq;

	}



	/* reset virtqueue state index */

	if (virtio_has_feature(vdev, VIRTIO_F_RING_PACKED)) {

		struct vdpa_vq_state_packed *s = &state.packed;



		s->last_avail_counter = 1;

		s->last_avail_idx = 0;

		s->last_used_counter = 1;

		s->last_used_idx = 0;

	}

	err = ops->set_vq_state(vdpa, index, &state);

	if (err)

		goto err_vq;



	ops->set_vq_ready(vdpa, index, 1);



	vq->priv = info;