Commit 4f2f1aa9 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

nvme_rdma: Use pd of rdma_qp instead of default pd of cm_id 



This is another preparation to create and use ibv_context and pd.

Signed-off-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Signed-off-by: default avatarDenis Nagorny <denisn@nvidia.com>
Signed-off-by: default avatarEvgeniy Kochetov <evgeniik@nvidia.com>
Change-Id: Id594fa1ccb2daf535b1aaaef0a397bda2ec98578
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13710


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent a3a51453

lib/nvme/nvme_rdma.c

+2 −2
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ nvme_rdma_register_rsps(struct nvme_rdma_qpair *rqpair) 
	int rc;

	uint32_t lkey;



	rc = nvme_rdma_reg_mr(rqpair->cm_id->pd, &rqpair->rsp_mr,

	rc = nvme_rdma_reg_mr(rqpair->rdma_qp->qp->pd, &rqpair->rsp_mr,

			      rqpair->rsps, rqpair->num_entries * sizeof(*rqpair->rsps));



	if (rc < 0) {
@@ -1121,7 +1121,7 @@ nvme_rdma_register_reqs(struct nvme_rdma_qpair *rqpair) 
	int rc;

	uint32_t lkey;



	rc = nvme_rdma_reg_mr(rqpair->cm_id->pd, &rqpair->cmd_mr,

	rc = nvme_rdma_reg_mr(rqpair->rdma_qp->qp->pd, &rqpair->cmd_mr,

			      rqpair->cmds, rqpair->num_entries * sizeof(*rqpair->cmds));



	if (rc < 0) {

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

+4 −0
Original line number Diff line number Diff line
@@ -1001,12 +1001,16 @@ test_nvme_rdma_register_and_unregister_reqs(void) 
{

	struct nvme_rdma_qpair rqpair = {};

	struct spdk_nvmf_cmd cmds = {};

	struct ibv_qp qp = {};

	struct spdk_rdma_qp rdma_qp = {};

	struct rdma_cm_id cm_id = {};

	struct spdk_nvme_rdma_req rdma_reqs[50] = {};

	int rc;



	rqpair.cm_id = &cm_id;

	rqpair.cmds = &cmds;

	rqpair.rdma_qp = &rdma_qp;

	rdma_qp.qp = &qp;

	g_nvme_hooks.get_rkey = NULL;

	rqpair.rdma_reqs = rdma_reqs;

	/* case 1: nvme_rdma_register_req: nvme_rdma_reg_mr fail, expect: fail */