d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bdev/nvme: Use enum to select operations after reset complete

Browse Source 
This is a clean up as a preparation to the following patches.

Signed-off-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: Ib8bc90e17f52086d4e887463e04f65273bb1079b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11068
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Shuhei Matsumoto 2022-01-13 13:23:51 +09:00 committed by Tomasz Zawadzki
parent 962c4c3800
commit f85370b168
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1285,6 +1285,24 @@ bdev_nvme_failover_trid(struct nvme_ctrlr *nvme_ctrlr, bool remove)
} }
} }
enum bdev_nvme_op_after_reset {
OP_NONE,
OP_COMPLETE_PENDING_DESTRUCT,
};
typedef enum bdev_nvme_op_after_reset _bdev_nvme_op_after_reset;
static _bdev_nvme_op_after_reset
bdev_nvme_check_op_after_reset(struct nvme_ctrlr *nvme_ctrlr, bool success)
{
if (nvme_ctrlr_can_be_unregistered(nvme_ctrlr)) {
/* Complete pending destruct after reset completes. */
return OP_COMPLETE_PENDING_DESTRUCT;
}
return OP_NONE;
}
static void static void
_bdev_nvme_reset_complete(struct spdk_io_channel_iter *i, int status) _bdev_nvme_reset_complete(struct spdk_io_channel_iter *i, int status)
{ {
@ -1293,7 +1311,7 @@ _bdev_nvme_reset_complete(struct spdk_io_channel_iter *i, int status)
struct nvme_path_id *path_id; struct nvme_path_id *path_id;
bdev_nvme_reset_cb reset_cb_fn = nvme_ctrlr->reset_cb_fn; bdev_nvme_reset_cb reset_cb_fn = nvme_ctrlr->reset_cb_fn;
void *reset_cb_arg = nvme_ctrlr->reset_cb_arg; void *reset_cb_arg = nvme_ctrlr->reset_cb_arg;
bool complete_pending_destruct = false; enum bdev_nvme_op_after_reset op_after_reset;
assert(nvme_ctrlr->thread == spdk_get_thread()); assert(nvme_ctrlr->thread == spdk_get_thread());
@ -1315,10 +1333,7 @@ _bdev_nvme_reset_complete(struct spdk_io_channel_iter *i, int status)
path_id->is_failed = !success; path_id->is_failed = !success;
if (nvme_ctrlr_can_be_unregistered(nvme_ctrlr)) { op_after_reset = bdev_nvme_check_op_after_reset(nvme_ctrlr, success);
/* Complete pending destruct after reset completes. */
complete_pending_destruct = true;
}
pthread_mutex_unlock(&nvme_ctrlr->mutex); pthread_mutex_unlock(&nvme_ctrlr->mutex);
@ -1326,8 +1341,12 @@ _bdev_nvme_reset_complete(struct spdk_io_channel_iter *i, int status)
reset_cb_fn(reset_cb_arg, success); reset_cb_fn(reset_cb_arg, success);
} }
if (complete_pending_destruct) { switch (op_after_reset) {
case OP_COMPLETE_PENDING_DESTRUCT:
nvme_ctrlr_unregister(nvme_ctrlr); nvme_ctrlr_unregister(nvme_ctrlr);
break;
default:
break;
} }
} }