Commit f25f8ef7 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

nvme-fc: short-circuit reconnect retries 



Returning an nvme status from nvme_fc_create_association() indicates
that the association is established, and we should honour the DNR bit.
If it's set a reconnect attempt will just return the same error, so
we can short-circuit the reconnect attempts and fail the connection
directly.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3596a065

drivers/nvme/host/fc.c

+17 −8
Original line number Original line Diff line number Diff line
@@ -3107,6 +3107,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
	if (ctrl->ctrl.icdoff) {

	if (ctrl->ctrl.icdoff) {

		dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n",

		dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n",

				ctrl->ctrl.icdoff);

				ctrl->ctrl.icdoff);

		ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;

		goto out_disconnect_admin_queue;

		goto out_disconnect_admin_queue;

	}

	}
@@ -3114,6 +3115,7 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl) 
	if (!(ctrl->ctrl.sgls & ((1 << 0) | (1 << 1)))) {

	if (!(ctrl->ctrl.sgls & ((1 << 0) | (1 << 1)))) {

		dev_err(ctrl->ctrl.device,

		dev_err(ctrl->ctrl.device,

			"Mandatory sgls are not supported!\n");

			"Mandatory sgls are not supported!\n");

		ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;

		goto out_disconnect_admin_queue;

		goto out_disconnect_admin_queue;

	}

	}
@@ -3280,11 +3282,13 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status) 
	if (ctrl->ctrl.state != NVME_CTRL_CONNECTING)

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

		return;

		return;





	if (portptr->port_state == FC_OBJSTATE_ONLINE)

	if (portptr->port_state == FC_OBJSTATE_ONLINE) {

		dev_info(ctrl->ctrl.device,

		dev_info(ctrl->ctrl.device,

			"NVME-FC{%d}: reset: Reconnect attempt failed (%d)\n",

			"NVME-FC{%d}: reset: Reconnect attempt failed (%d)\n",

			ctrl->cnum, status);

			ctrl->cnum, status);

	else if (time_after_eq(jiffies, rport->dev_loss_end))

		if (status > 0 && (status & NVME_SC_DNR))

			recon = false;

	} else if (time_after_eq(jiffies, rport->dev_loss_end))

		recon = false;

		recon = false;





	if (recon && nvmf_should_reconnect(&ctrl->ctrl)) {

	if (recon && nvmf_should_reconnect(&ctrl->ctrl)) {
@@ -3298,12 +3302,17 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status) 




		queue_delayed_work(nvme_wq, &ctrl->connect_work, recon_delay);

		queue_delayed_work(nvme_wq, &ctrl->connect_work, recon_delay);

	} else {

	} else {

		if (portptr->port_state == FC_OBJSTATE_ONLINE)

		if (portptr->port_state == FC_OBJSTATE_ONLINE) {

			if (status > 0 && (status & NVME_SC_DNR))

				dev_warn(ctrl->ctrl.device,

				dev_warn(ctrl->ctrl.device,

				"NVME-FC{%d}: Max reconnect attempts (%d) "

					 "NVME-FC{%d}: reconnect failure\n",

				"reached.\n",

					 ctrl->cnum);

				ctrl->cnum, ctrl->ctrl.nr_reconnects);

			else

			else

				dev_warn(ctrl->ctrl.device,

					 "NVME-FC{%d}: Max reconnect attempts "

					 "(%d) reached.\n",

					 ctrl->cnum, ctrl->ctrl.nr_reconnects);

		} else

			dev_warn(ctrl->ctrl.device,

			dev_warn(ctrl->ctrl.device,

				"NVME-FC{%d}: dev_loss_tmo (%d) expired "

				"NVME-FC{%d}: dev_loss_tmo (%d) expired "

				"while waiting for remoteport connectivity.\n",

				"while waiting for remoteport connectivity.\n",