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

bdev/nvme: Factor out deleting all I/O qpairs for reset into a helper function 



The following patches will swap the ordering of destroying I/O qpairs
and disconnecting a controller for PCIe transport to fix a github issue.
For PCIe transport, destroying I/O qpairs will be as the completion
callback to controller disconnection. To do this easier, factor out
destroying I/O qpairs into a helper function.

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


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMichael Haeuptle <michaelhaeuptle@gmail.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 14273794

module/bdev/nvme/bdev_nvme.c

+10 −4
Original line number Diff line number Diff line
@@ -1778,6 +1778,15 @@ bdev_nvme_reset_ctrlr(struct spdk_io_channel_iter *i, int status) 
	assert(rc == 0);

}



static void

bdev_nvme_reset_destroy_qpairs(struct nvme_ctrlr *nvme_ctrlr)

{

	spdk_for_each_channel(nvme_ctrlr,

			      bdev_nvme_reset_destroy_qpair,

			      NULL,

			      bdev_nvme_reset_ctrlr);

}



static void

_bdev_nvme_reset(void *ctx)

{
@@ -1789,10 +1798,7 @@ _bdev_nvme_reset(void *ctx) 
	spdk_nvme_ctrlr_prepare_for_reset(nvme_ctrlr->ctrlr);



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

	spdk_for_each_channel(nvme_ctrlr,

			      bdev_nvme_reset_destroy_qpair,

			      NULL,

			      bdev_nvme_reset_ctrlr);

	bdev_nvme_reset_destroy_qpairs(nvme_ctrlr);

}



static int