diff options
| author | Tom Tucker <tom@opengridcomputing.com> | 2008-08-11 15:14:53 -0500 |
|---|---|---|
| committer | Tom Tucker <tom@opengridcomputing.com> | 2008-10-06 14:46:08 -0500 |
| commit | 04911b539c9817aa88a6da8f563e65e3e0bc974b (patch) | |
| tree | 9379440a4ca2a972d02d35feb3ac6ab0419e96c4 /net | |
| parent | afd566ea080572499cc01d42d2f578bf4b54f20f (diff) | |
| download | kernel_samsung_crespo-04911b539c9817aa88a6da8f563e65e3e0bc974b.zip kernel_samsung_crespo-04911b539c9817aa88a6da8f563e65e3e0bc974b.tar.gz kernel_samsung_crespo-04911b539c9817aa88a6da8f563e65e3e0bc974b.tar.bz2 | |
svcrdma: Update svc_rdma_send_error to use DMA LKEY
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>
Diffstat (limited to 'net')
| -rw-r--r-- | 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 98f945c..c0cd334 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -1314,10 +1314,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); @@ -1338,6 +1342,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); } } |