diff options
| author | Steve Wise <swise@opengridcomputing.com> | 2015-08-07 18:11:20 +0200 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2015-08-31 00:08:46 +0200 |
| commit | 9ac07501e1918b8d1140adcc360e8d8c7f5a2f7c (patch) | |
| tree | 98de70b2b6d2a8325fa55cc46a69a1609ebad77f | |
| parent | xprtrdma, svcrdma: Convert to ib_alloc_mr (diff) | |
| download | linux-9ac07501e1918b8d1140adcc360e8d8c7f5a2f7c.tar.xz linux-9ac07501e1918b8d1140adcc360e8d8c7f5a2f7c.zip | |
svcrdma: limit FRMR page list lengths to device max
Svcrdma was incorrectly allocating fastreg MRs and page lists using
RPCSVC_MAXPAGES, which can exceed the device capabilities. So limit
the depth to the minimum of RPCSVC_MAXPAGES and xprt->sc_frmr_pg_list_len.
Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
| -rw-r--r-- | net/sunrpc/xprtrdma/svc_rdma_transport.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c index 8752a2d653b5..11d5133c3f38 100644 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c @@ -733,17 +733,19 @@ static struct svc_rdma_fastreg_mr *rdma_alloc_frmr(struct svcxprt_rdma *xprt) struct ib_mr *mr; struct ib_fast_reg_page_list *pl; struct svc_rdma_fastreg_mr *frmr; + u32 num_sg; frmr = kmalloc(sizeof(*frmr), GFP_KERNEL); if (!frmr) goto err; - mr = ib_alloc_mr(xprt->sc_pd, IB_MR_TYPE_MEM_REG, RPCSVC_MAXPAGES); + num_sg = min_t(u32, RPCSVC_MAXPAGES, xprt->sc_frmr_pg_list_len); + mr = ib_alloc_mr(xprt->sc_pd, IB_MR_TYPE_MEM_REG, num_sg); if (IS_ERR(mr)) goto err_free_frmr; pl = ib_alloc_fast_reg_page_list(xprt->sc_cm_id->device, - RPCSVC_MAXPAGES); + num_sg); if (IS_ERR(pl)) goto err_free_mr; |