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

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

xprtrdma: Add "open" memreg op 



The open op determines the size of various transport data structures
based on device capabilities and memory registration mode.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.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 4561f347

net/sunrpc/xprtrdma/fmr_ops.c

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,13 @@ 
/* Maximum scatter/gather per FMR */

#define RPCRDMA_MAX_FMR_SGES	(64)



static int

fmr_op_open(struct rpcrdma_ia *ia, struct rpcrdma_ep *ep,

	    struct rpcrdma_create_data_internal *cdata)

{

	return 0;

}



/* FMR mode conveys up to 64 pages of payload per chunk segment.

 */

static size_t
@@ -188,6 +195,7 @@ fmr_op_destroy(struct rpcrdma_buffer *buf) 
const struct rpcrdma_memreg_ops rpcrdma_fmr_memreg_ops = {

	.ro_map				= fmr_op_map,

	.ro_unmap			= fmr_op_unmap,

	.ro_open			= fmr_op_open,

	.ro_maxpages			= fmr_op_maxpages,

	.ro_init			= fmr_op_init,

	.ro_reset			= fmr_op_reset,

net/sunrpc/xprtrdma/frwr_ops.c

+48 −0
Original line number Diff line number Diff line
@@ -58,6 +58,53 @@ __frwr_release(struct rpcrdma_mw *r) 
	ib_free_fast_reg_page_list(r->r.frmr.fr_pgl);

}



static int

frwr_op_open(struct rpcrdma_ia *ia, struct rpcrdma_ep *ep,

	     struct rpcrdma_create_data_internal *cdata)

{

	struct ib_device_attr *devattr = &ia->ri_devattr;

	int depth, delta;



	ia->ri_max_frmr_depth =

			min_t(unsigned int, RPCRDMA_MAX_DATA_SEGS,

			      devattr->max_fast_reg_page_list_len);

	dprintk("RPC:       %s: device's max FR page list len = %u\n",

		__func__, ia->ri_max_frmr_depth);



	/* Add room for frmr register and invalidate WRs.

	 * 1. FRMR reg WR for head

	 * 2. FRMR invalidate WR for head

	 * 3. N FRMR reg WRs for pagelist

	 * 4. N FRMR invalidate WRs for pagelist

	 * 5. FRMR reg WR for tail

	 * 6. FRMR invalidate WR for tail

	 * 7. The RDMA_SEND WR

	 */

	depth = 7;



	/* Calculate N if the device max FRMR depth is smaller than

	 * RPCRDMA_MAX_DATA_SEGS.

	 */

	if (ia->ri_max_frmr_depth < RPCRDMA_MAX_DATA_SEGS) {

		delta = RPCRDMA_MAX_DATA_SEGS - ia->ri_max_frmr_depth;

		do {

			depth += 2; /* FRMR reg + invalidate */

			delta -= ia->ri_max_frmr_depth;

		} while (delta > 0);

	}



	ep->rep_attr.cap.max_send_wr *= depth;

	if (ep->rep_attr.cap.max_send_wr > devattr->max_qp_wr) {

		cdata->max_requests = devattr->max_qp_wr / depth;

		if (!cdata->max_requests)

			return -EINVAL;

		ep->rep_attr.cap.max_send_wr = cdata->max_requests *

					       depth;

	}



	return 0;

}



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

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

 */
@@ -276,6 +323,7 @@ frwr_op_destroy(struct rpcrdma_buffer *buf) 
const struct rpcrdma_memreg_ops rpcrdma_frwr_memreg_ops = {

	.ro_map				= frwr_op_map,

	.ro_unmap			= frwr_op_unmap,

	.ro_open			= frwr_op_open,

	.ro_maxpages			= frwr_op_maxpages,

	.ro_init			= frwr_op_init,

	.ro_reset			= frwr_op_reset,

net/sunrpc/xprtrdma/physical_ops.c

+8 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ 
# define RPCDBG_FACILITY	RPCDBG_TRANS

#endif



static int

physical_op_open(struct rpcrdma_ia *ia, struct rpcrdma_ep *ep,

		 struct rpcrdma_create_data_internal *cdata)

{

	return 0;

}



/* PHYSICAL memory registration conveys one page per chunk segment.

 */

static size_t
@@ -72,6 +79,7 @@ physical_op_destroy(struct rpcrdma_buffer *buf) 
const struct rpcrdma_memreg_ops rpcrdma_physical_memreg_ops = {

	.ro_map				= physical_op_map,

	.ro_unmap			= physical_op_unmap,

	.ro_open			= physical_op_open,

	.ro_maxpages			= physical_op_maxpages,

	.ro_init			= physical_op_init,

	.ro_reset			= physical_op_reset,

net/sunrpc/xprtrdma/verbs.c

+3 −46
Original line number Diff line number Diff line
@@ -622,11 +622,6 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 
			dprintk("RPC:       %s: FRMR registration "

				"not supported by HCA\n", __func__);

			memreg = RPCRDMA_MTHCAFMR;

		} else {

			/* Mind the ia limit on FRMR page list depth */

			ia->ri_max_frmr_depth = min_t(unsigned int,

				RPCRDMA_MAX_DATA_SEGS,

				devattr->max_fast_reg_page_list_len);

		}

	}

	if (memreg == RPCRDMA_MTHCAFMR) {
@@ -741,49 +736,11 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 


	ep->rep_attr.event_handler = rpcrdma_qp_async_error_upcall;

	ep->rep_attr.qp_context = ep;

	/* send_cq and recv_cq initialized below */

	ep->rep_attr.srq = NULL;

	ep->rep_attr.cap.max_send_wr = cdata->max_requests;

	switch (ia->ri_memreg_strategy) {

	case RPCRDMA_FRMR: {

		int depth = 7;



		/* Add room for frmr register and invalidate WRs.

		 * 1. FRMR reg WR for head

		 * 2. FRMR invalidate WR for head

		 * 3. N FRMR reg WRs for pagelist

		 * 4. N FRMR invalidate WRs for pagelist

		 * 5. FRMR reg WR for tail

		 * 6. FRMR invalidate WR for tail

		 * 7. The RDMA_SEND WR

		 */



		/* Calculate N if the device max FRMR depth is smaller than

		 * RPCRDMA_MAX_DATA_SEGS.

		 */

		if (ia->ri_max_frmr_depth < RPCRDMA_MAX_DATA_SEGS) {

			int delta = RPCRDMA_MAX_DATA_SEGS -

				    ia->ri_max_frmr_depth;



			do {

				depth += 2; /* FRMR reg + invalidate */

				delta -= ia->ri_max_frmr_depth;

			} while (delta > 0);



		}

		ep->rep_attr.cap.max_send_wr *= depth;

		if (ep->rep_attr.cap.max_send_wr > devattr->max_qp_wr) {

			cdata->max_requests = devattr->max_qp_wr / depth;

			if (!cdata->max_requests)

				return -EINVAL;

			ep->rep_attr.cap.max_send_wr = cdata->max_requests *

						       depth;

		}

		break;

	}

	default:

		break;

	}

	rc = ia->ri_ops->ro_open(ia, ep, cdata);

	if (rc)

		return rc;

	ep->rep_attr.cap.max_recv_wr = cdata->max_requests;

	ep->rep_attr.cap.max_send_sge = (cdata->padding ? 4 : 2);

	ep->rep_attr.cap.max_recv_sge = 1;

net/sunrpc/xprtrdma/xprt_rdma.h

+3 −0
Original line number Diff line number Diff line
@@ -340,6 +340,9 @@ struct rpcrdma_memreg_ops { 
				  struct rpcrdma_mr_seg *, int, bool);

	int		(*ro_unmap)(struct rpcrdma_xprt *,

				    struct rpcrdma_mr_seg *);

	int		(*ro_open)(struct rpcrdma_ia *,

				   struct rpcrdma_ep *,

				   struct rpcrdma_create_data_internal *);

	size_t		(*ro_maxpages)(struct rpcrdma_xprt *);

	int		(*ro_init)(struct rpcrdma_xprt *);

	void		(*ro_reset)(struct rpcrdma_xprt *);