Commit 1f626649 authored by Alexey Marchuk's avatar Alexey Marchuk Committed by Tomasz Zawadzki
Browse files

rdma: Remove dummy drain WR from queue depth calculation 



Functionality of DRAIN WR is no longer used

Change-Id: I15476bb885042db89e16c63e972d3e8951f6a9c0
Signed-off-by: default avatarAlexey Marchuk <alexeymar@mellanox.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1159


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent eb984889

lib/nvmf/rdma.c

+6 −7
Original line number Diff line number Diff line
@@ -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);