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

bdev/nvme: Use cb_arg of for_each_channel() to pass result of reset

Browse Source 
Restore the previous nice idea and unify canceling pending resets
into bdev_nvme_complete_pending_resets().

cb_arg of spdk_for_each_channel() was reserved for a different
purpose but it was gone.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I1c01051ae9d8eccc7fc3ec485dd344ff9f55087b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9815
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Shuhei Matsumoto 2021-10-07 00:49:49 +09:00 committed by Tomasz Zawadzki
parent 8786f215e3
commit 6dba57eb26
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
module/bdev/nvme/bdev_nvme.c
View File

@ -907,36 +907,22 @@ bdev_nvme_check_pending_destruct(struct spdk_io_channel_iter *i, int status)
} }
static void static void
_bdev_nvme_complete_pending_resets(struct nvme_ctrlr_channel *ctrlr_ch, bdev_nvme_complete_pending_resets(struct spdk_io_channel_iter *i)
enum spdk_bdev_io_status status)
{ {
struct spdk_io_channel *_ch = spdk_io_channel_iter_get_channel(i);
struct nvme_ctrlr_channel *ctrlr_ch = spdk_io_channel_get_ctx(_ch);
enum spdk_bdev_io_status status = SPDK_BDEV_IO_STATUS_SUCCESS;
struct spdk_bdev_io *bdev_io; struct spdk_bdev_io *bdev_io;
if (spdk_io_channel_iter_get_ctx(i) != NULL) {
status = SPDK_BDEV_IO_STATUS_FAILED;
}
while (!TAILQ_EMPTY(&ctrlr_ch->pending_resets)) { while (!TAILQ_EMPTY(&ctrlr_ch->pending_resets)) {
bdev_io = TAILQ_FIRST(&ctrlr_ch->pending_resets); bdev_io = TAILQ_FIRST(&ctrlr_ch->pending_resets);
TAILQ_REMOVE(&ctrlr_ch->pending_resets, bdev_io, module_link); TAILQ_REMOVE(&ctrlr_ch->pending_resets, bdev_io, module_link);
spdk_bdev_io_complete(bdev_io, status); spdk_bdev_io_complete(bdev_io, status);
} }
}
static void
bdev_nvme_complete_pending_resets(struct spdk_io_channel_iter *i)
{
struct spdk_io_channel *_ch = spdk_io_channel_iter_get_channel(i);
struct nvme_ctrlr_channel *ctrlr_ch = spdk_io_channel_get_ctx(_ch);
_bdev_nvme_complete_pending_resets(ctrlr_ch, SPDK_BDEV_IO_STATUS_SUCCESS);
spdk_for_each_channel_continue(i, 0);
}
static void
bdev_nvme_abort_pending_resets(struct spdk_io_channel_iter *i)
{
struct spdk_io_channel *_ch = spdk_io_channel_iter_get_channel(i);
struct nvme_ctrlr_channel *ctrlr_ch = spdk_io_channel_get_ctx(_ch);
_bdev_nvme_complete_pending_resets(ctrlr_ch, SPDK_BDEV_IO_STATUS_FAILED);
spdk_for_each_channel_continue(i, 0); spdk_for_each_channel_continue(i, 0);
} }
@ -980,9 +966,8 @@ bdev_nvme_reset_complete(struct nvme_ctrlr *nvme_ctrlr, bool success)
/* Make sure we clear any pending resets before returning. */ /* Make sure we clear any pending resets before returning. */
spdk_for_each_channel(nvme_ctrlr, spdk_for_each_channel(nvme_ctrlr,
success ? bdev_nvme_complete_pending_resets : bdev_nvme_complete_pending_resets,
bdev_nvme_abort_pending_resets, success ? NULL : (void *)0x1,
NULL,
bdev_nvme_check_pending_destruct); bdev_nvme_check_pending_destruct);
} }