Skip to content

Commit c21fddc

Browse files
Ming Leigregkh
authored andcommitted
nvme-rdma: fix potential unbalanced freeze & unfreeze
commit 29b434d upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent cddbaa8 commit c21fddc

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
@@ -923,6 +923,7 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
923923
goto out_cleanup_tagset;
924924

925925
if (!new) {
926+
nvme_start_freeze(&ctrl->ctrl);
926927
nvme_start_queues(&ctrl->ctrl);
927928
if (!nvme_wait_freeze_timeout(&ctrl->ctrl, NVME_IO_TIMEOUT)) {
928929
/*
@@ -931,6 +932,7 @@ static int nvme_rdma_configure_io_queues(struct nvme_rdma_ctrl *ctrl, bool new)
931932
* to be safe.
932933
*/
933934
ret = -ENODEV;
935+
nvme_unfreeze(&ctrl->ctrl);
934936
goto out_wait_freeze_timed_out;
935937
}
936938
blk_mq_update_nr_hw_queues(ctrl->ctrl.tagset,
@@ -980,7 +982,6 @@ static void nvme_rdma_teardown_io_queues(struct nvme_rdma_ctrl *ctrl,
980982
bool remove)
981983
{
982984
if (ctrl->ctrl.queue_count > 1) {
983-
nvme_start_freeze(&ctrl->ctrl);
984985
nvme_stop_queues(&ctrl->ctrl);
985986
nvme_sync_io_queues(&ctrl->ctrl);
986987
nvme_rdma_stop_io_queues(ctrl);

0 commit comments

Comments
 (0)