xprtrdma: Remove rl_mr field, and the mr_chunk union

Clean up: Since commit 0ac531c18323 ("xprtrdma: Remove REGISTER
memory registration mode"), the rl_mr pointer is no longer used
anywhere.

After removal, there's only a single member of the mr_chunk union,
so mr_chunk can be removed as well, in favor of a single pointer
field.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 56e14b369d42cc8b4d2dbdcbd8b63891688bc585..1000f637edeeb02bb18a389ab94510a6c1473ea5 100644 (file)
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1493,8 +1493,8 @@ rpcrdma_buffer_put_mrs(struct rpcrdma_req *req, struct rpcrdma_buffer *buf)
        int i;
 
        for (i = 1, seg++; i < RPCRDMA_MAX_SEGS; seg++, i++)
-               rpcrdma_buffer_put_mr(&seg->mr_chunk.rl_mw, buf);
-       rpcrdma_buffer_put_mr(&seg1->mr_chunk.rl_mw, buf);
+               rpcrdma_buffer_put_mr(&seg->rl_mw, buf);
+       rpcrdma_buffer_put_mr(&seg1->rl_mw, buf);
 }
 
 static void
@@ -1580,7 +1580,7 @@ rpcrdma_buffer_get_frmrs(struct rpcrdma_req *req, struct rpcrdma_buffer *buf,
                        list_add(&r->mw_list, stale);
                        continue;
                }
-               req->rl_segments[i].mr_chunk.rl_mw = r;
+               req->rl_segments[i].rl_mw = r;
                if (unlikely(i-- == 0))
                        return req;     /* Success */
        }
@@ -1602,7 +1602,7 @@ rpcrdma_buffer_get_fmrs(struct rpcrdma_req *req, struct rpcrdma_buffer *buf)
                r = list_entry(buf->rb_mws.next,
                               struct rpcrdma_mw, mw_list);
                list_del(&r->mw_list);
-               req->rl_segments[i].mr_chunk.rl_mw = r;
+               req->rl_segments[i].rl_mw = r;
                if (unlikely(i-- == 0))
                        return req;     /* Success */
        }
@@ -1842,7 +1842,7 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
                        struct rpcrdma_xprt *r_xprt)
 {
        struct rpcrdma_mr_seg *seg1 = seg;
-       struct rpcrdma_mw *mw = seg1->mr_chunk.rl_mw;
+       struct rpcrdma_mw *mw = seg1->rl_mw;
        struct rpcrdma_frmr *frmr = &mw->r.frmr;
        struct ib_mr *mr = frmr->fr_mr;
        struct ib_send_wr fastreg_wr, *bad_wr;
@@ -1931,12 +1931,12 @@ rpcrdma_deregister_frmr_external(struct rpcrdma_mr_seg *seg,
        struct ib_send_wr invalidate_wr, *bad_wr;
        int rc;
 
-       seg1->mr_chunk.rl_mw->r.frmr.fr_state = FRMR_IS_INVALID;
+       seg1->rl_mw->r.frmr.fr_state = FRMR_IS_INVALID;
 
        memset(&invalidate_wr, 0, sizeof invalidate_wr);
-       invalidate_wr.wr_id = (unsigned long)(void *)seg1->mr_chunk.rl_mw;
+       invalidate_wr.wr_id = (unsigned long)(void *)seg1->rl_mw;
        invalidate_wr.opcode = IB_WR_LOCAL_INV;
-       invalidate_wr.ex.invalidate_rkey = seg1->mr_chunk.rl_mw->r.frmr.fr_mr->rkey;
+       invalidate_wr.ex.invalidate_rkey = seg1->rl_mw->r.frmr.fr_mr->rkey;
        DECR_CQCOUNT(&r_xprt->rx_ep);
 
        read_lock(&ia->ri_qplock);
@@ -1946,7 +1946,7 @@ rpcrdma_deregister_frmr_external(struct rpcrdma_mr_seg *seg,
        read_unlock(&ia->ri_qplock);
        if (rc) {
                /* Force rpcrdma_buffer_get() to retry */
-               seg1->mr_chunk.rl_mw->r.frmr.fr_state = FRMR_IS_STALE;
+               seg1->rl_mw->r.frmr.fr_state = FRMR_IS_STALE;
                dprintk("RPC:       %s: failed ib_post_send for invalidate,"
                        " status %i\n", __func__, rc);
        }
@@ -1978,8 +1978,7 @@ rpcrdma_register_fmr_external(struct rpcrdma_mr_seg *seg,
                    offset_in_page((seg-1)->mr_offset + (seg-1)->mr_len))
                        break;
        }
-       rc = ib_map_phys_fmr(seg1->mr_chunk.rl_mw->r.fmr,
-                               physaddrs, i, seg1->mr_dma);
+       rc = ib_map_phys_fmr(seg1->rl_mw->r.fmr, physaddrs, i, seg1->mr_dma);
        if (rc) {
                dprintk("RPC:       %s: failed ib_map_phys_fmr "
                        "%u@0x%llx+%i (%d)... status %i\n", __func__,
@@ -1988,7 +1987,7 @@ rpcrdma_register_fmr_external(struct rpcrdma_mr_seg *seg,
                while (i--)
                        rpcrdma_unmap_one(ia, --seg);
        } else {
-               seg1->mr_rkey = seg1->mr_chunk.rl_mw->r.fmr->rkey;
+               seg1->mr_rkey = seg1->rl_mw->r.fmr->rkey;
                seg1->mr_base = seg1->mr_dma + pageoff;
                seg1->mr_nsegs = i;
                seg1->mr_len = len;
@@ -2005,7 +2004,7 @@ rpcrdma_deregister_fmr_external(struct rpcrdma_mr_seg *seg,
        LIST_HEAD(l);
        int rc;
 
-       list_add(&seg1->mr_chunk.rl_mw->r.fmr->list, &l);
+       list_add(&seg1->rl_mw->r.fmr->list, &l);
        rc = ib_unmap_fmr(&l);
        read_lock(&ia->ri_qplock);
        while (seg1->mr_nsegs--)

diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 5160a84fdb72ef77b37c9a854277a61805b59fa1..532d58667b9d11e1065344ce11a0c4775cd60a50 100644 (file)
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -210,10 +210,7 @@ struct rpcrdma_mw {
  */
 
 struct rpcrdma_mr_seg {                /* chunk descriptors */
-       union {                         /* chunk memory handles */
-               struct ib_mr    *rl_mr;         /* if registered directly */
-               struct rpcrdma_mw *rl_mw;       /* if registered from region */
-       } mr_chunk;
+       struct rpcrdma_mw *rl_mw;       /* registered MR */
        u64             mr_base;        /* registration result */
        u32             mr_rkey;        /* registration result */
        u32             mr_len;         /* length of chunk or segment */