Commit 1e37a307 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: don't call nvme_init_ctrl_finish from nvme_passthru_end 



nvme_passthrough_end can race with a reset, which can lead to
racing stores to the cels xarray as well as further shengians
with upcoming more complicated initialization.

So drop the call and just log that the controller capabilities
might have changed and a reset could be required to use the new
controller capabilities.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Tested-by Gerd Bayer <gbayer@linxu.ibm.com>
parent 1b96f862

drivers/nvme/host/core.c

+4 −2
Original line number Diff line number Diff line
@@ -1123,8 +1123,10 @@ void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects, 
		mutex_unlock(&ctrl->subsys->lock);

		mutex_unlock(&ctrl->scan_lock);

	}

	if (effects & NVME_CMD_EFFECTS_CCC)

		nvme_init_ctrl_finish(ctrl);

	if (effects & NVME_CMD_EFFECTS_CCC) {

		dev_info(ctrl->device,

"controller capabilities changed, reset may be required to take effect.\n");

	}

	if (effects & (NVME_CMD_EFFECTS_NIC | NVME_CMD_EFFECTS_NCC)) {

		nvme_queue_scan(ctrl);

		flush_work(&ctrl->scan_work);