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

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

xprtrdma: Add "init MRs" memreg op 



This method is used when setting up a new transport instance to
create a pool of Memory Region objects that will be used to register
memory during operation.

Memory Regions are not needed for "physical" registration, since
->prepare and ->release are no-ops for that mode.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Tested-by: default avatarDevesh Sharma <Devesh.Sharma@Emulex.Com>
Tested-by: default avatarMeghana Cheripady <Meghana.Cheripady@Emulex.Com>
Tested-by: default avatarVeeresh U. Kokatnur <veereshuk@chelsio.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 6814baea

net/sunrpc/xprtrdma/fmr_ops.c

+42 −0
Original line number Diff line number Diff line
@@ -29,6 +29,47 @@ fmr_op_maxpages(struct rpcrdma_xprt *r_xprt) 
		     rpcrdma_max_segments(r_xprt) * RPCRDMA_MAX_FMR_SGES);

}



static int

fmr_op_init(struct rpcrdma_xprt *r_xprt)

{

	struct rpcrdma_buffer *buf = &r_xprt->rx_buf;

	int mr_access_flags = IB_ACCESS_REMOTE_WRITE | IB_ACCESS_REMOTE_READ;

	struct ib_fmr_attr fmr_attr = {

		.max_pages	= RPCRDMA_MAX_FMR_SGES,

		.max_maps	= 1,

		.page_shift	= PAGE_SHIFT

	};

	struct ib_pd *pd = r_xprt->rx_ia.ri_pd;

	struct rpcrdma_mw *r;

	int i, rc;



	INIT_LIST_HEAD(&buf->rb_mws);

	INIT_LIST_HEAD(&buf->rb_all);



	i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS;

	dprintk("RPC:       %s: initalizing %d FMRs\n", __func__, i);



	while (i--) {

		r = kzalloc(sizeof(*r), GFP_KERNEL);

		if (!r)

			return -ENOMEM;



		r->r.fmr = ib_alloc_fmr(pd, mr_access_flags, &fmr_attr);

		if (IS_ERR(r->r.fmr))

			goto out_fmr_err;



		list_add(&r->mw_list, &buf->rb_mws);

		list_add(&r->mw_all, &buf->rb_all);

	}

	return 0;



out_fmr_err:

	rc = PTR_ERR(r->r.fmr);

	dprintk("RPC:       %s: ib_alloc_fmr status %i\n", __func__, rc);

	kfree(r);

	return rc;

}



/* Use the ib_map_phys_fmr() verb to register a memory region

 * for remote access via RDMA READ or RDMA WRITE.

 */
@@ -109,5 +150,6 @@ const struct rpcrdma_memreg_ops rpcrdma_fmr_memreg_ops = { 
	.ro_map				= fmr_op_map,

	.ro_unmap			= fmr_op_unmap,

	.ro_maxpages			= fmr_op_maxpages,

	.ro_init			= fmr_op_init,

	.ro_displayname			= "fmr",

};

net/sunrpc/xprtrdma/frwr_ops.c

+66 −0
Original line number Diff line number Diff line
@@ -17,6 +17,35 @@ 
# define RPCDBG_FACILITY	RPCDBG_TRANS

#endif



static int

__frwr_init(struct rpcrdma_mw *r, struct ib_pd *pd, struct ib_device *device,

	    unsigned int depth)

{

	struct rpcrdma_frmr *f = &r->r.frmr;

	int rc;



	f->fr_mr = ib_alloc_fast_reg_mr(pd, depth);

	if (IS_ERR(f->fr_mr))

		goto out_mr_err;

	f->fr_pgl = ib_alloc_fast_reg_page_list(device, depth);

	if (IS_ERR(f->fr_pgl))

		goto out_list_err;

	return 0;



out_mr_err:

	rc = PTR_ERR(f->fr_mr);

	dprintk("RPC:       %s: ib_alloc_fast_reg_mr status %i\n",

		__func__, rc);

	return rc;



out_list_err:

	rc = PTR_ERR(f->fr_pgl);

	dprintk("RPC:       %s: ib_alloc_fast_reg_page_list status %i\n",

		__func__, rc);

	ib_dereg_mr(f->fr_mr);

	return rc;

}



/* FRWR mode conveys a list of pages per chunk segment. The

 * maximum length of that list is the FRWR page list depth.

 */
@@ -29,6 +58,42 @@ frwr_op_maxpages(struct rpcrdma_xprt *r_xprt) 
		     rpcrdma_max_segments(r_xprt) * ia->ri_max_frmr_depth);

}



static int

frwr_op_init(struct rpcrdma_xprt *r_xprt)

{

	struct rpcrdma_buffer *buf = &r_xprt->rx_buf;

	struct ib_device *device = r_xprt->rx_ia.ri_id->device;

	unsigned int depth = r_xprt->rx_ia.ri_max_frmr_depth;

	struct ib_pd *pd = r_xprt->rx_ia.ri_pd;

	int i;



	INIT_LIST_HEAD(&buf->rb_mws);

	INIT_LIST_HEAD(&buf->rb_all);



	i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS;

	dprintk("RPC:       %s: initalizing %d FRMRs\n", __func__, i);



	while (i--) {

		struct rpcrdma_mw *r;

		int rc;



		r = kzalloc(sizeof(*r), GFP_KERNEL);

		if (!r)

			return -ENOMEM;



		rc = __frwr_init(r, pd, device, depth);

		if (rc) {

			kfree(r);

			return rc;

		}



		list_add(&r->mw_list, &buf->rb_mws);

		list_add(&r->mw_all, &buf->rb_all);

	}



	return 0;

}



/* Post a FAST_REG Work Request to register a memory region

 * for remote access via RDMA READ or RDMA WRITE.

 */
@@ -149,5 +214,6 @@ const struct rpcrdma_memreg_ops rpcrdma_frwr_memreg_ops = { 
	.ro_map				= frwr_op_map,

	.ro_unmap			= frwr_op_unmap,

	.ro_maxpages			= frwr_op_maxpages,

	.ro_init			= frwr_op_init,

	.ro_displayname			= "frwr",

};

net/sunrpc/xprtrdma/physical_ops.c

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ physical_op_maxpages(struct rpcrdma_xprt *r_xprt) 
		     rpcrdma_max_segments(r_xprt));

}



static int

physical_op_init(struct rpcrdma_xprt *r_xprt)

{

	return 0;

}



/* The client's physical memory is already exposed for

 * remote access via RDMA READ or RDMA WRITE.

 */
@@ -57,5 +63,6 @@ const struct rpcrdma_memreg_ops rpcrdma_physical_memreg_ops = { 
	.ro_map				= physical_op_map,

	.ro_unmap			= physical_op_unmap,

	.ro_maxpages			= physical_op_maxpages,

	.ro_init			= physical_op_init,

	.ro_displayname			= "physical",

};

net/sunrpc/xprtrdma/verbs.c

+3 −101
Original line number Diff line number Diff line
@@ -1124,91 +1124,6 @@ out: 
	return ERR_PTR(rc);

}



static int

rpcrdma_init_fmrs(struct rpcrdma_ia *ia, struct rpcrdma_buffer *buf)

{

	int mr_access_flags = IB_ACCESS_REMOTE_WRITE | IB_ACCESS_REMOTE_READ;

	struct ib_fmr_attr fmr_attr = {

		.max_pages	= RPCRDMA_MAX_DATA_SEGS,

		.max_maps	= 1,

		.page_shift	= PAGE_SHIFT

	};

	struct rpcrdma_mw *r;

	int i, rc;



	i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS;

	dprintk("RPC:       %s: initalizing %d FMRs\n", __func__, i);



	while (i--) {

		r = kzalloc(sizeof(*r), GFP_KERNEL);

		if (r == NULL)

			return -ENOMEM;



		r->r.fmr = ib_alloc_fmr(ia->ri_pd, mr_access_flags, &fmr_attr);

		if (IS_ERR(r->r.fmr)) {

			rc = PTR_ERR(r->r.fmr);

			dprintk("RPC:       %s: ib_alloc_fmr failed %i\n",

				__func__, rc);

			goto out_free;

		}



		list_add(&r->mw_list, &buf->rb_mws);

		list_add(&r->mw_all, &buf->rb_all);

	}

	return 0;



out_free:

	kfree(r);

	return rc;

}



static int

rpcrdma_init_frmrs(struct rpcrdma_ia *ia, struct rpcrdma_buffer *buf)

{

	struct rpcrdma_frmr *f;

	struct rpcrdma_mw *r;

	int i, rc;



	i = (buf->rb_max_requests + 1) * RPCRDMA_MAX_SEGS;

	dprintk("RPC:       %s: initalizing %d FRMRs\n", __func__, i);



	while (i--) {

		r = kzalloc(sizeof(*r), GFP_KERNEL);

		if (r == NULL)

			return -ENOMEM;

		f = &r->r.frmr;



		f->fr_mr = ib_alloc_fast_reg_mr(ia->ri_pd,

						ia->ri_max_frmr_depth);

		if (IS_ERR(f->fr_mr)) {

			rc = PTR_ERR(f->fr_mr);

			dprintk("RPC:       %s: ib_alloc_fast_reg_mr "

				"failed %i\n", __func__, rc);

			goto out_free;

		}



		f->fr_pgl = ib_alloc_fast_reg_page_list(ia->ri_id->device,

							ia->ri_max_frmr_depth);

		if (IS_ERR(f->fr_pgl)) {

			rc = PTR_ERR(f->fr_pgl);

			dprintk("RPC:       %s: ib_alloc_fast_reg_page_list "

				"failed %i\n", __func__, rc);



			ib_dereg_mr(f->fr_mr);

			goto out_free;

		}



		list_add(&r->mw_list, &buf->rb_mws);

		list_add(&r->mw_all, &buf->rb_all);

	}



	return 0;



out_free:

	kfree(r);

	return rc;

}



int

rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt)

{
@@ -1245,22 +1160,9 @@ rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt) 
	buf->rb_recv_bufs = (struct rpcrdma_rep **) p;

	p = (char *) &buf->rb_recv_bufs[buf->rb_max_requests];



	INIT_LIST_HEAD(&buf->rb_mws);

	INIT_LIST_HEAD(&buf->rb_all);

	switch (ia->ri_memreg_strategy) {

	case RPCRDMA_FRMR:

		rc = rpcrdma_init_frmrs(ia, buf);

	rc = ia->ri_ops->ro_init(r_xprt);

	if (rc)

		goto out;

		break;

	case RPCRDMA_MTHCAFMR:

		rc = rpcrdma_init_fmrs(ia, buf);

		if (rc)

			goto out;

		break;

	default:

		break;

	}



	for (i = 0; i < buf->rb_max_requests; i++) {

		struct rpcrdma_req *req;

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ struct rpcrdma_memreg_ops { 
	int		(*ro_unmap)(struct rpcrdma_xprt *,

				    struct rpcrdma_mr_seg *);

	size_t		(*ro_maxpages)(struct rpcrdma_xprt *);

	int		(*ro_init)(struct rpcrdma_xprt *);

	const char	*ro_displayname;

};