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

nvme: disconnect() sets and reconnect_async() clears prepare_for_reset 



The following patches swaps the ordering of destrloying I/O qpairs
and disconnecting a controller for PCIe transport.

prepare_for_reset is a flag for PCIe transport.

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


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@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 736b9da0

lib/nvme/nvme_ctrlr.c

+4 −2
Original line number Diff line number Diff line
@@ -1634,8 +1634,6 @@ nvme_ctrlr_disconnect(struct spdk_nvme_ctrlr *ctrlr) 
{

	struct spdk_nvme_qpair	*qpair;



	ctrlr->prepare_for_reset = false;



	if (ctrlr->is_resetting || ctrlr->is_removed) {

		/*

		 * Controller is already resetting or has been removed. Return
@@ -1648,6 +1646,7 @@ nvme_ctrlr_disconnect(struct spdk_nvme_ctrlr *ctrlr) 
	ctrlr->is_resetting = true;

	ctrlr->is_failed = false;

	ctrlr->is_disconnecting = true;

	ctrlr->prepare_for_reset = true;



	NVME_CTRLR_NOTICELOG(ctrlr, "resetting controller\n");
@@ -1702,6 +1701,8 @@ spdk_nvme_ctrlr_reconnect_async(struct spdk_nvme_ctrlr *ctrlr) 
{

	nvme_robust_mutex_lock(&ctrlr->ctrlr_lock);



	ctrlr->prepare_for_reset = false;



	/* Set the state back to INIT to cause a full hardware reset. */

	nvme_ctrlr_set_state(ctrlr, NVME_CTRLR_STATE_INIT, NVME_TIMEOUT_INFINITE);
@@ -4157,6 +4158,7 @@ nvme_ctrlr_destruct_async(struct spdk_nvme_ctrlr *ctrlr, 


	NVME_CTRLR_DEBUGLOG(ctrlr, "Prepare to destruct SSD\n");



	ctrlr->prepare_for_reset = false;

	ctrlr->is_destructed = true;



	spdk_nvme_qpair_process_completions(ctrlr->adminq, 0);