ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdev: use spdk_thread_send_msg() to defer completion

Browse Source 
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: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/365077
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Daniel Verkamp 2017-06-12 15:47:30 -07:00 committed by Jim Harris
parent c013322dc6
commit 22a11feeb1
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/bdev/bdev.c
View File

@ -1122,28 +1122,27 @@ spdk_bdev_free_io(struct spdk_bdev_io *bdev_io)
} }
static void static void
bdev_io_deferred_completion(void *arg1, void *arg2) bdev_io_deferred_completion(void *ctx)
{ {
struct spdk_bdev_io *bdev_io = arg1; struct spdk_bdev_io *bdev_io = ctx;
enum spdk_bdev_io_status status = (enum spdk_bdev_io_status)arg2;
assert(bdev_io->in_submit_request == false); assert(bdev_io->in_submit_request == false);
spdk_bdev_io_complete(bdev_io, status); spdk_bdev_io_complete(bdev_io, bdev_io->status);
} }
void void
spdk_bdev_io_complete(struct spdk_bdev_io *bdev_io, enum spdk_bdev_io_status status) 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) { 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. * user's completion callback issues a new I/O.
*/ */
spdk_event_call(spdk_event_allocate(spdk_env_get_current_core(), spdk_thread_send_msg(spdk_io_channel_get_thread(bdev_io->ch->channel),
bdev_io_deferred_completion, bdev_io_deferred_completion, bdev_io);
bdev_io,
(void *)status));
return; 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 (status == SPDK_BDEV_IO_STATUS_SUCCESS) {
if (bdev_io->status == SPDK_BDEV_IO_STATUS_SUCCESS) {
switch (bdev_io->type) { switch (bdev_io->type) {
case SPDK_BDEV_IO_TYPE_READ: case SPDK_BDEV_IO_TYPE_READ:
bdev_io->ch->stat.bytes_read += bdev_io->u.read.len; bdev_io->ch->stat.bytes_read += bdev_io->u.read.len;