Commit c8ed6cb5 authored by Daniel Wagner's avatar Daniel Wagner Committed by Keith Busch
Browse files

nvme-fc: use ctrl state getter 



Do not access the state variable directly, instead use proper
synchronization so not stale data is read.

Fixes: e6e7f7ac ("nvme: ensure reset state check ordering")
Signed-off-by: default avatarDaniel Wagner <wagi@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 2d1a2dab

drivers/nvme/host/fc.c

+6 −3
Original line number Diff line number Diff line
@@ -2087,7 +2087,8 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
		nvme_fc_complete_rq(rq);



check_error:

	if (terminate_assoc && ctrl->ctrl.state != NVME_CTRL_RESETTING)

	if (terminate_assoc &&

	    nvme_ctrl_state(&ctrl->ctrl) != NVME_CTRL_RESETTING)

		queue_work(nvme_reset_wq, &ctrl->ioerr_work);

}
@@ -2541,6 +2542,8 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) 
static void

nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg)

{

	enum nvme_ctrl_state state = nvme_ctrl_state(&ctrl->ctrl);



	/*

	 * if an error (io timeout, etc) while (re)connecting, the remote

	 * port requested terminating of the association (disconnect_ls)
@@ -2548,7 +2551,7 @@ 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.

	 */

	if (ctrl->ctrl.state == NVME_CTRL_CONNECTING) {

	if (state == NVME_CTRL_CONNECTING) {

		__nvme_fc_abort_outstanding_ios(ctrl, true);

		dev_warn(ctrl->ctrl.device,

			"NVME-FC{%d}: transport error during (re)connect\n",
@@ -2557,7 +2560,7 @@ nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg) 
	}



	/* Otherwise, only proceed if in LIVE state - e.g. on first error */

	if (ctrl->ctrl.state != NVME_CTRL_LIVE)

	if (state != NVME_CTRL_LIVE)

		return;



	dev_warn(ctrl->ctrl.device,