nvme-rdma: Don't use tl_retry_count
Always use the maximum qp retry count as the
error recovery timeout is dictated from the nvme
keep-alive.
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index 5208f16..3e3ce2b 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -117,7 +117,6 @@
u32 queue_count;
/* other member variables */
- unsigned short tl_retry_count;
struct blk_mq_tag_set tag_set;
struct work_struct delete_work;
struct work_struct reset_work;
@@ -1277,8 +1276,8 @@
param.flow_control = 1;
param.responder_resources = queue->device->dev->attrs.max_qp_rd_atom;
- /* rdma_cm will clamp down to max QP retry count (7) */
- param.retry_count = ctrl->tl_retry_count;
+ /* maximum retry count */
+ param.retry_count = 7;
param.rnr_retry_count = 7;
param.private_data = &priv;
param.private_data_len = sizeof(priv);
@@ -1909,7 +1908,6 @@
ctrl->queue_count = opts->nr_io_queues + 1; /* +1 for admin queue */
ctrl->ctrl.sqsize = opts->queue_size;
- ctrl->tl_retry_count = opts->tl_retry_count;
ctrl->ctrl.kato = opts->kato;
ret = -ENOMEM;
@@ -1986,8 +1984,7 @@
static struct nvmf_transport_ops nvme_rdma_transport = {
.name = "rdma",
.required_opts = NVMF_OPT_TRADDR,
- .allowed_opts = NVMF_OPT_TRSVCID | NVMF_OPT_TL_RETRY_COUNT |
- NVMF_OPT_RECONNECT_DELAY,
+ .allowed_opts = NVMF_OPT_TRSVCID | NVMF_OPT_RECONNECT_DELAY,
.create_ctrl = nvme_rdma_create_ctrl,
};