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

nvmf: factor out common RDMA completion code

Browse Source 
All of the WC events that we handle map back to a request, so look it up
before checking the opcode.

Change-Id: I1b70a773374f64387df0a21a4f7fd64b26534b14
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-07-15 15:39:03 -07:00
parent e9658d055e
commit 10687626e5
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/nvmf/rdma.c
View File

@ -1094,11 +1094,12 @@ nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn)
return -1; return -1;
} }
rdma_req = (struct spdk_nvmf_rdma_request *)wc.wr_id;
req = &rdma_req->req;
switch (wc.opcode) { switch (wc.opcode) {
case IBV_WC_SEND: case IBV_WC_SEND:
SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ send completion\n"); SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ send completion\n");
rdma_req = (struct spdk_nvmf_rdma_request *)wc.wr_id;
req = &rdma_req->req;
if (spdk_nvmf_rdma_request_release(conn, req)) { if (spdk_nvmf_rdma_request_release(conn, req)) {
return -1; return -1;
} }
@ -1110,15 +1111,11 @@ nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn)
* flag in rdma_write, to trace rdma write latency * flag in rdma_write, to trace rdma write latency
*/ */
SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ rdma write completion\n"); SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ rdma write completion\n");
rdma_req = (struct spdk_nvmf_rdma_request *)wc.wr_id;
req = &rdma_req->req;
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);
break; break;
case IBV_WC_RDMA_READ: case IBV_WC_RDMA_READ:
SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ rdma read completion\n"); SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ rdma read completion\n");
rdma_req = (struct spdk_nvmf_rdma_request *)wc.wr_id;
req = &rdma_req->req;
spdk_trace_record(TRACE_RDMA_READ_COMPLETE, 0, 0, (uint64_t)req, 0); spdk_trace_record(TRACE_RDMA_READ_COMPLETE, 0, 0, (uint64_t)req, 0);
rc = spdk_nvmf_request_exec(req); rc = spdk_nvmf_request_exec(req);
if (rc) { if (rc) {
@ -1129,8 +1126,7 @@ nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn)
case IBV_WC_RECV: case IBV_WC_RECV:
SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ recv completion\n"); SPDK_TRACELOG(SPDK_TRACE_RDMA, "CQ recv completion\n");
spdk_trace_record(TRACE_NVMF_IO_START, 0, 0, wc.wr_id, 0); spdk_trace_record(TRACE_NVMF_IO_START, 0, 0, (uint64_t)req, 0);
rdma_req = (struct spdk_nvmf_rdma_request *)wc.wr_id;
rc = nvmf_recv(rdma_req, &wc); rc = nvmf_recv(rdma_req, &wc);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("nvmf_recv processing failure\n"); SPDK_ERRLOG("nvmf_recv processing failure\n");