Skip to content

Commit 29b434d

Browse files
Ming Leikeithbusch
authored andcommitted
nvme-rdma: fix potential unbalanced freeze & unfreeze
Move start_freeze into nvme_rdma_configure_io_queues(), and there is at least two benefits: 1) fix unbalanced freeze and unfreeze, since re-connection work may fail or be broken by removal 2) IO during error recovery can be failfast quickly because nvme fabrics unquiesces queues after teardown. One side-effect is that !mpath request may timeout during connecting because of queue topo change, but that looks not one big deal: 1) same problem exists with current code base 2) compared with !mpath, mpath use case is dominant Fixes: 9f98772 ("nvme-rdma: fix controller reset hang during traffic") Cc: stable@vger.kernel.org Signed-off-by: Ming Lei <ming.lei@redhat.com> Tested-by: Yi Zhang <yi.zhang@redhat.com> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent 99dc264 commit 29b434d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/nvme/host/rdma.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,7 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
883883
goto out_cleanup_tagset;
884884

885885
if (!new) {
886+
nvme_start_freeze(&ctrl->ctrl);
886887
nvme_unquiesce_io_queues(&ctrl->ctrl);
887888
if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) {
888889
/*
@@ -891,6 +892,7 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
891892
* to be safe.
892893
*/
893894
ret = -ENODEV;
895+
nvme_unfreeze(&ctrl->ctrl);
894896
goto out_wait_freeze_timed_out;
895897
}
896898
blk_mq_update_nr_hw_queues(ctrl->ctrl.tagset,
@@ -940,7 +942,6 @@ static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl,
940942
bool remove)
941943
{
942944
if (ctrl->ctrl.queue_count > 1) {
943-
nvme_start_freeze(&ctrl->ctrl);
944945
nvme_quiesce_io_queues(&ctrl->ctrl);
945946
nvme_sync_io_queues(&ctrl->ctrl);
946947
nvme_rdma_stop_io_queues(ctrl);

0 commit comments

Comments
 (0)