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

vhost/blk: make packed and split vring process in different function call 



Code cleanup to make the code looks more clear, this helps the coming
inflight IOs support for packed ring.

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


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarJinYu <jin.yu@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 99c62dda

lib/vhost/vhost_blk.c

+64 −33
Original line number Diff line number Diff line
@@ -540,12 +540,52 @@ process_blk_request(struct spdk_vhost_blk_task *task, 


static void

process_blk_task(struct spdk_vhost_virtqueue *vq, uint16_t req_idx)

{

	struct spdk_vhost_blk_task *task;

	int rc;



	assert(vq->packed.packed_ring == false);



	task = &((struct spdk_vhost_blk_task *)vq->tasks)[req_idx];

	if (spdk_unlikely(task->used)) {

		SPDK_ERRLOG("%s: request with idx '%"PRIu16"' is already pending.\n",

			    task->bvsession->vsession.name, req_idx);

		task->used_len = 0;

		blk_task_enqueue(task);

		return;

	}



	task->bvsession->vsession.task_cnt++;



	blk_task_init(task);



	rc = blk_iovs_split_queue_setup(task->bvsession, vq, task->req_idx, task->iovs, &task->iovcnt,

					&task->payload_size);



	if (rc) {

		SPDK_DEBUGLOG(vhost_blk, "Invalid request (req_idx = %"PRIu16").\n", task->req_idx);

		/* Only READ and WRITE are supported for now. */

		invalid_blk_request(task, VIRTIO_BLK_S_UNSUPP);

		return;

	}



	if (process_blk_request(task, task->bvsession) == 0) {

		SPDK_DEBUGLOG(vhost_blk, "====== Task %p req_idx %d submitted ======\n", task,

			      req_idx);

	} else {

		SPDK_ERRLOG("====== Task %p req_idx %d failed ======\n", task, req_idx);

	}

}



static void

process_packed_blk_task(struct spdk_vhost_virtqueue *vq, uint16_t req_idx)

{

	struct spdk_vhost_blk_task *task;

	uint16_t task_idx = req_idx, num_descs;

	int rc;



	if (vq->packed.packed_ring) {

	assert(vq->packed.packed_ring);



	/* Packed ring used the buffer_id as the task_idx to get task struct.

	 * In kernel driver, it uses the vq->free_head to set the buffer_id so the value

	 * must be in the range of 0 ~ vring.size. The free_head value must be unique
@@ -560,7 +600,6 @@ process_blk_task(struct spdk_vhost_virtqueue *vq, uint16_t req_idx) 
	 * ensures the req_idx is unique in the outstanding requests.

	 */

	task_idx = vhost_vring_packed_desc_get_buffer_id(vq, req_idx, &num_descs);

	}



	task = &((struct spdk_vhost_blk_task *)vq->tasks)[task_idx];

	if (spdk_unlikely(task->used)) {
@@ -571,7 +610,6 @@ process_blk_task(struct spdk_vhost_virtqueue *vq, uint16_t req_idx) 
		return;

	}



	if (vq->packed.packed_ring) {

	task->req_idx = req_idx;

	task->num_descs = num_descs;

	task->buffer_id = task_idx;
@@ -579,20 +617,13 @@ process_blk_task(struct spdk_vhost_virtqueue *vq, uint16_t req_idx) 
	rte_vhost_set_inflight_desc_packed(task->bvsession->vsession.vid, vq->vring_idx,

					   req_idx, (req_idx + num_descs - 1) % vq->vring.size,

					   &task->inflight_head);

	}



	task->bvsession->vsession.task_cnt++;



	blk_task_init(task);



	if (vq->packed.packed_ring) {

	rc = blk_iovs_packed_queue_setup(task->bvsession, vq, task->req_idx, task->iovs, &task->iovcnt,

					 &task->payload_size);

	} else {

		rc = blk_iovs_split_queue_setup(task->bvsession, vq, task->req_idx, task->iovs, &task->iovcnt,

						&task->payload_size);

	}



	if (rc) {

		SPDK_DEBUGLOG(vhost_blk, "Invalid request (req_idx = %"PRIu16").\n", task->req_idx);

		/* Only READ and WRITE are supported for now. */
@@ -682,7 +713,7 @@ process_packed_vq(struct spdk_vhost_blk_session *bvsession, struct spdk_vhost_vi 
		SPDK_DEBUGLOG(vhost_blk, "====== Starting processing request idx %"PRIu16"======\n",

			      vq->last_avail_idx);



		process_blk_task(vq, vq->last_avail_idx);

		process_packed_blk_task(vq, vq->last_avail_idx);

	}

}