Commit 2250abae authored by Ziye Yang's avatar Ziye Yang Committed by Tomasz Zawadzki
Browse files

nvme/tcp: Raname send_pdu to pdu in tcp_req. 



Since we will reuse send_pdu for other purpose in the next
patch.

Signed-off-by: default avatarZiye Yang <ziye.yang@intel.com>
Change-Id: Iee5166131b70a25bc13aaa847bfc9066231f31a9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8028


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Mellanox Build Bot
parent 9776b894

lib/nvme/nvme_tcp.c

+5 −5
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ struct nvme_tcp_req { 
			uint8_t				reserved : 4;

		} bits;

	} ordering;

	struct nvme_tcp_pdu			*send_pdu;

	struct nvme_tcp_pdu			*pdu;

	struct iovec				iov[NVME_TCP_MAX_SGL_DESCRIPTORS];

	uint32_t				iovcnt;

	/* Used to hold a value received from subsequent R2T while we are still
@@ -205,7 +205,7 @@ nvme_tcp_req_get(struct nvme_tcp_qpair *tqpair) 
	tcp_req->active_r2ts = 0;

	tcp_req->iovcnt = 0;

	tcp_req->ordering.raw = 0;

	memset(tcp_req->send_pdu, 0, sizeof(struct nvme_tcp_pdu));

	memset(tcp_req->pdu, 0, sizeof(struct nvme_tcp_pdu));

	memset(&tcp_req->rsp, 0, sizeof(struct spdk_nvme_cpl));

	TAILQ_INSERT_TAIL(&tqpair->outstanding_reqs, tcp_req, link);
@@ -288,7 +288,7 @@ nvme_tcp_alloc_reqs(struct nvme_tcp_qpair *tqpair) 
		tcp_req = &tqpair->tcp_reqs[i];

		tcp_req->cid = i;

		tcp_req->tqpair = tqpair;

		tcp_req->send_pdu = &tqpair->send_pdus[i];

		tcp_req->pdu = &tqpair->send_pdus[i];

		TAILQ_INSERT_TAIL(&tqpair->free_reqs, tcp_req, link);

	}
@@ -670,7 +670,7 @@ nvme_tcp_qpair_capsule_cmd_send(struct nvme_tcp_qpair *tqpair, 
	uint8_t pdo;



	SPDK_DEBUGLOG(nvme, "enter\n");

	pdu = tcp_req->send_pdu;

	pdu = tcp_req->pdu;



	capsule_cmd = &pdu->hdr.capsule_cmd;

	capsule_cmd->common.pdu_type = SPDK_NVME_TCP_PDU_TYPE_CAPSULE_CMD;
@@ -1319,7 +1319,7 @@ nvme_tcp_send_h2c_data(struct nvme_tcp_req *tcp_req) 
	/* Reinit the send_ack and h2c_send_waiting_ack bits */

	tcp_req->ordering.bits.send_ack = 0;

	tcp_req->ordering.bits.h2c_send_waiting_ack = 0;

	rsp_pdu = tcp_req->send_pdu;

	rsp_pdu = tcp_req->pdu;

	memset(rsp_pdu, 0, sizeof(*rsp_pdu));

	h2c_data = &rsp_pdu->hdr.h2c_data;

test/unit/lib/nvme/nvme_tcp.c/nvme_tcp_ut.c

+4 −4
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ test_nvme_tcp_req_get(void) 
	struct nvme_tcp_qpair tqpair = {};

	struct nvme_tcp_pdu send_pdu = {};



	tcp_req.send_pdu = &send_pdu;

	tcp_req.pdu = &send_pdu;

	tcp_req.state = NVME_TCP_REQ_FREE;



	TAILQ_INIT(&tqpair.free_reqs);
@@ -623,7 +623,7 @@ test_nvme_tcp_qpair_capsule_cmd_send(void) 
	memset(iov_base0, 0xFF, 4096);

	memset(iov_base1, 0xFF, 4096);

	tcp_req.req = &req;

	tcp_req.send_pdu = &pdu;

	tcp_req.pdu = &pdu;

	TAILQ_INIT(&tqpair.send_queue);



	tcp_req.iov[0].iov_base = (void *)iov_base0;
@@ -854,7 +854,7 @@ test_nvme_tcp_alloc_reqs(void) 
	CU_ASSERT(rc == 0);

	CU_ASSERT(tqpair.tcp_reqs[0].cid == 0);

	CU_ASSERT(tqpair.tcp_reqs[0].tqpair == &tqpair);

	CU_ASSERT(tqpair.tcp_reqs[0].send_pdu == &tqpair.send_pdus[0]);

	CU_ASSERT(tqpair.tcp_reqs[0].pdu == &tqpair.send_pdus[0]);

	CU_ASSERT(tqpair.send_pdu == &tqpair.send_pdus[tqpair.num_entries]);

	free(tqpair.tcp_reqs);

	spdk_free(tqpair.send_pdus);
@@ -866,7 +866,7 @@ test_nvme_tcp_alloc_reqs(void) 
	for (int i = 0; i < tqpair.num_entries; i++) {

		CU_ASSERT(tqpair.tcp_reqs[i].cid == i);

		CU_ASSERT(tqpair.tcp_reqs[i].tqpair == &tqpair);

		CU_ASSERT(tqpair.tcp_reqs[i].send_pdu == &tqpair.send_pdus[i]);

		CU_ASSERT(tqpair.tcp_reqs[i].pdu == &tqpair.send_pdus[i]);

	}

	CU_ASSERT(tqpair.send_pdu == &tqpair.send_pdus[tqpair.num_entries]);