Commit d941d138 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

lib/vhost: merge vq settings into a single loop 



Change-Id: I5a9ef59adcd383e2fae746a434dda10893a3b84a
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14922


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 7f7b468b

lib/vhost/rte_vhost_user.c

+15 −24
Original line number Diff line number Diff line
@@ -1068,6 +1068,21 @@ start_device(int vid) 
			continue;

		}



		/*

		 * Not sure right now but this look like some kind of QEMU bug and guest IO

		 * might be frozed without kicking all queues after live-migration. This look like

		 * the previous vhost instance failed to effectively deliver all interrupts before

		 * the GET_VRING_BASE message. This shouldn't harm guest since spurious interrupts

		 * should be ignored by guest virtio driver.

		 *

		 * Tested on QEMU 2.10.91 and 2.11.50.

		 *

		 * Make sure a successful call of

		 * `rte_vhost_vring_call` will happen

		 * after starting the device.

		 */

		q->used_req_cnt += 1;



		if (packed_ring) {

			/* Use the inflight mem to restore the last_avail_idx and last_used_idx.

			 * When the vring format is packed, there is no used_idx in the
@@ -1110,30 +1125,6 @@ start_device(int vid) 
		goto out;

	}



	/*

	 * Not sure right now but this look like some kind of QEMU bug and guest IO

	 * might be frozed without kicking all queues after live-migration. This look like

	 * the previous vhost instance failed to effectively deliver all interrupts before

	 * the GET_VRING_BASE message. This shouldn't harm guest since spurious interrupts

	 * should be ignored by guest virtio driver.

	 *

	 * Tested on QEMU 2.10.91 and 2.11.50.

	 */

	for (i = 0; i < vsession->max_queues; i++) {

		struct spdk_vhost_virtqueue *q = &vsession->virtqueue[i];



		/* vring.desc and vring.desc_packed are in a union struct

		 * so q->vring.desc can replace q->vring.desc_packed.

		 */

		if (q->vring.desc != NULL && q->vring.size > 0) {

			/* Make sure a successful call of

			 * `rte_vhost_vring_call` will happen

			 * after starting the device.

			 */

			q->used_req_cnt += 1;

		}

	}



	vhost_user_session_set_coalescing(vdev, vsession, NULL);

	vsession->initialized = true;

	rc = vhost_user_session_start(vdev, vsession);