Commit 54a76c87 authored by Tokunori Ikegami's avatar Tokunori Ikegami Committed by Keith Busch
Browse files

nvme-rdma, nvme-tcp: include max reconnects for reconnect logging 



Makes clear max reconnects translated by ctrl loss tmo and reconnect delay.

Signed-off-by: default avatarTokunori Ikegami <ikegami.t@gmail.com>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent c51a22e6

drivers/nvme/host/rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -1121,8 +1121,8 @@ static void nvme_rdma_reconnect_ctrl_work(struct work_struct *work) 
	return;



requeue:

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

			ctrl->ctrl.nr_reconnects);

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

		 ctrl->ctrl.nr_reconnects, ctrl->ctrl.opts->max_reconnects);

	nvme_rdma_reconnect_or_remove(ctrl, ret);

}

drivers/nvme/host/tcp.c

+4 −4
Original line number Diff line number Diff line
@@ -2262,16 +2262,16 @@ static void nvme_tcp_reconnect_ctrl_work(struct work_struct *work) 
	if (ret)

		goto requeue;



	dev_info(ctrl->device, "Successfully reconnected (%d attempt)\n",

			ctrl->nr_reconnects);

	dev_info(ctrl->device, "Successfully reconnected (attempt %d/%d)\n",

		 ctrl->nr_reconnects, ctrl->opts->max_reconnects);



	ctrl->nr_reconnects = 0;



	return;



requeue:

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

			ctrl->nr_reconnects);

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

		 ctrl->nr_reconnects, ctrl->opts->max_reconnects);

	nvme_tcp_reconnect_or_remove(ctrl, ret);

}