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

nvmf: make internal functions private to rdma.c

Browse Source 
Change-Id: Id073674f5be7b164afa9d83ba34ad6f83883f12f
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-06-27 11:23:23 -07:00
parent 6e5f700bea
commit 08cc45fec4
3 changed files with 40 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/nvmf/conn.h
View File

@ -91,7 +91,4 @@ nvmf_init_conn_properites(struct spdk_nvmf_conn *conn,
int spdk_nvmf_startup_conn(struct spdk_nvmf_conn *conn); int spdk_nvmf_startup_conn(struct spdk_nvmf_conn *conn);
void
nvmf_deactive_tx_desc(struct nvme_qp_tx_desc *tx_desc);
#endif /* NVMF_CONN_H */ #endif /* NVMF_CONN_H */

80
lib/nvmf/rdma.c
View File

@ -73,7 +73,7 @@ struct spdk_nvmf_rdma {
static struct spdk_nvmf_rdma g_rdma = { }; static struct spdk_nvmf_rdma g_rdma = { };
void static void
nvmf_active_tx_desc(struct nvme_qp_tx_desc *tx_desc) nvmf_active_tx_desc(struct nvme_qp_tx_desc *tx_desc)
{ {
struct spdk_nvmf_conn *conn; struct spdk_nvmf_conn *conn;
@ -86,7 +86,7 @@ nvmf_active_tx_desc(struct nvme_qp_tx_desc *tx_desc)
STAILQ_INSERT_TAIL(&conn->rdma.qp_tx_active_desc, tx_desc, link); STAILQ_INSERT_TAIL(&conn->rdma.qp_tx_active_desc, tx_desc, link);
} }
void static void
nvmf_deactive_tx_desc(struct nvme_qp_tx_desc *tx_desc) nvmf_deactive_tx_desc(struct nvme_qp_tx_desc *tx_desc)
{ {
struct spdk_nvmf_conn *conn; struct spdk_nvmf_conn *conn;
@ -354,6 +354,43 @@ nvmf_post_rdma_write(struct spdk_nvmf_conn *conn,
return (rc); return (rc);
} }
static int
nvmf_post_rdma_recv(struct spdk_nvmf_conn *conn,
struct nvme_qp_rx_desc *rx_desc)
{
struct ibv_recv_wr wr, *bad_wr = NULL;
int rc;
/* Update Connection SQ Tracking, increment
the SQ head counter opening up another
RX recv slot.
*/
conn->sq_head < (conn->rdma.sq_depth - 1) ? (conn->sq_head++) : (conn->sq_head = 0);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "sq_head %x, sq_depth %x\n", conn->sq_head, conn->rdma.sq_depth);
wr.wr_id = (uintptr_t)rx_desc;
wr.next = NULL;
wr.sg_list = &rx_desc->recv_sgl;
wr.num_sge = 1;
nvmf_trace_ibv_sge(&rx_desc->recv_sgl);
/* for I/O queues we add bb sgl for in-capsule data use */
if (conn->type == CONN_TYPE_IOQ) {
wr.num_sge = 2;
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "sgl2 local addr %p\n",
(void *)rx_desc->bb_sgl.addr);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "sgl2 length %x\n", rx_desc->bb_sgl.length);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "sgl2 lkey %x\n", rx_desc->bb_sgl.lkey);
}
rc = ibv_post_recv(conn->rdma.qp, &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_conn *conn, nvmf_post_rdma_send(struct spdk_nvmf_conn *conn,
struct spdk_nvmf_request *req) struct spdk_nvmf_request *req)
@ -419,43 +456,6 @@ command_fail:
return -1; return -1;
} }
int
nvmf_post_rdma_recv(struct spdk_nvmf_conn *conn,
struct nvme_qp_rx_desc *rx_desc)
{
struct ibv_recv_wr wr, *bad_wr = NULL;
int rc;
/* Update Connection SQ Tracking, increment
the SQ head counter opening up another
RX recv slot.
*/
conn->sq_head < (conn->rdma.sq_depth - 1) ? (conn->sq_head++) : (conn->sq_head = 0);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "sq_head %x, sq_depth %x\n", conn->sq_head, conn->rdma.sq_depth);
wr.wr_id = (uintptr_t)rx_desc;
wr.next = NULL;
wr.sg_list = &rx_desc->recv_sgl;
wr.num_sge = 1;
nvmf_trace_ibv_sge(&rx_desc->recv_sgl);
/* for I/O queues we add bb sgl for in-capsule data use */
if (conn->type == CONN_TYPE_IOQ) {
wr.num_sge = 2;
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "sgl2 local addr %p\n",
(void *)rx_desc->bb_sgl.addr);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "sgl2 length %x\n", rx_desc->bb_sgl.length);
SPDK_TRACELOG(SPDK_TRACE_DEBUG, "sgl2 lkey %x\n", rx_desc->bb_sgl.lkey);
}
rc = ibv_post_recv(conn->rdma.qp, &wr, &bad_wr);
if (rc) {
SPDK_ERRLOG("Failure posting rdma recv, rc = 0x%x\n", rc);
}
return (rc);
}
static int static int
nvmf_rdma_connect(struct rdma_cm_event *event) nvmf_rdma_connect(struct rdma_cm_event *event)
{ {
@ -1107,7 +1107,7 @@ fail:
return -ENOMEM; return -ENOMEM;
} }
int static int
nvmf_process_pending_rdma(struct spdk_nvmf_conn *conn) nvmf_process_pending_rdma(struct spdk_nvmf_conn *conn)
{ {
struct nvme_qp_tx_desc *tx_desc; struct nvme_qp_tx_desc *tx_desc;

6
lib/nvmf/rdma.h
View File

@ -86,20 +86,14 @@ struct nvme_qp_tx_desc {
int nvmf_post_rdma_read(struct spdk_nvmf_conn *conn, int nvmf_post_rdma_read(struct spdk_nvmf_conn *conn,
struct spdk_nvmf_request *req); struct spdk_nvmf_request *req);
int nvmf_post_rdma_recv(struct spdk_nvmf_conn *conn,
struct nvme_qp_rx_desc *rx_desc);
int spdk_nvmf_rdma_request_complete(struct spdk_nvmf_conn *conn, int spdk_nvmf_rdma_request_complete(struct spdk_nvmf_conn *conn,
struct spdk_nvmf_request *req); struct spdk_nvmf_request *req);
int nvmf_process_pending_rdma(struct spdk_nvmf_conn *conn);
int nvmf_rdma_init(void); int nvmf_rdma_init(void);
void nvmf_rdma_conn_cleanup(struct spdk_nvmf_conn *conn); void nvmf_rdma_conn_cleanup(struct spdk_nvmf_conn *conn);
int nvmf_acceptor_start(void); int nvmf_acceptor_start(void);
void nvmf_acceptor_stop(void); void nvmf_acceptor_stop(void);
void nvmf_active_tx_desc(struct nvme_qp_tx_desc *tx_desc);
void nvmf_deactive_tx_desc(struct nvme_qp_tx_desc *tx_desc);
int nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn); int nvmf_check_rdma_completions(struct spdk_nvmf_conn *conn);
#endif /* _NVMF_RDMA_H_ */ #endif /* _NVMF_RDMA_H_ */