Revert "nvme-fc: fix race between error recovery and creating association"
Subsystems (2)
PATCH 1/1 Revert "nvme-fc: fix race between error recovery and creating association"
From: Keith Busch <[email protected]>
The commit was identified to be might sleep in invalid context and is blocking regression testing.
This reverts commit ee6fdc5055e916b1dd497f11260d4901c4c1e55e.
Link https://lore.kernel.org/linux-nvme/hkhl56n665uvc6t5d6h3wtx7utkcorw4xlwi7d2t2bnonavhe6@xaan6pu43ap6/ open here
Reported-by Daniel Wagner <[email protected]>
Reported-by Maurizio Lombardi <[email protected]>
Cc Michael Liang <[email protected]>
Signed-off-by Keith Busch <[email protected]>
--- drivers/nvme/host/fc.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
drivers/nvme/host/fc.c +5 -16
@@ -2548,24 +2548,17 @@ nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg)* the controller. Abort any ios on the association and let the * create_association error path resolve things. */ -enum nvme_ctrl_state state; -unsigned long flags; - -spin_lock_irqsave (&ctrl->lock, flags); - state = ctrl->ctrl.state; -if (state ==NVME_CTRL_CONNECTING ) { -set_bit (ASSOC_FAILED , &ctrl->flags); -spin_unlock_irqrestore (&ctrl->lock, flags); +if (ctrl->ctrl.state ==NVME_CTRL_CONNECTING ) {__nvme_fc_abort_outstanding_ios (ctrl, true); +set_bit (ASSOC_FAILED , &ctrl->flags);dev_warn (ctrl->ctrl.device,"NVME-FC{%d}: transport error during (re)connect\n" , ctrl->cnum);return ; } -spin_unlock_irqrestore (&ctrl->lock, flags);/* Otherwise, only proceed if in LIVE state - e.g. on first error */ -if (state !=NVME_CTRL_LIVE ) +if (ctrl->ctrl.state !=NVME_CTRL_LIVE )return ; dev_warn(ctrl->ctrl.device,
@@ -3180,16 +3173,12 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)else ret =nvme_fc_recreate_io_queues (ctrl); } - -spin_lock_irqsave (&ctrl->lock, flags);if (!ret &&test_bit (ASSOC_FAILED , &ctrl->flags)) ret = -EIO ; -if (ret) { -spin_unlock_irqrestore (&ctrl->lock, flags); +if (ret) goto out_term_aen_ops; - } + changed =nvme_change_ctrl_state (&ctrl->ctrl,NVME_CTRL_LIVE ); -spin_unlock_irqrestore (&ctrl->lock, flags); ctrl->ctrl.nr_reconnects =0 ;
Signature · 1 line
2.34.1
Quoted 5 lines · Keith Busch
From: Keith Busch <[email protected]>
The commit was identified to be might sleep in invalid context and is blocking regression testing.
Quoted 8 lines
This reverts commit
ee6fdc5055e916b1dd497f11260d4901c4c1e55e.Link https://lore.kernel.org/linux-nvme/hkhl56n665uvc6t5d6h3wtx7utkcorw4xlwi7d2t2bnonavhe6@xaan6pu43ap6/ open hereReported-by Daniel Wagner <[email protected]>Reported-by Maurizio Lombardi <[email protected]>Cc Michael Liang <[email protected]>Signed-off-by Keith Busch <[email protected]>
Thanks!
Tested-by Daniel Wagner <[email protected]>
Reviewed-by Daniel Wagner <[email protected]>
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Reviewed-by Sagi Grimberg <[email protected]>