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

bdev: consolidate I/O completion message passing

Browse Source 
Simplify the handling of I/O completions that need to be sent as a
message so that they are handled in a single place in
_spdk_bdev_io_complete().

Change-Id: Ic94354ad947d0f1f11241f728aa194a105ff96c4
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/404184
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Daniel Verkamp 2018-03-16 11:17:31 -07:00
parent b20b983b05
commit 0d7d3a05c3
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/bdev/bdev.c
View File

@ -2061,30 +2061,35 @@ _spdk_bdev_ch_retry_io(struct spdk_bdev_channel *bdev_ch)
} }
} }
static void static inline void
_spdk_bdev_qos_io_complete(void *ctx)
{
struct spdk_bdev_io *bdev_io = ctx;
bdev_io->cb(bdev_io, bdev_io->status == SPDK_BDEV_IO_STATUS_SUCCESS, bdev_io->caller_ctx);
}
static void
_spdk_bdev_io_complete(void *ctx) _spdk_bdev_io_complete(void *ctx)
{ {
struct spdk_bdev_io *bdev_io = ctx; struct spdk_bdev_io *bdev_io = ctx;
assert(bdev_io->cb != NULL); if (spdk_unlikely(bdev_io->in_submit_request || bdev_io->io_submit_ch)) {
/*
* Send the completion to the thread that originally submitted the I/O,
* which may not be the current thread in the case of QoS.
*/
if (bdev_io->io_submit_ch) {
bdev_io->ch = bdev_io->io_submit_ch;
bdev_io->io_submit_ch = NULL;
}
if (bdev_io->io_submit_ch) { /*
bdev_io->ch = bdev_io->io_submit_ch; * Defer completion to avoid potential infinite recursion if the
bdev_io->io_submit_ch = NULL; * user's completion callback issues a new I/O.
*/
spdk_thread_send_msg(spdk_io_channel_get_thread(bdev_io->ch->channel), spdk_thread_send_msg(spdk_io_channel_get_thread(bdev_io->ch->channel),
_spdk_bdev_qos_io_complete, bdev_io); _spdk_bdev_io_complete, bdev_io);
} else { return;
bdev_io->cb(bdev_io, bdev_io->status == SPDK_BDEV_IO_STATUS_SUCCESS,
bdev_io->caller_ctx);
} }
assert(bdev_io->cb != NULL);
assert(spdk_get_thread() == spdk_io_channel_get_thread(bdev_io->ch->channel));
bdev_io->cb(bdev_io, bdev_io->status == SPDK_BDEV_IO_STATUS_SUCCESS,
bdev_io->caller_ctx);
} }
static void static void
@ -2200,16 +2205,7 @@ spdk_bdev_io_complete(struct spdk_bdev_io *bdev_io, enum spdk_bdev_io_status sta
} }
#endif #endif
if (bdev_io->in_submit_request) { _spdk_bdev_io_complete(bdev_io);
/*
* Defer completion to avoid potential infinite recursion if the
* user's completion callback issues a new I/O.
*/
spdk_thread_send_msg(spdk_io_channel_get_thread(bdev_ch->channel),
_spdk_bdev_io_complete, bdev_io);
} else {
_spdk_bdev_io_complete(bdev_io);
}
} }
void void