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

nvmf: Reap entire batches of completions for RDMA at once

Browse Source 
Instead of polling for only 1 completion at at time,
poll for batches of 32.

Change-Id: I5ef99a270489e7b3d2a58cb765915f187775a93e
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-09-15 15:22:45 -07:00 committed by Jim Harris
parent b0b59a356f
commit f3d90c9165
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/nvmf/rdma.c
View File

@ -1276,31 +1276,30 @@ spdk_nvmf_rdma_handle_pending_rdma_rw(struct spdk_nvmf_conn *conn)
static int static int
spdk_nvmf_rdma_poll(struct spdk_nvmf_conn *conn) spdk_nvmf_rdma_poll(struct spdk_nvmf_conn *conn)
{ {
struct ibv_wc wc; struct ibv_wc wc[32];
struct spdk_nvmf_rdma_conn *rdma_conn = get_rdma_conn(conn); struct spdk_nvmf_rdma_conn *rdma_conn = get_rdma_conn(conn);
struct spdk_nvmf_rdma_request *rdma_req; struct spdk_nvmf_rdma_request *rdma_req;
struct spdk_nvmf_request *req; struct spdk_nvmf_request *req;
int rc; int reaped, i, rc;
int count = 0; int count = 0;
/* Poll for completing operations. */ /* Poll for completing operations. */
while (count < 128) { rc = ibv_poll_cq(rdma_conn->cq, 32, wc);
rc = ibv_poll_cq(rdma_conn->cq, 1, &wc); if (rc < 0) {
if (rc == 0) { SPDK_ERRLOG("Error polling CQ! (%d): %s\n",
break; errno, strerror(errno));
} else if (rc < 0) { return -1;
SPDK_ERRLOG("Error polling Send CQ! (%d): %s\n", }
errno, strerror(errno));
return -1;
}
if (wc.status) { reaped = rc;
for (i = 0; i < reaped; i++) {
if (wc[i].status) {
SPDK_ERRLOG("CQ error on Connection %p, Request 0x%lu (%d): %s\n", SPDK_ERRLOG("CQ error on Connection %p, Request 0x%lu (%d): %s\n",
conn, wc.wr_id, wc.status, ibv_wc_status_str(wc.status)); conn, wc[i].wr_id, wc[i].status, ibv_wc_status_str(wc[i].status));
return -1; return -1;
} }
rdma_req = (struct spdk_nvmf_rdma_request *)wc.wr_id; rdma_req = (struct spdk_nvmf_rdma_request *)wc[i].wr_id;
if (rdma_req == NULL) { if (rdma_req == NULL) {
SPDK_ERRLOG("NULL wr_id in RDMA work completion\n"); SPDK_ERRLOG("NULL wr_id in RDMA work completion\n");
return -1; return -1;
@ -1308,7 +1307,7 @@ spdk_nvmf_rdma_poll(struct spdk_nvmf_conn *conn)
req = &rdma_req->req; req = &rdma_req->req;
switch (wc.opcode) { switch (wc[i].opcode) {
case IBV_WC_SEND: case IBV_WC_SEND:
assert(rdma_conn->cur_queue_depth > 0); assert(rdma_conn->cur_queue_depth > 0);
SPDK_TRACELOG(SPDK_TRACE_RDMA, SPDK_TRACELOG(SPDK_TRACE_RDMA,
@ -1358,8 +1357,8 @@ spdk_nvmf_rdma_poll(struct spdk_nvmf_conn *conn)
break; break;
case IBV_WC_RECV: case IBV_WC_RECV:
if (wc.byte_len < sizeof(struct spdk_nvmf_capsule_cmd)) { if (wc[i].byte_len < sizeof(struct spdk_nvmf_capsule_cmd)) {
SPDK_ERRLOG("recv length %u less than capsule header\n", wc.byte_len); SPDK_ERRLOG("recv length %u less than capsule header\n", wc[i].byte_len);
return -1; return -1;
} }
@ -1393,12 +1392,13 @@ spdk_nvmf_rdma_poll(struct spdk_nvmf_conn *conn)
} }
break; break;
case SPDK_NVMF_REQUEST_PREP_ERROR: case SPDK_NVMF_REQUEST_PREP_ERROR:
return spdk_nvmf_rdma_request_complete(req); spdk_nvmf_rdma_request_complete(req);
break;
} }
break; break;
default: default:
SPDK_ERRLOG("Received an unknown opcode on the CQ: %d\n", wc.opcode); SPDK_ERRLOG("Received an unknown opcode on the CQ: %d\n", wc[i].opcode);
return -1; return -1;
} }
} }