ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: Make it clearer which RDMA sgl element is being filled out

Browse Source 
While more verbose, this makes it much more obvious that
an array of SGL elements is being filled out.

Change-Id: I98b8e5d46af32c5d7dbb990e267fdfd594942081
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/428729
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Ben Walker 2018-10-10 11:19:33 -07:00 committed by Jim Harris
parent 3fe0db6ca3
commit 6b2fb186f6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/nvme/nvme_rdma.c
View File

@ -860,7 +860,6 @@ static int
nvme_rdma_build_contig_inline_request(struct nvme_rdma_qpair *rqpair,
struct spdk_nvme_rdma_req *rdma_req)
{
struct ibv_sge *sge_inline = &rdma_req->send_sgl[1];
struct nvme_request *req = rdma_req->req;
struct ibv_mr *mr;
void *payload;
@ -884,9 +883,9 @@ nvme_rdma_build_contig_inline_request(struct nvme_rdma_qpair *rqpair,
* the NVMe command. */
rdma_req->send_sgl[0].length = sizeof(struct spdk_nvme_cmd);
sge_inline->addr = (uint64_t)payload;
sge_inline->length = (uint32_t)req->payload_size;
sge_inline->lkey = mr->lkey;
rdma_req->send_sgl[1].addr = (uint64_t)payload;
rdma_req->send_sgl[1].length = (uint32_t)req->payload_size;
rdma_req->send_sgl[1].lkey = mr->lkey;
/* The RDMA SGL contains two elements. The first describes
* the NVMe command and the second describes the data
@ -1048,7 +1047,6 @@ static int
nvme_rdma_build_sgl_inline_request(struct nvme_rdma_qpair *rqpair,
struct spdk_nvme_rdma_req *rdma_req)
{
struct ibv_sge *sge_inline = &rdma_req->send_sgl[1];
struct nvme_request *req = rdma_req->req;
struct ibv_mr *mr;
uint32_t length;
@ -1086,9 +1084,9 @@ nvme_rdma_build_sgl_inline_request(struct nvme_rdma_qpair *rqpair,
* the NVMe command. */
rdma_req->send_sgl[0].length = sizeof(struct spdk_nvme_cmd);
sge_inline->addr = (uint64_t)virt_addr;
sge_inline->length = (uint32_t)req->payload_size;
sge_inline->lkey = mr->lkey;
rdma_req->send_sgl[1].addr = (uint64_t)virt_addr;
rdma_req->send_sgl[1].length = (uint32_t)req->payload_size;
rdma_req->send_sgl[1].lkey = mr->lkey;
/* The RDMA SGL contains two elements. The first describes
* the NVMe command and the second describes the data