Commit 4ada23db authored by Ni Xun's avatar Ni Xun Committed by Changpeng Liu
Browse files

vhost_blk: Add support for blk_request_queue_io in vhost_blk 



according to commit:
     bdev: add spdk_bdev_queue_io_wait
This patch will make io_wait to support vhost_blk

Change-Id: I529001fc74427adda63d0d41901a98229364175d
Signed-off-by: default avatarNi Xun <nixun@baidu.com>
Signed-off-by: default avatarLi Lin <lilin24@baidu.com>
Signed-off-by: default avatarZhang Yu <zhangyu31@baidu.com>
Reviewed-on: https://review.gerrithub.io/425479


Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarSun Zhenyuan <sunzhenyuan@baidu.com>
Reviewed-by: default avatarXiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 99850ca7

lib/vhost/vhost_blk.c

+46 −2
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ struct spdk_vhost_blk_task { 


	uint16_t req_idx;



	/* for io wait */

	struct spdk_bdev_io_wait_entry bdev_io_wait;



	/* If set, the task is currently used for I/O processing. */

	bool used;
@@ -74,6 +77,10 @@ struct spdk_vhost_blk_dev { 
/* forward declaration */

static const struct spdk_vhost_dev_backend vhost_blk_device_backend;



static int

process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev *bvdev,

		    struct spdk_vhost_virtqueue *vq);



static void

blk_task_finish(struct spdk_vhost_blk_task *task)

{
@@ -182,6 +189,38 @@ blk_request_complete_cb(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg 
	blk_request_finish(success, task);

}



static void

blk_request_resubmit(void *arg)

{

	struct spdk_vhost_blk_task *task = (struct spdk_vhost_blk_task *)arg;

	int rc = 0;



	rc = process_blk_request(task, task->bvdev, task->vq);

	if (rc == 0) {

		SPDK_DEBUGLOG(SPDK_LOG_VHOST_BLK, "====== Task %p resubmitted ======\n", task);

	} else {

		SPDK_DEBUGLOG(SPDK_LOG_VHOST_BLK, "====== Task %p failed ======\n", task);

	}

}



static inline void

blk_request_queue_io(struct spdk_vhost_blk_task *task)

{

	int rc;

	struct spdk_vhost_blk_dev *bvdev = task->bvdev;

	struct spdk_bdev *bdev = bvdev->bdev;



	task->bdev_io_wait.bdev = bdev;

	task->bdev_io_wait.cb_fn = blk_request_resubmit;

	task->bdev_io_wait.cb_arg = task;



	rc = spdk_bdev_queue_io_wait(bdev, bvdev->bdev_io_channel, &task->bdev_io_wait);

	if (rc != 0) {

		SPDK_ERRLOG("Queue io failed in vhost_blk, rc=%d\n", rc);

		invalid_blk_request(task, VIRTIO_BLK_S_IOERR);

	}

}



static int

process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev *bvdev,

		    struct spdk_vhost_virtqueue *vq)
@@ -255,9 +294,14 @@ process_blk_request(struct spdk_vhost_blk_task *task, struct spdk_vhost_blk_dev 
		}



		if (rc) {

			if (rc == -ENOMEM) {

				SPDK_DEBUGLOG(SPDK_LOG_VHOST_BLK, "No memory, start to queue io.\n");

				blk_request_queue_io(task);

			} else {

				invalid_blk_request(task, VIRTIO_BLK_S_IOERR);

				return -1;

			}

		}

		break;

	case VIRTIO_BLK_T_GET_ID:

		if (!task->iovcnt || !payload_len) {