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

nvmf: Remove nvmf_recv in RDMA layer.

Browse Source 
Inline this code into the places that called it. These two
spots will be combined into a single path in a later patch.

Change-Id: Ice2f009ad56b783dc28ebbf1abbb877ce6000293
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2016-07-22 14:28:35 -07:00
parent 2625cf4261
commit 6beb310cf3
1 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
lib/nvmf/rdma.c
View File

@ -826,54 +826,6 @@ spdk_nvmf_request_prep_data(struct spdk_nvmf_request *req,
return 0; return 0;
} }
static int
nvmf_recv(struct spdk_nvmf_rdma_request *rdma_req, struct ibv_wc *wc)
{
int ret;
struct spdk_nvmf_request *req;
void *bb;
if (wc->byte_len < sizeof(struct spdk_nvmf_capsule_cmd)) {
SPDK_ERRLOG("recv length %u less than capsule header\n", wc->byte_len);
return -1;
}
req = &rdma_req->req;
memset(req->rsp, 0, sizeof(*req->rsp));
bb = rdma_req->bb_mr->addr;
ret = spdk_nvmf_request_prep_data(req,
bb, wc->byte_len - sizeof(struct spdk_nvmf_capsule_cmd),
bb, rdma_req->bb_mr->length);
if (ret < 0) {
SPDK_ERRLOG("prep_data failed\n");
return spdk_nvmf_request_complete(req);
}
if (ret == 0) {
/* Data is available now; execute command immediately. */
ret = spdk_nvmf_request_exec(req);
if (ret < 0) {
SPDK_ERRLOG("Command execution failed\n");
return -1;
}
return 1;
}
/*
* Pending transfer from host to controller; command will continue
* once transfer is complete.
*/
ret = nvmf_post_rdma_read(req);
if (ret) {
SPDK_ERRLOG("Unable to transfer data from host to controller\n");
return -1;
}
return 0;
}
static void static void
nvmf_rdma_accept(struct rte_timer *timer, void *arg) nvmf_rdma_accept(struct rte_timer *timer, void *arg)
{ {
@ -915,14 +867,42 @@ nvmf_rdma_accept(struct rte_timer *timer, void *arg)
SPDK_TRACELOG(SPDK_TRACE_RDMA, "Received new capsule on pending connection.\n"); SPDK_TRACELOG(SPDK_TRACE_RDMA, "Received new capsule on pending connection.\n");
spdk_trace_record(TRACE_NVMF_IO_START, 0, 0, wc.wr_id, 0); spdk_trace_record(TRACE_NVMF_IO_START, 0, 0, wc.wr_id, 0);
rdma_req = (struct spdk_nvmf_rdma_request *)wc.wr_id; rdma_req = (struct spdk_nvmf_rdma_request *)wc.wr_id;
rc = nvmf_recv(rdma_req, &wc); if (wc.byte_len < sizeof(struct spdk_nvmf_capsule_cmd)) {
SPDK_ERRLOG("recv length %u less than capsule header\n", wc.byte_len);
nvmf_rdma_conn_cleanup(&rdma_conn->conn);
continue;
}
memset(rdma_req->req.rsp, 0, sizeof(*rdma_req->req.rsp));
rc = spdk_nvmf_request_prep_data(&rdma_req->req,
rdma_req->bb_mr->addr,
wc.byte_len - sizeof(struct spdk_nvmf_capsule_cmd),
rdma_req->bb_mr->addr,
rdma_req->bb_mr->length);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("nvmf_recv processing failure\n"); SPDK_ERRLOG("prep_data failed\n");
TAILQ_REMOVE(&g_pending_conns, rdma_conn, link); TAILQ_REMOVE(&g_pending_conns, rdma_conn, link);
nvmf_rdma_conn_cleanup(&rdma_conn->conn); nvmf_rdma_conn_cleanup(&rdma_conn->conn);
continue; continue;
} else if (rc > 0) { } else if (rc == 0) {
/* Data is immediately available */
rc = spdk_nvmf_request_exec(&rdma_req->req);
if (rc < 0) {
SPDK_ERRLOG("Command execution failed\n");
TAILQ_REMOVE(&g_pending_conns, rdma_conn, link);
nvmf_rdma_conn_cleanup(&rdma_conn->conn);
continue;
}
TAILQ_REMOVE(&g_pending_conns, rdma_conn, link); TAILQ_REMOVE(&g_pending_conns, rdma_conn, link);
} else {
/* Start transfer of data from host to target */
rc = nvmf_post_rdma_read(&rdma_req->req);
if (rc) {
SPDK_ERRLOG("Unable to transfer data from host to target\n");
TAILQ_REMOVE(&g_pending_conns, rdma_conn, link);
nvmf_rdma_conn_cleanup(&rdma_conn->conn);
continue;
}
} }
} else if (wc.opcode == IBV_WC_RDMA_READ) { } else if (wc.opcode == IBV_WC_RDMA_READ) {
/* A previously received capsule finished grabbing /* A previously received capsule finished grabbing
@ -1197,11 +1177,36 @@ 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, (uint64_t)req, 0); spdk_trace_record(TRACE_NVMF_IO_START, 0, 0, (uint64_t)req, 0);
rc = nvmf_recv(rdma_req, &wc);
if (rc < 0) { if (wc.byte_len < sizeof(struct spdk_nvmf_capsule_cmd)) {
SPDK_ERRLOG("nvmf_recv processing failure\n"); SPDK_ERRLOG("recv length %u less than capsule header\n", wc.byte_len);
return -1; return -1;
} }
memset(req->rsp, 0, sizeof(*req->rsp));
rc = spdk_nvmf_request_prep_data(req,
rdma_req->bb_mr->addr,
wc.byte_len - sizeof(struct spdk_nvmf_capsule_cmd),
rdma_req->bb_mr->addr,
rdma_req->bb_mr->length);
if (rc < 0) {
SPDK_ERRLOG("prep_data failed\n");
return spdk_nvmf_request_complete(req);
} else if (rc == 0) {
/* Data is immediately available */
rc = spdk_nvmf_request_exec(req);
if (rc < 0) {
SPDK_ERRLOG("Command execution failed\n");
return -1;
}
} else {
/* Start transfer of data from host to target */
rc = nvmf_post_rdma_read(req);
if (rc) {
SPDK_ERRLOG("Unable to transfer data from host to target\n");
return -1;
}
}
break; break;
default: default: