Skip to content

Commit 99dc264

Browse files
Ming Leikeithbusch
authored andcommitted
nvme-tcp: fix potential unbalanced freeze & unfreeze
Move start_freeze into nvme_tcp_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: 2875b0a ("nvme-tcp: 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 1b95e81 commit 99dc264

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/nvme/host/tcp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1868,6 +1868,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new)
18681868
goto out_cleanup_connect_q;
18691869

18701870
if (!new) {
1871+
nvme_start_freeze(ctrl);
18711872
nvme_unquiesce_io_queues(ctrl);
18721873
if (!nvme_wait_freeze_timeout(ctrl, NVME_IO_TIMEOUT)) {
18731874
/*
@@ -1876,6 +1877,7 @@ static int nvme_tcp_configure_io_queues(struct nvme_ctrl *ctrl, bool new)
18761877
* to be safe.
18771878
*/
18781879
ret = -ENODEV;
1880+
nvme_unfreeze(ctrl);
18791881
goto out_wait_freeze_timed_out;
18801882
}
18811883
blk_mq_update_nr_hw_queues(ctrl->tagset,
@@ -1980,7 +1982,6 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl,
19801982
if (ctrl->queue_count <= 1)
19811983
return;
19821984
nvme_quiesce_admin_queue(ctrl);
1983-
nvme_start_freeze(ctrl);
19841985
nvme_quiesce_io_queues(ctrl);
19851986
nvme_sync_io_queues(ctrl);
19861987
nvme_tcp_stop_io_queues(ctrl);

0 commit comments

Comments
 (0)