Commit 5eb3239c authored by MengjinWu's avatar MengjinWu Committed by Konrad Sztyber
Browse files

nvmf/tcp: Refine the macro definition of queue depth 



Refine the macro definition name about queue depth and
prepare for next patch.

Signed-off-by: default avatarMengjinWu <mengjin.wu@intel.com>
Change-Id: I85bee2528ae4ab70292fc11aa62d05bae0c28a77
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14664


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent 19c1d632

lib/nvmf/tcp.c

+4 −4
Original line number Diff line number Diff line
@@ -3336,8 +3336,8 @@ nvmf_tcp_qpair_abort_request(struct spdk_nvmf_qpair *qpair, 
	_nvmf_tcp_qpair_abort_request(req);

}



#define SPDK_NVMF_TCP_DEFAULT_MAX_QUEUE_DEPTH 128

#define SPDK_NVMF_TCP_DEFAULT_AQ_DEPTH 128

#define SPDK_NVMF_TCP_DEFAULT_MAX_IO_QUEUE_DEPTH 128

#define SPDK_NVMF_TCP_DEFAULT_MAX_ADMIN_QUEUE_DEPTH 128

#define SPDK_NVMF_TCP_DEFAULT_MAX_QPAIRS_PER_CTRLR 128

#define SPDK_NVMF_TCP_DEFAULT_IN_CAPSULE_DATA_SIZE 4096

#define SPDK_NVMF_TCP_DEFAULT_MAX_IO_SIZE 131072
@@ -3350,12 +3350,12 @@ nvmf_tcp_qpair_abort_request(struct spdk_nvmf_qpair *qpair, 
static void

nvmf_tcp_opts_init(struct spdk_nvmf_transport_opts *opts)

{

	opts->max_queue_depth =		SPDK_NVMF_TCP_DEFAULT_MAX_QUEUE_DEPTH;

	opts->max_queue_depth =		SPDK_NVMF_TCP_DEFAULT_MAX_IO_QUEUE_DEPTH;

	opts->max_qpairs_per_ctrlr =	SPDK_NVMF_TCP_DEFAULT_MAX_QPAIRS_PER_CTRLR;

	opts->in_capsule_data_size =	SPDK_NVMF_TCP_DEFAULT_IN_CAPSULE_DATA_SIZE;

	opts->max_io_size =		SPDK_NVMF_TCP_DEFAULT_MAX_IO_SIZE;

	opts->io_unit_size =		SPDK_NVMF_TCP_DEFAULT_IO_UNIT_SIZE;

	opts->max_aq_depth =		SPDK_NVMF_TCP_DEFAULT_AQ_DEPTH;

	opts->max_aq_depth =		SPDK_NVMF_TCP_DEFAULT_MAX_ADMIN_QUEUE_DEPTH;

	opts->num_shared_buffers =	SPDK_NVMF_TCP_DEFAULT_NUM_SHARED_BUFFERS;

	opts->buf_cache_size =		SPDK_NVMF_TCP_DEFAULT_BUFFER_CACHE_SIZE;

	opts->dif_insert_or_strip =	SPDK_NVMF_TCP_DEFAULT_DIF_INSERT_OR_STRIP;

test/unit/lib/nvmf/tcp.c/tcp_ut.c

+7 −6
Original line number Diff line number Diff line
@@ -740,12 +740,12 @@ test_nvmf_tcp_qpair_init_mem_resource(void) 
	tqpair->qpair.transport = &transport;



	nvmf_tcp_opts_init(&transport.opts);

	CU_ASSERT(transport.opts.max_queue_depth == SPDK_NVMF_TCP_DEFAULT_MAX_QUEUE_DEPTH);

	CU_ASSERT(transport.opts.max_queue_depth == SPDK_NVMF_TCP_DEFAULT_MAX_IO_QUEUE_DEPTH);

	CU_ASSERT(transport.opts.max_qpairs_per_ctrlr == SPDK_NVMF_TCP_DEFAULT_MAX_QPAIRS_PER_CTRLR);

	CU_ASSERT(transport.opts.in_capsule_data_size == SPDK_NVMF_TCP_DEFAULT_IN_CAPSULE_DATA_SIZE);

	CU_ASSERT(transport.opts.max_io_size ==	SPDK_NVMF_TCP_DEFAULT_MAX_IO_SIZE);

	CU_ASSERT(transport.opts.io_unit_size == SPDK_NVMF_TCP_DEFAULT_IO_UNIT_SIZE);

	CU_ASSERT(transport.opts.max_aq_depth == SPDK_NVMF_TCP_DEFAULT_AQ_DEPTH);

	CU_ASSERT(transport.opts.max_aq_depth == SPDK_NVMF_TCP_DEFAULT_MAX_ADMIN_QUEUE_DEPTH);

	CU_ASSERT(transport.opts.num_shared_buffers == SPDK_NVMF_TCP_DEFAULT_NUM_SHARED_BUFFERS);

	CU_ASSERT(transport.opts.buf_cache_size == SPDK_NVMF_TCP_DEFAULT_BUFFER_CACHE_SIZE);

	CU_ASSERT(transport.opts.dif_insert_or_strip ==	SPDK_NVMF_TCP_DEFAULT_DIF_INSERT_OR_STRIP);
@@ -759,7 +759,7 @@ test_nvmf_tcp_qpair_init_mem_resource(void) 


	rc = nvmf_tcp_qpair_init_mem_resource(tqpair);

	CU_ASSERT(rc == 0);

	CU_ASSERT(tqpair->resource_count == SPDK_NVMF_TCP_DEFAULT_MAX_QUEUE_DEPTH);

	CU_ASSERT(tqpair->resource_count == SPDK_NVMF_TCP_DEFAULT_MAX_IO_QUEUE_DEPTH);

	CU_ASSERT(tqpair->reqs != NULL);

	CU_ASSERT(tqpair->bufs != NULL);

	CU_ASSERT(tqpair->pdus != NULL);
@@ -780,10 +780,11 @@ test_nvmf_tcp_qpair_init_mem_resource(void) 
	CU_ASSERT(tqpair->reqs[127].req.rsp == (void *)&tqpair->reqs[127].rsp);

	CU_ASSERT(tqpair->reqs[127].req.cmd == (void *)&tqpair->reqs[127].cmd);

	CU_ASSERT(tqpair->reqs[127].state == TCP_REQUEST_STATE_FREE);

	CU_ASSERT(tqpair->state_cntr[TCP_REQUEST_STATE_FREE] == SPDK_NVMF_TCP_DEFAULT_MAX_QUEUE_DEPTH);

	CU_ASSERT(tqpair->mgmt_pdu == &tqpair->pdus[2 * SPDK_NVMF_TCP_DEFAULT_MAX_QUEUE_DEPTH]);

	CU_ASSERT(tqpair->state_cntr[TCP_REQUEST_STATE_FREE] == SPDK_NVMF_TCP_DEFAULT_MAX_IO_QUEUE_DEPTH);

	CU_ASSERT(tqpair->mgmt_pdu == &tqpair->pdus[2 * SPDK_NVMF_TCP_DEFAULT_MAX_IO_QUEUE_DEPTH]);

	CU_ASSERT(tqpair->mgmt_pdu->qpair == tqpair);

	CU_ASSERT(tqpair->pdu_in_progress == &tqpair->pdus[2 * SPDK_NVMF_TCP_DEFAULT_MAX_QUEUE_DEPTH - 1]);

	CU_ASSERT(tqpair->pdu_in_progress ==

		  &tqpair->pdus[2 * SPDK_NVMF_TCP_DEFAULT_MAX_IO_QUEUE_DEPTH - 1]);

	CU_ASSERT(tqpair->recv_buf_size == (4096 + sizeof(struct spdk_nvme_tcp_cmd) + 2 *

					    SPDK_NVME_TCP_DIGEST_LEN) * SPDK_NVMF_TCP_RECV_BUF_SIZE_FACTOR);