aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtrdma/svc_rdma_transport.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sunrpc/xprtrdma/svc_rdma_transport.c')
-rw-r--r--net/sunrpc/xprtrdma/svc_rdma_transport.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index 7e8ee66458ea..6fddd588c031 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -155,6 +155,7 @@ static void svc_rdma_unmap_dma(struct svc_rdma_op_ctxt *ctxt)
155 struct svcxprt_rdma *xprt = ctxt->xprt; 155 struct svcxprt_rdma *xprt = ctxt->xprt;
156 int i; 156 int i;
157 for (i = 0; i < ctxt->count && ctxt->sge[i].length; i++) { 157 for (i = 0; i < ctxt->count && ctxt->sge[i].length; i++) {
158 atomic_dec(&xprt->sc_dma_used);
158 ib_dma_unmap_single(xprt->sc_cm_id->device, 159 ib_dma_unmap_single(xprt->sc_cm_id->device,
159 ctxt->sge[i].addr, 160 ctxt->sge[i].addr,
160 ctxt->sge[i].length, 161 ctxt->sge[i].length,
@@ -519,6 +520,7 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv,
519 cma_xprt->sc_max_requests = svcrdma_max_requests; 520 cma_xprt->sc_max_requests = svcrdma_max_requests;
520 cma_xprt->sc_sq_depth = svcrdma_max_requests * RPCRDMA_SQ_DEPTH_MULT; 521 cma_xprt->sc_sq_depth = svcrdma_max_requests * RPCRDMA_SQ_DEPTH_MULT;
521 atomic_set(&cma_xprt->sc_sq_count, 0); 522 atomic_set(&cma_xprt->sc_sq_count, 0);
523 atomic_set(&cma_xprt->sc_ctxt_used, 0);
522 524
523 if (!listener) { 525 if (!listener) {
524 int reqs = cma_xprt->sc_max_requests; 526 int reqs = cma_xprt->sc_max_requests;
@@ -569,6 +571,7 @@ int svc_rdma_post_recv(struct svcxprt_rdma *xprt)
569 BUG_ON(sge_no >= xprt->sc_max_sge); 571 BUG_ON(sge_no >= xprt->sc_max_sge);
570 page = svc_rdma_get_page(); 572 page = svc_rdma_get_page();
571 ctxt->pages[sge_no] = page; 573 ctxt->pages[sge_no] = page;
574 atomic_inc(&xprt->sc_dma_used);
572 pa = ib_dma_map_page(xprt->sc_cm_id->device, 575 pa = ib_dma_map_page(xprt->sc_cm_id->device,
573 page, 0, PAGE_SIZE, 576 page, 0, PAGE_SIZE,
574 DMA_FROM_DEVICE); 577 DMA_FROM_DEVICE);
@@ -1049,6 +1052,7 @@ static void __svc_rdma_free(struct work_struct *work)
1049 1052
1050 /* Warn if we leaked a resource or under-referenced */ 1053 /* Warn if we leaked a resource or under-referenced */
1051 WARN_ON(atomic_read(&rdma->sc_ctxt_used) != 0); 1054 WARN_ON(atomic_read(&rdma->sc_ctxt_used) != 0);
1055 WARN_ON(atomic_read(&rdma->sc_dma_used) != 0);
1052 1056
1053 /* Destroy the QP if present (not a listener) */ 1057 /* Destroy the QP if present (not a listener) */
1054 if (rdma->sc_qp && !IS_ERR(rdma->sc_qp)) 1058 if (rdma->sc_qp && !IS_ERR(rdma->sc_qp))
@@ -1169,6 +1173,7 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
1169 length = svc_rdma_xdr_encode_error(xprt, rmsgp, err, va); 1173 length = svc_rdma_xdr_encode_error(xprt, rmsgp, err, va);
1170 1174
1171 /* Prepare SGE for local address */ 1175 /* Prepare SGE for local address */
1176 atomic_inc(&xprt->sc_dma_used);
1172 sge.addr = ib_dma_map_page(xprt->sc_cm_id->device, 1177 sge.addr = ib_dma_map_page(xprt->sc_cm_id->device,
1173 p, 0, PAGE_SIZE, DMA_FROM_DEVICE); 1178 p, 0, PAGE_SIZE, DMA_FROM_DEVICE);
1174 sge.lkey = xprt->sc_phys_mr->lkey; 1179 sge.lkey = xprt->sc_phys_mr->lkey;