Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44c6ec77 authored by James Smart's avatar James Smart Committed by Christoph Hellwig
Browse files

nvme-fc: change ctlr state assignments during reset/reconnect 



Clean up some of the controller state checks and add the
RESETTING->RECONNECTING state transition.

Specifically:
- the movement of the RESETTING state change and schedule of reset_work
  to core doesn't work wiht nvme_fc_error_recovery setting state to
  RECONNECTING before attempting to reset.  Remove the state change as
  the reset request does it.
- In the rare cases where an error occurs right as we're transitioning
  to LIVE, defer the controller start actions.
- In error handling on teardown of associations while performing initial
  controller creation - avoid quiesce calls on the admin_q.  They are
  unneeded.
- Add the RESETTING->RECONNECTING transition in the reset handler.

Signed-off-by: default avatarJames Smart <james.smart@broadcom.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 4054637c

drivers/nvme/host/fc.c

+13 −15
Original line number Diff line number Diff line
@@ -1884,13 +1884,6 @@ nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg) 
	dev_warn(ctrl->ctrl.device,

		"NVME-FC{%d}: resetting controller\n", ctrl->cnum);



	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RECONNECTING)) {

		dev_err(ctrl->ctrl.device,

			"NVME-FC{%d}: error_recovery: Couldn't change state "

			"to RECONNECTING\n", ctrl->cnum);

		return;

	}



	nvme_reset_ctrl(&ctrl->ctrl);

}
@@ -2528,10 +2521,10 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
	}



	changed = nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_LIVE);

	WARN_ON_ONCE(!changed);



	ctrl->ctrl.nr_reconnects = 0;



	if (changed)

		nvme_start_ctrl(&ctrl->ctrl);



	return 0;	/* Success */
@@ -2600,6 +2593,7 @@ nvme_fc_delete_association(struct nvme_fc_ctrl *ctrl) 
	 * use blk_mq_tagset_busy_itr() and the transport routine to

	 * terminate the exchanges.

	 */

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

		blk_mq_quiesce_queue(ctrl->ctrl.admin_q);

	blk_mq_tagset_busy_iter(&ctrl->admin_tag_set,

				nvme_fc_terminate_exchange, &ctrl->ctrl);
@@ -2649,12 +2643,8 @@ nvme_fc_delete_ctrl(struct nvme_ctrl *nctrl) 
static void

nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status)

{

	/* If we are resetting/deleting then do nothing */

	if (ctrl->ctrl.state != NVME_CTRL_RECONNECTING) {

		WARN_ON_ONCE(ctrl->ctrl.state == NVME_CTRL_NEW ||

			ctrl->ctrl.state == NVME_CTRL_LIVE);

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

		return;

	}



	dev_info(ctrl->ctrl.device,

		"NVME-FC{%d}: reset: Reconnect attempt failed (%d)\n",
@@ -2683,9 +2673,17 @@ nvme_fc_reset_ctrl_work(struct work_struct *work) 
	int ret;



	nvme_stop_ctrl(&ctrl->ctrl);



	/* will block will waiting for io to terminate */

	nvme_fc_delete_association(ctrl);



	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RECONNECTING)) {

		dev_err(ctrl->ctrl.device,

			"NVME-FC{%d}: error_recovery: Couldn't change state "

			"to RECONNECTING\n", ctrl->cnum);

		return;

	}



	ret = nvme_fc_create_association(ctrl);

	if (ret)

		nvme_fc_reconnect_or_delete(ctrl, ret);