Commit 22a11fee authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

bdev: use spdk_thread_send_msg() to defer completion 



Switch from the SPDK event library event to the spdk/io_channel.h thread
message abstraction.  This partially decouples the bdev layer from the
SPDK event library.

Change-Id: I2300b8d84c357d6d8cab0d370d7681e948fe97d0
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/365077


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent c013322d

lib/bdev/bdev.c

+9 −12
Original line number Diff line number Diff line
@@ -1122,28 +1122,27 @@ spdk_bdev_free_io(struct spdk_bdev_io *bdev_io) 
}



static void

bdev_io_deferred_completion(void *arg1, void *arg2)

bdev_io_deferred_completion(void *ctx)

{

	struct spdk_bdev_io *bdev_io = arg1;

	enum spdk_bdev_io_status status = (enum spdk_bdev_io_status)arg2;

	struct spdk_bdev_io *bdev_io = ctx;



	assert(bdev_io->in_submit_request == false);



	spdk_bdev_io_complete(bdev_io, status);

	spdk_bdev_io_complete(bdev_io, bdev_io->status);

}



void

spdk_bdev_io_complete(struct spdk_bdev_io *bdev_io, enum spdk_bdev_io_status status)

{

	bdev_io->status = status;



	if (bdev_io->in_submit_request) {

		/*

		 * Defer completion via an event to avoid potential infinite recursion if the

		 * Defer completion to avoid potential infinite recursion if the

		 * user's completion callback issues a new I/O.

		 */

		spdk_event_call(spdk_event_allocate(spdk_env_get_current_core(),

						    bdev_io_deferred_completion,

						    bdev_io,

						    (void *)status));

		spdk_thread_send_msg(spdk_io_channel_get_thread(bdev_io->ch->channel),

				     bdev_io_deferred_completion, bdev_io);

		return;

	}
@@ -1168,9 +1167,7 @@ spdk_bdev_io_complete(struct spdk_bdev_io *bdev_io, enum spdk_bdev_io_status sta 
		}

	}



	bdev_io->status = status;



	if (bdev_io->status == SPDK_BDEV_IO_STATUS_SUCCESS) {

	if (status == SPDK_BDEV_IO_STATUS_SUCCESS) {

		switch (bdev_io->type) {

		case SPDK_BDEV_IO_TYPE_READ:

			bdev_io->ch->stat.bytes_read += bdev_io->u.read.len;