Commit 1bc3837c authored by Ni Xun's avatar Ni Xun Committed by Ben Walker
Browse files

vbdev_passthru: add support for bdev_io_wait 



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

Change-Id: I282b52a7dc0e0fdbfe79e570b0c6a84b01c390ea
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/426163


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 0126d706

lib/bdev/passthru/vbdev_passthru.c

+43 −2
Original line number Diff line number Diff line
@@ -102,8 +102,17 @@ struct pt_io_channel { 
 */

struct passthru_bdev_io {

	uint8_t test;



	/* bdev related */

	struct spdk_io_channel *ch;



	/* for bdev_io_wait */

	struct spdk_bdev_io_wait_entry bdev_io_wait;

};



static void

vbdev_passthru_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_io);



/* Called after we've unregistered following a hot remove callback.

 * Our finish entry point will be called next.

 */
@@ -151,6 +160,32 @@ _pt_complete_io(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) 
	spdk_bdev_free_io(bdev_io);

}



static void

vbdev_passthru_resubmit_io(void *arg)

{

	struct spdk_bdev_io *bdev_io = (struct spdk_bdev_io *)arg;

	struct passthru_bdev_io *io_ctx = (struct passthru_bdev_io *)bdev_io->driver_ctx;



	vbdev_passthru_submit_request(io_ctx->ch, bdev_io);

}



static void

vbdev_passthru_queue_io(struct spdk_bdev_io *bdev_io)

{

	struct passthru_bdev_io *io_ctx = (struct passthru_bdev_io *)bdev_io->driver_ctx;

	int rc;



	io_ctx->bdev_io_wait.bdev = bdev_io->bdev;

	io_ctx->bdev_io_wait.cb_fn = vbdev_passthru_resubmit_io;

	io_ctx->bdev_io_wait.cb_arg = bdev_io;



	rc = spdk_bdev_queue_io_wait(bdev_io->bdev, io_ctx->ch, &io_ctx->bdev_io_wait);

	if (rc != 0) {

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

		spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);

	}

}



/* Callback for getting a buf from the bdev pool in the event that the caller passed

 * in NULL, we need to own the buffer so it doesn't get freed by another vbdev module

 * beneath us before we're done with it. That won't happen in this example but it could
@@ -226,10 +261,16 @@ vbdev_passthru_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *b 
		return;

	}

	if (rc != 0) {

		if (rc == -ENOMEM) {

			SPDK_ERRLOG("No memory, start to queue io for passthru.\n");

			io_ctx->ch = ch;

			vbdev_passthru_queue_io(bdev_io);

		} else {

			SPDK_ERRLOG("ERROR on bdev_io submission!\n");

			spdk_bdev_io_complete(bdev_io, SPDK_BDEV_IO_STATUS_FAILED);

		}

	}

}



/* We'll just call the base bdev and let it answer however if we were more

 * restrictive for some reason (or less) we could get the response back