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

nvmf/rdma: Manually inline nvmf_rdma_post_recv

Browse Source 
Now that all of the SGL mappings are static,
this function just called ibv_post_recv. Delete
the function and call ibv_post_recv directly.

Change-Id: I45216170a157709249b08c4cb0ebdb1adb906049
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Ben Walker 2017-03-15 12:55:21 -07:00 committed by Daniel Verkamp
parent 2d0246da83
commit e0bdfb14ee
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/nvmf/rdma.c
View File

@ -228,9 +228,6 @@ get_rdma_sess(struct spdk_nvmf_session *sess)
session)); session));
} }
static int nvmf_post_rdma_recv(struct spdk_nvmf_rdma_conn *rdma_conn,
struct spdk_nvmf_rdma_recv *rdma_recv);
static void static void
spdk_nvmf_rdma_conn_destroy(struct spdk_nvmf_rdma_conn *rdma_conn) spdk_nvmf_rdma_conn_destroy(struct spdk_nvmf_rdma_conn *rdma_conn)
{ {
@ -360,6 +357,8 @@ spdk_nvmf_rdma_conn_create(struct rdma_cm_id *id, struct ibv_comp_channel *chann
rdma_conn->bufs, max_queue_depth * g_rdma.in_capsule_data_size, rdma_conn->bufs_mr->lkey); rdma_conn->bufs, max_queue_depth * g_rdma.in_capsule_data_size, rdma_conn->bufs_mr->lkey);
for (i = 0; i < max_queue_depth; i++) { for (i = 0; i < max_queue_depth; i++) {
struct ibv_recv_wr *bad_wr = NULL;
rdma_recv = &rdma_conn->recvs[i]; rdma_recv = &rdma_conn->recvs[i];
/* Set up memory to receive commands */ /* Set up memory to receive commands */
@ -380,7 +379,8 @@ spdk_nvmf_rdma_conn_create(struct rdma_cm_id *id, struct ibv_comp_channel *chann
rdma_recv->in_use = false; rdma_recv->in_use = false;
#endif #endif
if (nvmf_post_rdma_recv(rdma_conn, rdma_recv)) { rc = ibv_post_recv(rdma_conn->cm_id->qp, &rdma_recv->wr, &bad_wr);
if (rc) {
SPDK_ERRLOG("Unable to post capsule for RDMA RECV\n"); SPDK_ERRLOG("Unable to post capsule for RDMA RECV\n");
spdk_nvmf_rdma_conn_destroy(rdma_conn); spdk_nvmf_rdma_conn_destroy(rdma_conn);
return NULL; return NULL;
@ -502,23 +502,6 @@ nvmf_post_rdma_write(struct spdk_nvmf_request *req)
return rc; return rc;
} }
static int
nvmf_post_rdma_recv(struct spdk_nvmf_rdma_conn *rdma_conn,
struct spdk_nvmf_rdma_recv *rdma_recv)
{
struct ibv_recv_wr *bad_wr = NULL;
int rc;
SPDK_TRACELOG(SPDK_TRACE_RDMA, "RDMA RECV POSTED. Recv: %p Connection: %p\n", rdma_recv, rdma_conn);
rc = ibv_post_recv(rdma_conn->cm_id->qp, &rdma_recv->wr, &bad_wr);
if (rc) {
SPDK_ERRLOG("Failure posting rdma recv, rc = 0x%x\n", rc);
}
return rc;
}
static int static int
nvmf_post_rdma_send(struct spdk_nvmf_request *req) nvmf_post_rdma_send(struct spdk_nvmf_request *req)
{ {
@ -567,6 +550,7 @@ request_transfer_out(struct spdk_nvmf_request *req)
struct spdk_nvmf_conn *conn = req->conn; struct spdk_nvmf_conn *conn = req->conn;
struct spdk_nvmf_rdma_conn *rdma_conn = get_rdma_conn(conn); struct spdk_nvmf_rdma_conn *rdma_conn = get_rdma_conn(conn);
struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl; struct spdk_nvme_cpl *rsp = &req->rsp->nvme_cpl;
struct ibv_recv_wr *bad_wr = NULL;
/* Advance our sq_head pointer */ /* Advance our sq_head pointer */
if (conn->sq_head == conn->sq_head_max) { if (conn->sq_head == conn->sq_head_max) {
@ -582,7 +566,9 @@ request_transfer_out(struct spdk_nvmf_request *req)
assert(rdma_req->recv->in_use == true); assert(rdma_req->recv->in_use == true);
rdma_req->recv->in_use = false; rdma_req->recv->in_use = false;
#endif #endif
rc = nvmf_post_rdma_recv(rdma_conn, rdma_req->recv); SPDK_TRACELOG(SPDK_TRACE_RDMA, "RDMA RECV POSTED. Recv: %p Connection: %p\n", rdma_req->recv,
rdma_conn);
rc = ibv_post_recv(rdma_conn->cm_id->qp, &rdma_req->recv->wr, &bad_wr);
if (rc) { if (rc) {
SPDK_ERRLOG("Unable to re-post rx descriptor\n"); SPDK_ERRLOG("Unable to re-post rx descriptor\n");
return rc; return rc;