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

nvme: Split nvme_ctrlr_reset() into discrete parts

Browse Source 
Split the NVMe controller reset into pre-init and reinit stages so
that the latter begins with a call to nvme_ctrlr_process_init(),
returning -EAGAIN if the controller is not yet ready so that a poller
can call it again later.

Signed-off-by: Jonathan Teh <jonathan.teh@mayadata.io>
Change-Id: Ia182b04e438241b139109be93f3ed858fac7f3d4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8486
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Jonathan Teh 2021-06-23 16:14:01 +01:00 committed by Tomasz Zawadzki
parent e1e73440d3
commit 3387fbbc41
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/spdk/nvme.h
View File

@ -1030,6 +1030,7 @@ struct spdk_nvme_ctrlr_reset_ctx;
* *
* \return 0 on success. * \return 0 on success.
* \return -ENOMEM if context could not be allocated. * \return -ENOMEM if context could not be allocated.
* \return -EBUSY if controller is already resetting.
* \return -ENXIO if controller has been removed. * \return -ENXIO if controller has been removed.
* *
*/ */

44
lib/nvme/nvme_ctrlr.c
View File

@ -1391,9 +1391,8 @@ nvme_ctrlr_abort_queued_aborts(struct spdk_nvme_ctrlr *ctrlr)
} }
static int static int
nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) nvme_ctrlr_reset_pre(struct spdk_nvme_ctrlr *ctrlr)
{ {
int rc = 0, rc_tmp = 0;
struct spdk_nvme_qpair *qpair; struct spdk_nvme_qpair *qpair;
nvme_robust_mutex_lock(&ctrlr->ctrlr_lock); nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);
@ -1405,7 +1404,7 @@ nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)
* reset in these cases. * reset in these cases.
*/ */
nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock); nvme_robust_mutex_unlock(&ctrlr->ctrlr_lock);
return ctrlr->is_resetting ? 0 : -ENXIO; return ctrlr->is_resetting ? -EBUSY : -ENXIO;
} }
ctrlr->is_resetting = true; ctrlr->is_resetting = true;
@ -1437,12 +1436,26 @@ nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)
/* Set the state back to INIT to cause a full hardware reset. */ /* Set the state back to INIT to cause a full hardware reset. */
nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_INIT, NVME_TIMEOUT_INFINITE); nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_INIT, NVME_TIMEOUT_INFINITE);
while (ctrlr->state != NVME_CTRLR_STATE_READY) { /* Return without releasing ctrlr_lock. ctrlr_lock will be released when spdk_nvme_ctrlr_reset_poll_async() returns 0. */
return 0;
}
/**
* This function will be called when the controller is being reinitialized.
* Note: the ctrlr_lock must be held when calling this function.
*/
static int
nvme_ctrlr_reinit_on_reset(struct spdk_nvme_ctrlr *ctrlr)
{
struct spdk_nvme_qpair *qpair;
int rc = 0, rc_tmp = 0;
if (nvme_ctrlr_process_init(ctrlr) != 0) { if (nvme_ctrlr_process_init(ctrlr) != 0) {
NVME_CTRLR_ERRLOG(ctrlr, "controller reinitialization failed\n"); NVME_CTRLR_ERRLOG(ctrlr, "controller reinitialization failed\n");
rc = -1; rc = -1;
break;
} }
if (ctrlr->state != NVME_CTRLR_STATE_READY && rc != -1) {
return -EAGAIN;
} }
/* /*
@ -1495,7 +1508,9 @@ nvme_ctrlr_reset_ctx_init(struct spdk_nvme_ctrlr_reset_ctx *ctrlr_reset_ctx,
static int static int
nvme_ctrlr_reset_poll_async(struct spdk_nvme_ctrlr_reset_ctx *ctrlr_reset_ctx) nvme_ctrlr_reset_poll_async(struct spdk_nvme_ctrlr_reset_ctx *ctrlr_reset_ctx)
{ {
return nvme_ctrlr_reset(ctrlr_reset_ctx->ctrlr); struct spdk_nvme_ctrlr *ctrlr = ctrlr_reset_ctx->ctrlr;
return nvme_ctrlr_reinit_on_reset(ctrlr);
} }
int int
@ -1519,24 +1534,37 @@ spdk_nvme_ctrlr_reset_async(struct spdk_nvme_ctrlr *ctrlr,
struct spdk_nvme_ctrlr_reset_ctx **reset_ctx) struct spdk_nvme_ctrlr_reset_ctx **reset_ctx)
{ {
struct spdk_nvme_ctrlr_reset_ctx *ctrlr_reset_ctx; struct spdk_nvme_ctrlr_reset_ctx *ctrlr_reset_ctx;
int rc;
ctrlr_reset_ctx = calloc(1, sizeof(*ctrlr_reset_ctx)); ctrlr_reset_ctx = calloc(1, sizeof(*ctrlr_reset_ctx));
if (!ctrlr_reset_ctx) { if (!ctrlr_reset_ctx) {
return -ENOMEM; return -ENOMEM;
} }
rc = nvme_ctrlr_reset_pre(ctrlr);
if (rc != 0) {
free(ctrlr_reset_ctx);
} else {
nvme_ctrlr_reset_ctx_init(ctrlr_reset_ctx, ctrlr); nvme_ctrlr_reset_ctx_init(ctrlr_reset_ctx, ctrlr);
*reset_ctx = ctrlr_reset_ctx; *reset_ctx = ctrlr_reset_ctx;
}
return 0; return rc;
} }
int int
spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr) spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)
{ {
struct spdk_nvme_ctrlr_reset_ctx reset_ctx = {}; struct spdk_nvme_ctrlr_reset_ctx reset_ctx = {};
int rc = 0; int rc;
rc = nvme_ctrlr_reset_pre(ctrlr);
if (rc != 0) {
if (rc == -EBUSY) {
rc = 0;
}
return rc;
}
nvme_ctrlr_reset_ctx_init(&reset_ctx, ctrlr); nvme_ctrlr_reset_ctx_init(&reset_ctx, ctrlr);
while (true) { while (true) {