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

Commit ad6a0a52 authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Sagi Grimberg
Browse files

nvme: rename NVME_CTRL_RECONNECTING state to NVME_CTRL_CONNECTING 



In pci transport, this state is used to mark the initialization
process. This should be also used in other transports as well.

Signed-off-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarJames Smart <james.smart@broadcom.com>
Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
parent a7877390

drivers/nvme/host/core.c

+5 −5
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
	switch (new_state) {

	case NVME_CTRL_ADMIN_ONLY:

		switch (old_state) {

		case NVME_CTRL_RECONNECTING:

		case NVME_CTRL_CONNECTING:

			changed = true;

			/* FALLTHRU */

		default:
@@ -276,7 +276,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
		switch (old_state) {

		case NVME_CTRL_NEW:

		case NVME_CTRL_RESETTING:

		case NVME_CTRL_RECONNECTING:

		case NVME_CTRL_CONNECTING:

			changed = true;

			/* FALLTHRU */

		default:
@@ -294,7 +294,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
			break;

		}

		break;

	case NVME_CTRL_RECONNECTING:

	case NVME_CTRL_CONNECTING:

		switch (old_state) {

		case NVME_CTRL_LIVE:

		case NVME_CTRL_RESETTING:
@@ -309,7 +309,7 @@ bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, 
		case NVME_CTRL_LIVE:

		case NVME_CTRL_ADMIN_ONLY:

		case NVME_CTRL_RESETTING:

		case NVME_CTRL_RECONNECTING:

		case NVME_CTRL_CONNECTING:

			changed = true;

			/* FALLTHRU */

		default:
@@ -2687,7 +2687,7 @@ static ssize_t nvme_sysfs_show_state(struct device *dev, 
		[NVME_CTRL_LIVE]	= "live",

		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",

		[NVME_CTRL_RESETTING]	= "resetting",

		[NVME_CTRL_RECONNECTING]= "reconnecting",

		[NVME_CTRL_CONNECTING]	= "connecting",

		[NVME_CTRL_DELETING]	= "deleting",

		[NVME_CTRL_DEAD]	= "dead",

	};

drivers/nvme/host/fabrics.h

+5 −4
Original line number Diff line number Diff line
@@ -171,13 +171,14 @@ static inline blk_status_t nvmf_check_init_req(struct nvme_ctrl *ctrl, 
	    cmd->common.opcode != nvme_fabrics_command ||

	    cmd->fabrics.fctype != nvme_fabrics_type_connect) {

		/*

		 * Reconnecting state means transport disruption, which can take

		 * a long time and even might fail permanently, fail fast to

		 * give upper layers a chance to failover.

		 * Connecting state means transport disruption or initial

		 * establishment, which can take a long time and even might

		 * fail permanently, fail fast to give upper layers a chance

		 * to failover.

		 * Deleting state means that the ctrl will never accept commands

		 * again, fail it permanently.

		 */

		if (ctrl->state == NVME_CTRL_RECONNECTING ||

		if (ctrl->state == NVME_CTRL_CONNECTING ||

		    ctrl->state == NVME_CTRL_DELETING) {

			nvme_req(rq)->status = NVME_SC_ABORT_REQ;

			return BLK_STS_IOERR;

drivers/nvme/host/fc.c

+7 −7
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ nvme_fc_resume_controller(struct nvme_fc_ctrl *ctrl) 
{

	switch (ctrl->ctrl.state) {

	case NVME_CTRL_NEW:

	case NVME_CTRL_RECONNECTING:

	case NVME_CTRL_CONNECTING:

		/*

		 * As all reconnects were suppressed, schedule a

		 * connect.
@@ -777,7 +777,7 @@ nvme_fc_ctrl_connectivity_loss(struct nvme_fc_ctrl *ctrl) 
		}

		break;



	case NVME_CTRL_RECONNECTING:

	case NVME_CTRL_CONNECTING:

		/*

		 * The association has already been terminated and the

		 * controller is attempting reconnects.  No need to do anything
@@ -1722,7 +1722,7 @@ nvme_fc_fcpio_done(struct nvmefc_fcp_req *req) 
	if (status &&

	    (blk_queue_dying(rq->q) ||

	     ctrl->ctrl.state == NVME_CTRL_NEW ||

	     ctrl->ctrl.state == NVME_CTRL_RECONNECTING))

	     ctrl->ctrl.state == NVME_CTRL_CONNECTING))

		status |= cpu_to_le16(NVME_SC_DNR << 1);



	if (__nvme_fc_fcpop_chk_teardowns(ctrl, op))
@@ -2943,7 +2943,7 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status) 
	unsigned long recon_delay = ctrl->ctrl.opts->reconnect_delay * HZ;

	bool recon = true;



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

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

		return;



	if (portptr->port_state == FC_OBJSTATE_ONLINE)
@@ -2991,10 +2991,10 @@ nvme_fc_reset_ctrl_work(struct work_struct *work) 
	/* will block will waiting for io to terminate */

	nvme_fc_delete_association(ctrl);



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

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

		dev_err(ctrl->ctrl.device,

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

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

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

		return;

	}
@@ -3195,7 +3195,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	 * transport errors (frame drop, LS failure) inherently must kill

	 * the association. The transport is coded so that any command used

	 * to create the association (prior to a LIVE state transition

	 * while NEW or RECONNECTING) will fail if it completes in error or

	 * while NEW or CONNECTING) will fail if it completes in error or

	 * times out.

	 *

	 * As such: as the connect request was mostly likely due to a

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ enum nvme_ctrl_state { 
	NVME_CTRL_LIVE,

	NVME_CTRL_ADMIN_ONLY,    /* Only admin queue live */

	NVME_CTRL_RESETTING,

	NVME_CTRL_RECONNECTING,

	NVME_CTRL_CONNECTING,

	NVME_CTRL_DELETING,

	NVME_CTRL_DEAD,

};

drivers/nvme/host/pci.c

+4 −4
Original line number Diff line number Diff line
@@ -1141,7 +1141,7 @@ static bool nvme_should_reset(struct nvme_dev *dev, u32 csts) 
	/* If there is a reset/reinit ongoing, we shouldn't reset again. */

	switch (dev->ctrl.state) {

	case NVME_CTRL_RESETTING:

	case NVME_CTRL_RECONNECTING:

	case NVME_CTRL_CONNECTING:

		return false;

	default:

		break;
@@ -2288,12 +2288,12 @@ static void nvme_reset_work(struct work_struct *work) 
		nvme_dev_disable(dev, false);



	/*

	 * Introduce RECONNECTING state from nvme-fc/rdma transports to mark the

	 * Introduce CONNECTING state from nvme-fc/rdma transports to mark the

	 * initializing procedure here.

	 */

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

	if (!nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_CONNECTING)) {

		dev_warn(dev->ctrl.device,

			"failed to mark controller RECONNECTING\n");

			"failed to mark controller CONNECTING\n");

		goto out;

	}