Commit 1e90edaa authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

nvme_rdma: submit_request() inserts req into outstanding_reqs list 



This will simplify the code and the following patches.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Change-Id: I2841f9829ff4ee15f150bf806e927d2e41f2e2fe
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/18849


Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent f8fc1e11

lib/nvme/nvme_rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -417,7 +417,6 @@ nvme_rdma_req_get(struct nvme_rdma_qpair *rqpair) 
	rdma_req = TAILQ_FIRST(&rqpair->free_reqs);

	if (rdma_req) {

		TAILQ_REMOVE(&rqpair->free_reqs, rdma_req, link);

		TAILQ_INSERT_TAIL(&rqpair->outstanding_reqs, rdma_req, link);

	}



	return rdma_req;
@@ -2316,11 +2315,12 @@ nvme_rdma_qpair_submit_request(struct spdk_nvme_qpair *qpair, 


	if (nvme_rdma_req_init(rqpair, req, rdma_req)) {

		SPDK_ERRLOG("nvme_rdma_req_init() failed\n");

		TAILQ_REMOVE(&rqpair->outstanding_reqs, rdma_req, link);

		nvme_rdma_req_put(rqpair, rdma_req);

		return -1;

	}



	TAILQ_INSERT_TAIL(&rqpair->outstanding_reqs, rdma_req, link);



	assert(rqpair->current_num_sends < rqpair->num_entries);

	rqpair->current_num_sends++;

test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c

+0 −2
Original line number Diff line number Diff line
@@ -797,12 +797,10 @@ test_nvme_rdma_req_put_and_get(void) 
	CU_ASSERT(rdma_req.req == NULL);



	/* case 2: nvme_rdma_req_get */

	TAILQ_INIT(&rqpair.outstanding_reqs);

	rdma_req_get = nvme_rdma_req_get(&rqpair);

	CU_ASSERT(rdma_req_get == &rdma_req);

	CU_ASSERT(rdma_req_get->id == 10086);

	CU_ASSERT(rqpair.free_reqs.tqh_first == NULL);

	CU_ASSERT(rqpair.outstanding_reqs.tqh_first == rdma_req_get);

}



static void