diff options
| author | James Smart <jsmart2021@gmail.com> | 2021-03-08 16:51:26 -0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2021-03-11 11:48:35 +0100 |
| commit | f20ef34d71abc1fc56b322aaa251f90f94320140 (patch) | |
| tree | f018f2427cba5acffc7f0199d04e1f3cb6c9edb2 | |
| parent | ae3afe6308b43bbf49953101d4ba2c1c481133a8 (diff) | |
| download | linux-f20ef34d71abc1fc56b322aaa251f90f94320140.tar.gz | |
nvme-fc: fix racing controller reset and create association
Recent patch to prevent calling __nvme_fc_abort_outstanding_ios in
interrupt context results in a possible race condition. A controller
reset results in errored io completions, which schedules error
work. The change of error work to a work element allows it to fire
after the ctrl state transition to NVME_CTRL_CONNECTING, causing
any outstanding io (used to initialize the controller) to fail and
cause problems for connect_work.
Add a state check to only schedule error work if not in the RESETTING
state.
Fixes: 19fce0470f05 ("nvme-fc: avoid calling _nvme_fc_abort_outstanding_ios from interrupt context")
Signed-off-by: Nigel Kirkland <nkirkland2304@gmail.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/nvme/host/fc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 97e3424c7b0321..73d0737483891b 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2055,7 +2055,7 @@ done: nvme_fc_complete_rq(rq); check_error: - if (terminate_assoc) + if (terminate_assoc && ctrl->ctrl.state != NVME_CTRL_RESETTING) queue_work(nvme_reset_wq, &ctrl->ioerr_work); } |