From 91165150cc50d0470ec97905ace9a6f776c1eda3 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Fri, 6 May 2022 13:38:18 +0900 Subject: [PATCH] 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: Shuhei Matsumoto Change-Id: I96bb6d0487fc67b71c759ee64200bd7fb71aceb1 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12561 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Michael Haeuptle Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki --- module/bdev/nvme/bdev_nvme.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/module/bdev/nvme/bdev_nvme.c b/module/bdev/nvme/bdev_nvme.c index 64f001012..e6cc319b9 100644 --- a/module/bdev/nvme/bdev_nvme.c +++ b/module/bdev/nvme/bdev_nvme.c @@ -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