Commit eca013c2 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

nvmf: simplify RDMA queue depth calculation 



Pull out the duplicated min checks against the ibdev_attr values.

Change-Id: I774c355ba669486afde5c05c55a4ed653723db98
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent c3ed14d3

lib/nvmf/rdma.c

+6 −5
Original line number Diff line number Diff line
@@ -648,14 +648,15 @@ nvmf_rdma_connect(struct rdma_cm_event *event) 
	if (host_event_data->private_data == NULL ||

	    host_event_data->private_data_len < sizeof(struct spdk_nvmf_rdma_request_private_data)) {

		/* No private data, so use defaults. */

		qp_depth = nvmf_min(ibdev_attr.max_qp_wr, SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH);

		rw_depth = nvmf_min(ibdev_attr.max_qp_rd_atom, SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH);

		qp_depth = SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH;

		rw_depth = SPDK_NVMF_DEFAULT_MAX_QUEUE_DEPTH;

	} else {

		const struct spdk_nvmf_rdma_request_private_data *private_data = host_event_data->private_data;

		qp_depth = nvmf_min(ibdev_attr.max_qp_wr, nvmf_min(private_data->hrqsize,

				    private_data->hsqsize));

		rw_depth = nvmf_min(ibdev_attr.max_qp_rd_atom, host_event_data->initiator_depth);

		qp_depth = nvmf_min(private_data->hrqsize, private_data->hsqsize);

		rw_depth = host_event_data->initiator_depth;

	}

	qp_depth = nvmf_min(qp_depth, ibdev_attr.max_qp_wr);

	rw_depth = nvmf_min(rw_depth, ibdev_attr.max_qp_rd_atom);

	rdma_conn->queue_depth = nvmf_min(qp_depth, rw_depth);



	rc = nvmf_rdma_queue_init(conn, conn_id->verbs);