diff options
| author |   James Smart <jsmart2021@gmail.com> | 2018-03-13 09:48:07 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-03-26 08:53:43 -0600 |
| commit | cf25809bec2c7df4b45df5b2196845d9a4a3c89b (patch) | |
| tree | e8c8fe8542d18c738af31cc9f4b61a785aabd3c9 /drivers/nvme | |
| parent | nvme-pci: disable APST for Samsung NVMe SSD 960 EVO + ASUS PRIME Z370-A (diff) | |
| download | linux-dev-cf25809bec2c7df4b45df5b2196845d9a4a3c89b.tar.xz linux-dev-cf25809bec2c7df4b45df5b2196845d9a4a3c89b.zip | |
nvme_fc: fix ctrl create failures racing with workq items
If there are errors during initial controller create, the transport
will teardown the partially initialized controller struct and free
the ctlr memory. Trouble is - most of those errors can occur due
to asynchronous events happening such io timeouts and subsystem
connectivity failures. Those failures invoke async workq items to
reset the controller and attempt reconnect. Those may be in progress
as the main thread frees the ctrl memory, resulting in NULL ptr oops.
Prevent this from happening by having the main ctrl failure thread
changing state to DELETING followed by synchronously cancelling any
pending queued work item. The change of state will prevent the
scheduling of resets or reconnect events.
Signed-off-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/fc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 7edaa30cb61b..56023878e3c0 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3123,6 +3123,10 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, } if (ret) { + nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_DELETING); + cancel_work_sync(&ctrl->ctrl.reset_work); + cancel_delayed_work_sync(&ctrl->connect_work); + /* couldn't schedule retry - fail out */ dev_err(ctrl->ctrl.device, "NVME-FC{%d}: Connect retry failed\n", ctrl->cnum); |