[PATCH,RFC 09/09] svcrdma: Update svc_rdma_send_error to use DMA LKEY

[PATCH,RFC 09/09] svcrdma: Update svc_rdma_send_error to use DMA LKEY

[Tom Tucker]

Update the svc_rdma_send_error code to use the DMA LKEY which is valid
regardless of the memory registration strategy in use.

Signed-off-by: Tom Tucker <tom@opengridcomputing.com>

---
  net/sunrpc/xprtrdma/svc_rdma_transport.c |   11 +++++++++--
  1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
index e75cb96..94f51da 100644
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
@@ -1331,10 +1331,14 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
  	length = svc_rdma_xdr_encode_error(xprt, rmsgp, err, va);

  	/* Prepare SGE for local address */
-	atomic_inc(&xprt->sc_dma_used);
  	sge.addr = ib_dma_map_page(xprt->sc_cm_id->device,
  				   p, 0, PAGE_SIZE, DMA_FROM_DEVICE);
-	sge.lkey = xprt->sc_phys_mr->lkey;
+	if (ib_dma_mapping_error(xprt->sc_cm_id->device, sge.addr)) {
+		put_page(p);
+		return;
+	}
+	atomic_inc(&xprt->sc_dma_used);
+	sge.lkey = xprt->sc_dma_lkey;
  	sge.length = length;

  	ctxt = svc_rdma_get_context(xprt);
@@ -1355,6 +1359,9 @@ void svc_rdma_send_error(struct svcxprt_rdma *xprt, struct rpcrdma_msg *rmsgp,
  	if (ret) {
  		dprintk("svcrdma: Error %d posting send for protocol error\n",
  			ret);
+		ib_dma_unmap_page(xprt->sc_cm_id->device,
+				  sge.addr, PAGE_SIZE,
+				  DMA_FROM_DEVICE);
  		svc_rdma_put_context(ctxt, 1);
  	}
  }