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

bdev: track IOs executing accel sequence

Browse Source 
It will make it possible to check if a request is being processed by
accel when doing resets/aborts.

Signed-off-by: Konrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Ice07211df316e1eee9640e750ff8e176c8a3ca6f
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16977
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
Konrad Sztyber 2023-02-21 14:15:54 +01:00 committed by Ben Walker
parent 766ae96eaf
commit 2326924683
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/spdk/bdev_module.h
View File

@ -976,7 +976,8 @@ struct spdk_bdev_io {
* Queue entry used in several cases: * Queue entry used in several cases:
* 1. IOs awaiting retry due to NOMEM status, * 1. IOs awaiting retry due to NOMEM status,
* 2. IOs awaiting submission due to QoS, * 2. IOs awaiting submission due to QoS,
* 3. queued reset requests. * 3. IOs with an accel sequence being executed,
* 4. queued reset requests.
*/ */
TAILQ_ENTRY(spdk_bdev_io) link; TAILQ_ENTRY(spdk_bdev_io) link;

13
lib/bdev/bdev.c
View File

@ -289,6 +289,9 @@ struct spdk_bdev_channel {
*/ */
bdev_io_tailq_t io_locked; bdev_io_tailq_t io_locked;
/* List of I/Os with accel sequence being currently executed */
bdev_io_tailq_t io_accel_exec;
uint32_t flags; uint32_t flags;
struct spdk_histogram_data *histogram; struct spdk_histogram_data *histogram;
@ -984,6 +987,7 @@ bdev_io_submit_sequence_cb(void *ctx, int status)
bdev_io->u.bdev.accel_sequence = NULL; bdev_io->u.bdev.accel_sequence = NULL;
bdev_io->internal.accel_sequence = NULL; bdev_io->internal.accel_sequence = NULL;
TAILQ_REMOVE(&bdev_io->internal.ch->io_accel_exec, bdev_io, internal.link);
if (spdk_unlikely(status != 0)) { if (spdk_unlikely(status != 0)) {
SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", status); SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", status);
@ -1011,9 +1015,12 @@ bdev_io_exec_sequence(struct spdk_bdev_io *bdev_io, spdk_accel_completion_cb cb_
spdk_accel_sequence_reverse(bdev_io->internal.accel_sequence); spdk_accel_sequence_reverse(bdev_io->internal.accel_sequence);
} }
TAILQ_INSERT_TAIL(&bdev_io->internal.ch->io_accel_exec, bdev_io, internal.link);
rc = spdk_accel_sequence_finish(bdev_io->internal.accel_sequence, cb_fn, bdev_io); rc = spdk_accel_sequence_finish(bdev_io->internal.accel_sequence, cb_fn, bdev_io);
if (spdk_unlikely(rc != 0)) { if (spdk_unlikely(rc != 0)) {
SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", rc); SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", rc);
TAILQ_REMOVE(&bdev_io->internal.ch->io_accel_exec, bdev_io, internal.link);
bdev_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED; bdev_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED;
if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) { if (bdev_io->type == SPDK_BDEV_IO_TYPE_WRITE) {
/* Writes haven't been submitted at this point yet */ /* Writes haven't been submitted at this point yet */
@ -2999,7 +3006,9 @@ bdev_io_complete_parent_sequence_cb(void *ctx, int status)
assert(bdev_io->u.bdev.accel_sequence == NULL); assert(bdev_io->u.bdev.accel_sequence == NULL);
assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS); assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);
TAILQ_REMOVE(&bdev_io->internal.ch->io_accel_exec, bdev_io, internal.link);
bdev_io->internal.accel_sequence = NULL; bdev_io->internal.accel_sequence = NULL;
if (spdk_unlikely(status != 0)) { if (spdk_unlikely(status != 0)) {
SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", status); SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", status);
} }
@ -3468,6 +3477,7 @@ bdev_channel_destroy_resource(struct spdk_bdev_channel *ch)
assert(TAILQ_EMPTY(&ch->io_locked)); assert(TAILQ_EMPTY(&ch->io_locked));
assert(TAILQ_EMPTY(&ch->io_submitted)); assert(TAILQ_EMPTY(&ch->io_submitted));
assert(TAILQ_EMPTY(&ch->io_accel_exec));
assert(ch->io_outstanding == 0); assert(ch->io_outstanding == 0);
assert(shared_resource->ref > 0); assert(shared_resource->ref > 0);
shared_resource->ref--; shared_resource->ref--;
@ -3739,6 +3749,7 @@ bdev_channel_create(void *io_device, void *ctx_buf)
TAILQ_INIT(&ch->io_submitted); TAILQ_INIT(&ch->io_submitted);
TAILQ_INIT(&ch->io_locked); TAILQ_INIT(&ch->io_locked);
TAILQ_INIT(&ch->io_accel_exec);
ch->stat = bdev_alloc_io_stat(false); ch->stat = bdev_alloc_io_stat(false);
if (ch->stat == NULL) { if (ch->stat == NULL) {
@ -6816,7 +6827,9 @@ bdev_io_complete_sequence_cb(void *ctx, int status)
assert(bdev_io->u.bdev.accel_sequence == NULL); assert(bdev_io->u.bdev.accel_sequence == NULL);
assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS); assert(bdev_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS);
TAILQ_REMOVE(&bdev_io->internal.ch->io_accel_exec, bdev_io, internal.link);
bdev_io->internal.accel_sequence = NULL; bdev_io->internal.accel_sequence = NULL;
if (spdk_unlikely(status != 0)) { if (spdk_unlikely(status != 0)) {
SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", status); SPDK_ERRLOG("Failed to execute accel sequence, status=%d\n", status);
bdev_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED; bdev_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED;