Commit 584a6302 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

nvme: don't fail the ctrlr from ctrlr_process_init 



If we are to have multiple reconnect attempts, we have to control
whetehr the controller is placed in the failed state from outside the
reset function itself. This will allow us to fail the controller only
after all of our retries are exhausted.

Change-Id: Ia82e10325272f25b2b8527336dc3bc507c93b401
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469932


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent f5d88e46

lib/nvme/nvme.c

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ nvme_ctrlr_poll_internal(struct spdk_nvme_ctrlr *ctrlr, 
		/* Controller failed to initialize. */

		TAILQ_REMOVE(&probe_ctx->init_ctrlrs, ctrlr, tailq);

		SPDK_ERRLOG("Failed to initialize SSD: %s\n", ctrlr->trid.traddr);

		nvme_ctrlr_fail(ctrlr, false);

		nvme_ctrlr_destruct(ctrlr);

		return rc;

	}

lib/nvme/nvme_ctrlr.c

+0 −5
Original line number Diff line number Diff line
@@ -2114,7 +2114,6 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) 
			goto init_timeout;

		}

		SPDK_ERRLOG("Failed to read CC and CSTS in state %d\n", ctrlr->state);

		nvme_ctrlr_fail(ctrlr, false);

		return -EIO;

	}
@@ -2161,7 +2160,6 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) 
			cc.bits.en = 0;

			if (nvme_ctrlr_set_cc(ctrlr, &cc)) {

				SPDK_ERRLOG("set_cc() failed\n");

				nvme_ctrlr_fail(ctrlr, false);

				return -EIO;

			}

			nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_DISABLE_WAIT_FOR_READY_0, ready_timeout_in_ms);
@@ -2193,7 +2191,6 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) 
			cc.bits.en = 0;

			if (nvme_ctrlr_set_cc(ctrlr, &cc)) {

				SPDK_ERRLOG("set_cc() failed\n");

				nvme_ctrlr_fail(ctrlr, false);

				return -EIO;

			}

			nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_DISABLE_WAIT_FOR_READY_0, ready_timeout_in_ms);
@@ -2348,7 +2345,6 @@ nvme_ctrlr_process_init(struct spdk_nvme_ctrlr *ctrlr) 


	default:

		assert(0);

		nvme_ctrlr_fail(ctrlr, false);

		return -1;

	}
@@ -2356,7 +2352,6 @@ init_timeout: 
	if (ctrlr->state_timeout_tsc != NVME_TIMEOUT_INFINITE &&

	    spdk_get_ticks() > ctrlr->state_timeout_tsc) {

		SPDK_ERRLOG("Initialization timed out in state %d\n", ctrlr->state);

		nvme_ctrlr_fail(ctrlr, false);

		return -1;

	}

test/unit/lib/nvme/nvme.c/nvme_ut.c

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 


DEFINE_STUB_V(nvme_ctrlr_proc_get_ref, (struct spdk_nvme_ctrlr *ctrlr));

DEFINE_STUB_V(nvme_ctrlr_proc_put_ref, (struct spdk_nvme_ctrlr *ctrlr));

DEFINE_STUB_V(nvme_ctrlr_fail, (struct spdk_nvme_ctrlr *ctrlr, bool hotremove));

DEFINE_STUB(spdk_nvme_transport_available, bool,

	    (enum spdk_nvme_transport_type trtype), true);

/* return anything non-NULL, this won't be deferenced anywhere in this test */