Commit adfde7ed authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Keith Busch
Browse files

nvme-fabrics: short-circuit reconnect retries 



Returning a nvme status from nvme_tcp_setup_ctrl() indicates that the
association was established and we have received a status from the
controller; consequently we should honour the DNR bit. If not any future
reconnect attempts 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>
[dwagner: - extended nvme_should_reconnect]
Signed-off-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 44350336

drivers/nvme/host/fabrics.c

+13 −1
Original line number Diff line number Diff line
@@ -559,8 +559,20 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid) 
}

EXPORT_SYMBOL_GPL(nvmf_connect_io_queue);



bool nvmf_should_reconnect(struct nvme_ctrl *ctrl)

/*

 * Evaluate the status information returned by the transport in order to decided

 * if a reconnect attempt should be scheduled.

 *

 * Do not retry when:

 *

 * - the DNR bit is set and the specification states no further connect

 *   attempts with the same set of paramenters should be attempted.

 */

bool nvmf_should_reconnect(struct nvme_ctrl *ctrl, int status)

{

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

		return false;



	if (ctrl->opts->max_reconnects == -1 ||

	    ctrl->nr_reconnects < ctrl->opts->max_reconnects)

		return true;

drivers/nvme/host/fabrics.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int nvmf_register_transport(struct nvmf_transport_ops *ops); 
void nvmf_unregister_transport(struct nvmf_transport_ops *ops);

void nvmf_free_options(struct nvmf_ctrl_options *opts);

int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size);

bool nvmf_should_reconnect(struct nvme_ctrl *ctrl);

bool nvmf_should_reconnect(struct nvme_ctrl *ctrl, int status);

bool nvmf_ip_options_match(struct nvme_ctrl *ctrl,

		struct nvmf_ctrl_options *opts);

void nvmf_set_io_queues(struct nvmf_ctrl_options *opts, u32 nr_io_queues,

drivers/nvme/host/fc.c

+1 −3
Original line number Diff line number Diff line
@@ -3310,12 +3310,10 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status) 
		dev_info(ctrl->ctrl.device,

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

			ctrl->cnum, status);

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

			recon = false;

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

		recon = false;



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

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

		if (portptr->port_state == FC_OBJSTATE_ONLINE)

			dev_info(ctrl->ctrl.device,

				"NVME-FC{%d}: Reconnect attempt in %ld "

drivers/nvme/host/rdma.c

+12 −7
Original line number Diff line number Diff line
@@ -982,7 +982,8 @@ static void nvme_rdma_free_ctrl(struct nvme_ctrl *nctrl) 
	kfree(ctrl);

}



static void nvme_rdma_reconnect_or_remove(struct nvme_rdma_ctrl *ctrl)

static void nvme_rdma_reconnect_or_remove(struct nvme_rdma_ctrl *ctrl,

					  int status)

{

	enum nvme_ctrl_state state = nvme_ctrl_state(&ctrl->ctrl);
@@ -992,7 +993,7 @@ static void nvme_rdma_reconnect_or_remove(struct nvme_rdma_ctrl *ctrl) 
		return;

	}



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

	if (nvmf_should_reconnect(&ctrl->ctrl, status)) {

		dev_info(ctrl->ctrl.device, "Reconnecting in %d seconds...\n",

			ctrl->ctrl.opts->reconnect_delay);

		queue_delayed_work(nvme_wq, &ctrl->reconnect_work,
@@ -1104,10 +1105,12 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work) 
{

	struct nvme_rdma_ctrl *ctrl = container_of(to_delayed_work(work),

			struct nvme_rdma_ctrl, reconnect_work);

	int ret;



	++ctrl->ctrl.nr_reconnects;



	if (nvme_rdma_setup_ctrl(ctrl, false))

	ret = nvme_rdma_setup_ctrl(ctrl, false);

	if (ret)

		goto requeue;



	dev_info(ctrl->ctrl.device, "Successfully reconnected (%d attempts)\n",
@@ -1120,7 +1123,7 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work) 
requeue:

	dev_info(ctrl->ctrl.device, "Failed reconnect attempt %d\n",

			ctrl->ctrl.nr_reconnects);

	nvme_rdma_reconnect_or_remove(ctrl);

	nvme_rdma_reconnect_or_remove(ctrl, ret);

}



static void nvme_rdma_error_recovery_work(struct work_struct *work)
@@ -1145,7 +1148,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work) 
		return;

	}



	nvme_rdma_reconnect_or_remove(ctrl);

	nvme_rdma_reconnect_or_remove(ctrl, 0);

}



static void nvme_rdma_error_recovery(struct nvme_rdma_ctrl *ctrl)
@@ -2169,6 +2172,7 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) 
{

	struct nvme_rdma_ctrl *ctrl =

		container_of(work, struct nvme_rdma_ctrl, ctrl.reset_work);

	int ret;



	nvme_stop_ctrl(&ctrl->ctrl);

	nvme_rdma_shutdown_ctrl(ctrl, false);
@@ -2179,14 +2183,15 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) 
		return;

	}



	if (nvme_rdma_setup_ctrl(ctrl, false))

	ret = nvme_rdma_setup_ctrl(ctrl, false);

	if (ret)

		goto out_fail;



	return;



out_fail:

	++ctrl->ctrl.nr_reconnects;

	nvme_rdma_reconnect_or_remove(ctrl);

	nvme_rdma_reconnect_or_remove(ctrl, ret);

}



static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = {

drivers/nvme/host/tcp.c

+14 −8
Original line number Diff line number Diff line
@@ -2155,7 +2155,8 @@ static void nvme_tcp_teardown_io_queues(struct nvme_ctrl *ctrl, 
	nvme_tcp_destroy_io_queues(ctrl, remove);

}



static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl)

static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl,

		int status)

{

	enum nvme_ctrl_state state = nvme_ctrl_state(ctrl);
@@ -2165,13 +2166,14 @@ static void nvme_tcp_reconnect_or_remove(struct nvme_ctrl *ctrl) 
		return;

	}



	if (nvmf_should_reconnect(ctrl)) {

	if (nvmf_should_reconnect(ctrl, status)) {

		dev_info(ctrl->device, "Reconnecting in %d seconds...\n",

			ctrl->opts->reconnect_delay);

		queue_delayed_work(nvme_wq, &to_tcp_ctrl(ctrl)->connect_work,

				ctrl->opts->reconnect_delay * HZ);

	} else {

		dev_info(ctrl->device, "Removing controller...\n");

		dev_info(ctrl->device, "Removing controller (%d)...\n",

			 status);

		nvme_delete_ctrl(ctrl);

	}

}
@@ -2252,10 +2254,12 @@ static void nvme_tcp_reconnect_ctrl_work(struct work_struct *work) 
	struct nvme_tcp_ctrl *tcp_ctrl = container_of(to_delayed_work(work),

			struct nvme_tcp_ctrl, connect_work);

	struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl;

	int ret;



	++ctrl->nr_reconnects;



	if (nvme_tcp_setup_ctrl(ctrl, false))

	ret = nvme_tcp_setup_ctrl(ctrl, false);

	if (ret)

		goto requeue;



	dev_info(ctrl->device, "Successfully reconnected (%d attempt)\n",
@@ -2268,7 +2272,7 @@ static void nvme_tcp_reconnect_ctrl_work(struct work_struct *work) 
requeue:

	dev_info(ctrl->device, "Failed reconnect attempt %d\n",

			ctrl->nr_reconnects);

	nvme_tcp_reconnect_or_remove(ctrl);

	nvme_tcp_reconnect_or_remove(ctrl, ret);

}



static void nvme_tcp_error_recovery_work(struct work_struct *work)
@@ -2295,7 +2299,7 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work) 
		return;

	}



	nvme_tcp_reconnect_or_remove(ctrl);

	nvme_tcp_reconnect_or_remove(ctrl, 0);

}



static void nvme_tcp_teardown_ctrl(struct nvme_ctrl *ctrl, bool shutdown)
@@ -2315,6 +2319,7 @@ static void nvme_reset_ctrl_work(struct work_struct *work) 
{

	struct nvme_ctrl *ctrl =

		container_of(work, struct nvme_ctrl, reset_work);

	int ret;



	nvme_stop_ctrl(ctrl);

	nvme_tcp_teardown_ctrl(ctrl, false);
@@ -2328,14 +2333,15 @@ static void nvme_reset_ctrl_work(struct work_struct *work) 
		return;

	}



	if (nvme_tcp_setup_ctrl(ctrl, false))

	ret = nvme_tcp_setup_ctrl(ctrl, false);

	if (ret)

		goto out_fail;



	return;



out_fail:

	++ctrl->nr_reconnects;

	nvme_tcp_reconnect_or_remove(ctrl);

	nvme_tcp_reconnect_or_remove(ctrl, ret);

}



static void nvme_tcp_stop_ctrl(struct nvme_ctrl *ctrl)