Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1ed857e authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

xprtrdma: Clean up rpcrdma_ia_open() 



Untangle the end of rpcrdma_ia_open() by moving DMA MR set-up, which
is different for each registration method, to the .ro_open functions.

This is refactoring only. No behavior change is expected.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarDevesh Sharma <devesh.sharma@avagotech.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent e531dcab

net/sunrpc/xprtrdma/fmr_ops.c

+19 −0
Original line number Diff line number Diff line
@@ -39,6 +39,25 @@ static int 
fmr_op_open(struct rpcrdma_ia *ia, struct rpcrdma_ep *ep,

	    struct rpcrdma_create_data_internal *cdata)

{

	struct ib_device_attr *devattr = &ia->ri_devattr;

	struct ib_mr *mr;



	/* Obtain an lkey to use for the regbufs, which are

	 * protected from remote access.

	 */

	if (devattr->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY) {

		ia->ri_dma_lkey = ia->ri_device->local_dma_lkey;

	} else {

		mr = ib_get_dma_mr(ia->ri_pd, IB_ACCESS_LOCAL_WRITE);

		if (IS_ERR(mr)) {

			pr_err("%s: ib_get_dma_mr for failed with %lX\n",

			       __func__, PTR_ERR(mr));

			return -ENOMEM;

		}

		ia->ri_dma_lkey = ia->ri_dma_mr->lkey;

		ia->ri_dma_mr = mr;

	}



	return 0;

}

net/sunrpc/xprtrdma/frwr_ops.c

+5 −0
Original line number Diff line number Diff line
@@ -189,6 +189,11 @@ frwr_op_open(struct rpcrdma_ia *ia, struct rpcrdma_ep *ep, 
	struct ib_device_attr *devattr = &ia->ri_devattr;

	int depth, delta;



	/* Obtain an lkey to use for the regbufs, which are

	 * protected from remote access.

	 */

	ia->ri_dma_lkey = ia->ri_device->local_dma_lkey;



	ia->ri_max_frmr_depth =

			min_t(unsigned int, RPCRDMA_MAX_DATA_SEGS,

			      devattr->max_fast_reg_page_list_len);

net/sunrpc/xprtrdma/physical_ops.c

+24 −1
Original line number Diff line number Diff line
@@ -23,6 +23,29 @@ static int 
physical_op_open(struct rpcrdma_ia *ia, struct rpcrdma_ep *ep,

		 struct rpcrdma_create_data_internal *cdata)

{

	struct ib_device_attr *devattr = &ia->ri_devattr;

	struct ib_mr *mr;



	/* Obtain an rkey to use for RPC data payloads.

	 */

	mr = ib_get_dma_mr(ia->ri_pd,

			   IB_ACCESS_LOCAL_WRITE |

			   IB_ACCESS_REMOTE_WRITE |

			   IB_ACCESS_REMOTE_READ);

	if (IS_ERR(mr)) {

		pr_err("%s: ib_get_dma_mr for failed with %lX\n",

		       __func__, PTR_ERR(mr));

		return -ENOMEM;

	}

	ia->ri_dma_mr = mr;



	/* Obtain an lkey to use for regbufs.

	 */

	if (devattr->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY)

		ia->ri_dma_lkey = ia->ri_device->local_dma_lkey;

	else

		ia->ri_dma_lkey = ia->ri_dma_mr->lkey;



	return 0;

}
@@ -51,7 +74,7 @@ physical_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, 
	struct rpcrdma_ia *ia = &r_xprt->rx_ia;



	rpcrdma_map_one(ia->ri_device, seg, rpcrdma_data_dir(writing));

	seg->mr_rkey = ia->ri_bind_mem->rkey;

	seg->mr_rkey = ia->ri_dma_mr->rkey;

	seg->mr_base = seg->mr_dma;

	seg->mr_nsegs = 1;

	return 1;

net/sunrpc/xprtrdma/verbs.c

+18 −42
Original line number Diff line number Diff line
@@ -493,9 +493,11 @@ rpcrdma_clean_cq(struct ib_cq *cq) 
int

rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)

{

	int rc, mem_priv;

	struct rpcrdma_ia *ia = &xprt->rx_ia;

	struct ib_device_attr *devattr = &ia->ri_devattr;

	int rc;



	ia->ri_dma_mr = NULL;



	ia->ri_id = rpcrdma_create_id(xprt, ia, addr);

	if (IS_ERR(ia->ri_id)) {
@@ -519,11 +521,6 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 
		goto out3;

	}



	if (devattr->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY) {

		ia->ri_have_dma_lkey = 1;

		ia->ri_dma_lkey = ia->ri_device->local_dma_lkey;

	}



	if (memreg == RPCRDMA_FRMR) {

		/* Requires both frmr reg and local dma lkey */

		if (((devattr->device_cap_flags &
@@ -543,38 +540,15 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 
		}

	}



	/*

	 * Optionally obtain an underlying physical identity mapping in

	 * order to do a memory window-based bind. This base registration

	 * is protected from remote access - that is enabled only by binding

	 * for the specific bytes targeted during each RPC operation, and

	 * revoked after the corresponding completion similar to a storage

	 * adapter.

	 */

	switch (memreg) {

	case RPCRDMA_FRMR:

		ia->ri_ops = &rpcrdma_frwr_memreg_ops;

		break;

	case RPCRDMA_ALLPHYSICAL:

		ia->ri_ops = &rpcrdma_physical_memreg_ops;

		mem_priv = IB_ACCESS_LOCAL_WRITE |

				IB_ACCESS_REMOTE_WRITE |

				IB_ACCESS_REMOTE_READ;

		goto register_setup;

		break;

	case RPCRDMA_MTHCAFMR:

		ia->ri_ops = &rpcrdma_fmr_memreg_ops;

		if (ia->ri_have_dma_lkey)

			break;

		mem_priv = IB_ACCESS_LOCAL_WRITE;

	register_setup:

		ia->ri_bind_mem = ib_get_dma_mr(ia->ri_pd, mem_priv);

		if (IS_ERR(ia->ri_bind_mem)) {

			printk(KERN_ALERT "%s: ib_get_dma_mr for "

				"phys register failed with %lX\n",

				__func__, PTR_ERR(ia->ri_bind_mem));

			rc = -ENOMEM;

			goto out3;

		}

		break;

	default:

		printk(KERN_ERR "RPC: Unsupported memory "
@@ -606,15 +580,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 
void

rpcrdma_ia_close(struct rpcrdma_ia *ia)

{

	int rc;



	dprintk("RPC:       %s: entering\n", __func__);

	if (ia->ri_bind_mem != NULL) {

		rc = ib_dereg_mr(ia->ri_bind_mem);

		dprintk("RPC:       %s: ib_dereg_mr returned %i\n",

			__func__, rc);

	}



	if (ia->ri_id != NULL && !IS_ERR(ia->ri_id)) {

		if (ia->ri_id->qp)

			rdma_destroy_qp(ia->ri_id);
@@ -661,8 +627,10 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
	if (cdata->padding) {

		ep->rep_padbuf = rpcrdma_alloc_regbuf(ia, cdata->padding,

						      GFP_KERNEL);

		if (IS_ERR(ep->rep_padbuf))

			return PTR_ERR(ep->rep_padbuf);

		if (IS_ERR(ep->rep_padbuf)) {

			rc = PTR_ERR(ep->rep_padbuf);

			goto out0;

		}

	} else

		ep->rep_padbuf = NULL;
@@ -749,6 +717,9 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 
			__func__, err);

out1:

	rpcrdma_free_regbuf(ia, ep->rep_padbuf);

out0:

	if (ia->ri_dma_mr)

		ib_dereg_mr(ia->ri_dma_mr);

	return rc;

}
@@ -788,6 +759,12 @@ rpcrdma_ep_destroy(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) 
	if (rc)

		dprintk("RPC:       %s: ib_destroy_cq returned %i\n",

			__func__, rc);



	if (ia->ri_dma_mr) {

		rc = ib_dereg_mr(ia->ri_dma_mr);

		dprintk("RPC:       %s: ib_dereg_mr returned %i\n",

			__func__, rc);

	}

}



/*
@@ -1262,8 +1239,7 @@ rpcrdma_alloc_regbuf(struct rpcrdma_ia *ia, size_t size, gfp_t flags) 
		goto out_free;



	iov->length = size;

	iov->lkey = ia->ri_have_dma_lkey ?

				ia->ri_dma_lkey : ia->ri_bind_mem->lkey;

	iov->lkey = ia->ri_dma_lkey;

	rb->rg_size = size;

	rb->rg_owner = NULL;

	return rb;

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −2
Original line number Diff line number Diff line
@@ -65,9 +65,8 @@ struct rpcrdma_ia { 
	struct ib_device	*ri_device;

	struct rdma_cm_id 	*ri_id;

	struct ib_pd		*ri_pd;

	struct ib_mr		*ri_bind_mem;

	struct ib_mr		*ri_dma_mr;

	u32			ri_dma_lkey;

	int			ri_have_dma_lkey;

	struct completion	ri_done;

	int			ri_async_rc;

	unsigned int		ri_max_frmr_depth;