Commit fcf52fbf authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

bdev/nvme: Reversed orderings for reset between PCIe and NVMe-oF 



As described in the NVMe specification, a controller level reset
includes the following actions:
- the controller stops processing any outstanding admin or I/O
  commands;
- all I/O SQs and CQs are deleted.

In a full controller reset sequence for a PCIe controller, if we do
a controller level reset first, we can abort outstanding commands
after the hardware has actually been stopped.

For NVMe-oF controller, each I/O qpair is an independent network
connection and is disconnected safely. We do not want to change
NVMe-oF controller.

Fixes the issue #2360

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: If05febac74705bfd3df5abd15064c1203126e027
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12447


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarMichael Haeuptle <michaelhaeuptle@gmail.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 09c7c768

module/bdev/nvme/bdev_nvme.c

+10 −5
Original line number Diff line number Diff line
@@ -1779,8 +1779,12 @@ bdev_nvme_reset_ctrlr(struct spdk_io_channel_iter *i, int status) 


	assert(status == 0);



	if (!spdk_nvme_ctrlr_is_fabrics(nvme_ctrlr->ctrlr)) {

		bdev_nvme_reconnect_ctrlr(nvme_ctrlr);

	} else {

		nvme_ctrlr_disconnect(nvme_ctrlr, bdev_nvme_reconnect_ctrlr);

	}

}



static void

bdev_nvme_reset_destroy_qpairs(struct nvme_ctrlr *nvme_ctrlr)
@@ -1799,11 +1803,12 @@ _bdev_nvme_reset(void *ctx) 
	assert(nvme_ctrlr->resetting == true);

	assert(nvme_ctrlr->thread == spdk_get_thread());



	spdk_nvme_ctrlr_prepare_for_reset(nvme_ctrlr->ctrlr);



	/* First, delete all NVMe I/O queue pairs. */

	if (!spdk_nvme_ctrlr_is_fabrics(nvme_ctrlr->ctrlr)) {

		nvme_ctrlr_disconnect(nvme_ctrlr, bdev_nvme_reset_destroy_qpairs);

	} else {

		bdev_nvme_reset_destroy_qpairs(nvme_ctrlr);

	}

}



static int

bdev_nvme_reset(struct nvme_ctrlr *nvme_ctrlr)

test/unit/lib/bdev/nvme/bdev_nvme.c/bdev_nvme_ut.c

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ DEFINE_STUB_V(spdk_nvme_ctrlr_register_aer_callback, (struct spdk_nvme_ctrlr *ct 
DEFINE_STUB_V(spdk_nvme_ctrlr_register_timeout_callback, (struct spdk_nvme_ctrlr *ctrlr,

		uint64_t timeout_io_us, uint64_t timeout_admin_us, spdk_nvme_timeout_cb cb_fn, void *cb_arg));



DEFINE_STUB(spdk_nvme_ctrlr_is_fabrics, bool, (struct spdk_nvme_ctrlr *ctrlr), true);



DEFINE_STUB(spdk_nvme_ctrlr_is_ocssd_supported, bool, (struct spdk_nvme_ctrlr *ctrlr), false);



DEFINE_STUB(spdk_nvme_ctrlr_cmd_abort, int, (struct spdk_nvme_ctrlr *ctrlr,