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

nvmf: Send completions after RDMA write has completed.

Browse Source 
This ensures that the data buffers are not in use
when we go to send the completion.

Change-Id: I30467b3e3964001150f81b21e5b695dcd0974b0c
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-07-27 09:11:30 -07:00
parent d7b8da3b81
commit 04beb5661e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/nvmf/rdma.c
View File

@ -469,7 +469,6 @@ spdk_nvmf_rdma_request_complete(struct spdk_nvmf_request *req)
struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl; struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl;
int ret; int ret;
/* Was the command successful? */
if (rsp->status.sc == SPDK_NVME_SC_SUCCESS && if (rsp->status.sc == SPDK_NVME_SC_SUCCESS &&
req->xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST) { req->xfer == SPDK_NVME_DATA_CONTROLLER_TO_HOST) {
/* Need to transfer data via RDMA Write */ /* Need to transfer data via RDMA Write */
@ -478,12 +477,13 @@ spdk_nvmf_rdma_request_complete(struct spdk_nvmf_request *req)
SPDK_ERRLOG("Unable to post rdma write tx descriptor\n"); SPDK_ERRLOG("Unable to post rdma write tx descriptor\n");
return -1; return -1;
} }
} } else {
/* Send the completion */
ret = nvmf_post_rdma_send(req); ret = nvmf_post_rdma_send(req);
if (ret) { if (ret) {
SPDK_ERRLOG("Unable to send response capsule\n"); SPDK_ERRLOG("Unable to send response capsule\n");
return -1; return -1;
}
} }
return 0; return 0;
@ -1117,6 +1117,11 @@ spdk_nvmf_rdma_poll(struct spdk_nvmf_conn *conn)
SPDK_TRACELOG(SPDK_TRACE_RDMA, "RDMA WRITE Complete. Request: %p Connection: %p\n", SPDK_TRACELOG(SPDK_TRACE_RDMA, "RDMA WRITE Complete. Request: %p Connection: %p\n",
req, conn); req, conn);
spdk_trace_record(TRACE_RDMA_WRITE_COMPLETE, 0, 0, (uint64_t)req, 0); spdk_trace_record(TRACE_RDMA_WRITE_COMPLETE, 0, 0, (uint64_t)req, 0);
/* Send the completion */
if (nvmf_post_rdma_send(req)) {
SPDK_ERRLOG("Unable to send response capsule\n");
return -1;
}
break; break;
case IBV_WC_RDMA_READ: case IBV_WC_RDMA_READ: