From 1f626649a088708162b7f89b6ffd35bfecd877bb Mon Sep 17 00:00:00 2001 From: Alexey Marchuk Date: Thu, 5 Mar 2020 09:51:32 +0300 Subject: [PATCH] rdma: Remove dummy drain WR from queue depth calculation Functionality of DRAIN WR is no longer used Change-Id: I15476bb885042db89e16c63e972d3e8951f6a9c0 Signed-off-by: Alexey Marchuk Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1159 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Seth Howell Reviewed-by: Ben Walker --- lib/nvmf/rdma.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/nvmf/rdma.c b/lib/nvmf/rdma.c index 226426768..8254e702d 100644 --- a/lib/nvmf/rdma.c +++ b/lib/nvmf/rdma.c @@ -1056,14 +1056,13 @@ spdk_nvmf_rdma_qpair_initialize(struct spdk_nvmf_qpair *qpair) if (rqpair->srq) { ibv_init_attr.srq = rqpair->srq; } else { - ibv_init_attr.cap.max_recv_wr = rqpair->max_queue_depth + - 1; /* RECV operations + dummy drain WR */ + ibv_init_attr.cap.max_recv_wr = rqpair->max_queue_depth; } - ibv_init_attr.cap.max_send_wr = rqpair->max_queue_depth * - 2 + 1; /* SEND, READ, and WRITE operations + dummy drain WR */ - ibv_init_attr.cap.max_send_sge = spdk_min(device->attr.max_sge, NVMF_DEFAULT_TX_SGE); - ibv_init_attr.cap.max_recv_sge = spdk_min(device->attr.max_sge, NVMF_DEFAULT_RX_SGE); + ibv_init_attr.cap.max_send_wr = (uint32_t)rqpair->max_queue_depth * + 2; /* SEND, READ or WRITE operations */ + ibv_init_attr.cap.max_send_sge = spdk_min((uint32_t)device->attr.max_sge, NVMF_DEFAULT_TX_SGE); + ibv_init_attr.cap.max_recv_sge = spdk_min((uint32_t)device->attr.max_sge, NVMF_DEFAULT_RX_SGE); if (rqpair->srq == NULL && nvmf_rdma_resize_cq(rqpair, device) < 0) { SPDK_ERRLOG("Failed to resize the completion queue. Cannot initialize qpair.\n"); @@ -1076,7 +1075,7 @@ spdk_nvmf_rdma_qpair_initialize(struct spdk_nvmf_qpair *qpair) goto error; } - rqpair->max_send_depth = spdk_min((uint32_t)(rqpair->max_queue_depth * 2 + 1), + rqpair->max_send_depth = spdk_min((uint32_t)(rqpair->max_queue_depth * 2), ibv_init_attr.cap.max_send_wr); rqpair->max_send_sge = spdk_min(NVMF_DEFAULT_TX_SGE, ibv_init_attr.cap.max_send_sge); rqpair->max_recv_sge = spdk_min(NVMF_DEFAULT_RX_SGE, ibv_init_attr.cap.max_recv_sge);