Commit d786a7ec authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

bdev_nvme: always use bdev_nvme_reset. 



When doing a controller reset on an nvme bdev, we should always use the
bdev_nvme_reset function which ensures that we destroy all of the I/O
qpairs before performing the reset. This prevents us from performing a
reset and leaving the I/O qpairs in a disabled state preventing I/O from
being processed.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent f57b098e

module/bdev/nvme/bdev_nvme.c

+16 −13
Original line number Diff line number Diff line
@@ -417,6 +417,11 @@ bdev_nvme_reset(struct nvme_bdev_ctrlr *nvme_bdev_ctrlr, struct nvme_bdev_io *bi 


	if (__atomic_test_and_set(&nvme_bdev_ctrlr->resetting, __ATOMIC_RELAXED)) {

		SPDK_NOTICELOG("Unable to perform reset, already in progress.\n");

		/*

		 * The internal reset calls won't be queued. This is on purpose so that we don't

		 * interfere with the app framework reset strategy. i.e. we are deferring to the

		 * upper level. If they are in the middle of a reset, we won't try to schedule another one.

		 */

		if (bio) {

			ch = spdk_get_io_channel(nvme_bdev_ctrlr);

			assert(ch != NULL);
@@ -949,14 +954,13 @@ static void 
spdk_nvme_abort_cpl(void *ctx, const struct spdk_nvme_cpl *cpl)

{

	struct spdk_nvme_ctrlr *ctrlr = ctx;

	int rc;

	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;



	if (spdk_nvme_cpl_is_error(cpl)) {

		SPDK_WARNLOG("Abort failed. Resetting controller.\n");

		rc = spdk_nvme_ctrlr_reset(ctrlr);

		if (rc) {

			SPDK_ERRLOG("Resetting controller failed.\n");

		}

		nvme_bdev_ctrlr = nvme_bdev_ctrlr_get(spdk_nvme_ctrlr_get_transport_id(ctrlr));

		assert(nvme_bdev_ctrlr != NULL);

		bdev_nvme_reset(nvme_bdev_ctrlr, NULL);

	}

}
@@ -966,16 +970,16 @@ timeout_cb(void *cb_arg, struct spdk_nvme_ctrlr *ctrlr, 
{

	int rc;

	union spdk_nvme_csts_register csts;

	struct nvme_bdev_ctrlr *nvme_bdev_ctrlr;



	SPDK_WARNLOG("Warning: Detected a timeout. ctrlr=%p qpair=%p cid=%u\n", ctrlr, qpair, cid);



	csts = spdk_nvme_ctrlr_get_regs_csts(ctrlr);

	if (csts.bits.cfs) {

		SPDK_ERRLOG("Controller Fatal Status, reset required\n");

		rc = spdk_nvme_ctrlr_reset(ctrlr);

		if (rc) {

			SPDK_ERRLOG("Resetting controller failed.\n");

		}

		nvme_bdev_ctrlr = nvme_bdev_ctrlr_get(spdk_nvme_ctrlr_get_transport_id(ctrlr));

		assert(nvme_bdev_ctrlr != NULL);

		bdev_nvme_reset(nvme_bdev_ctrlr, NULL);

		return;

	}
@@ -993,10 +997,9 @@ timeout_cb(void *cb_arg, struct spdk_nvme_ctrlr *ctrlr, 


	/* FALLTHROUGH */

	case SPDK_BDEV_NVME_TIMEOUT_ACTION_RESET:

		rc = spdk_nvme_ctrlr_reset(ctrlr);

		if (rc) {

			SPDK_ERRLOG("Resetting controller failed.\n");

		}

		nvme_bdev_ctrlr = nvme_bdev_ctrlr_get(spdk_nvme_ctrlr_get_transport_id(ctrlr));

		assert(nvme_bdev_ctrlr != NULL);

		bdev_nvme_reset(nvme_bdev_ctrlr, NULL);

		break;

	case SPDK_BDEV_NVME_TIMEOUT_ACTION_NONE:

		SPDK_DEBUGLOG(SPDK_LOG_BDEV_NVME, "No action for nvme controller timeout.\n");