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: Tokunori Ikegami <ikegami.t@gmail.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 821ab3e0fd3b1cc75868a2cb8ef4cd37d8f0441b..51a62b0c645a7510b923f15803f7e9cc4f32b478 100644 (file)
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -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);
 }
 

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 3e0c3332332049e18a6148c1c7de4d33b649e751..9efeecc560b76bd3a26214e779365685a3b5f1a5 100644 (file)
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -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);
 }