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

Commit 1b681a5e authored by Chuck Lever's avatar Chuck Lever Committed by Sasha Levin
Browse files

xprtrdma: Take struct ib_device_attr off the stack 



[ Upstream commit 7bc7972cdd1f137552ca979caa11c8acbe119ae8 ]

Device attributes are large, and are used in more than one place.
Stash a copy in dynamically allocated memory.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent ecac1344

net/sunrpc/xprtrdma/verbs.c

+13 −24
Original line number Diff line number Diff line
@@ -511,8 +511,8 @@ int 
rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg)

{

	int rc, mem_priv;

	struct ib_device_attr devattr;

	struct rpcrdma_ia *ia = &xprt->rx_ia;

	struct ib_device_attr *devattr = &ia->ri_devattr;



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

	if (IS_ERR(ia->ri_id)) {
@@ -528,26 +528,21 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 
		goto out2;

	}



	/*

	 * Query the device to determine if the requested memory

	 * registration strategy is supported. If it isn't, set the

	 * strategy to a globally supported model.

	 */

	rc = ib_query_device(ia->ri_id->device, &devattr);

	rc = ib_query_device(ia->ri_id->device, devattr);

	if (rc) {

		dprintk("RPC:       %s: ib_query_device failed %d\n",

			__func__, rc);

		goto out2;

	}



	if (devattr.device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY) {

	if (devattr->device_cap_flags & IB_DEVICE_LOCAL_DMA_LKEY) {

		ia->ri_have_dma_lkey = 1;

		ia->ri_dma_lkey = ia->ri_id->device->local_dma_lkey;

	}



	if (memreg == RPCRDMA_FRMR) {

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

		if ((devattr.device_cap_flags &

		if ((devattr->device_cap_flags &

		     (IB_DEVICE_MEM_MGT_EXTENSIONS|IB_DEVICE_LOCAL_DMA_LKEY)) !=

		    (IB_DEVICE_MEM_MGT_EXTENSIONS|IB_DEVICE_LOCAL_DMA_LKEY)) {

			dprintk("RPC:       %s: FRMR registration "
@@ -557,7 +552,7 @@ rpcrdma_ia_open(struct rpcrdma_xprt *xprt, struct sockaddr *addr, int memreg) 
			/* 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);

				devattr->max_fast_reg_page_list_len);

		}

	}

	if (memreg == RPCRDMA_MTHCAFMR) {
@@ -655,20 +650,13 @@ int 
rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia,

				struct rpcrdma_create_data_internal *cdata)

{

	struct ib_device_attr devattr;

	struct ib_device_attr *devattr = &ia->ri_devattr;

	struct ib_cq *sendcq, *recvcq;

	int rc, err;



	rc = ib_query_device(ia->ri_id->device, &devattr);

	if (rc) {

		dprintk("RPC:       %s: ib_query_device failed %d\n",

			__func__, rc);

		return rc;

	}



	/* check provider's send/recv wr limits */

	if (cdata->max_requests > devattr.max_qp_wr)

		cdata->max_requests = devattr.max_qp_wr;

	if (cdata->max_requests > devattr->max_qp_wr)

		cdata->max_requests = devattr->max_qp_wr;



	ep->rep_attr.event_handler = rpcrdma_qp_async_error_upcall;

	ep->rep_attr.qp_context = ep;
@@ -703,8 +691,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 


		}

		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 (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 *
@@ -786,10 +774,11 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, 


	/* Client offers RDMA Read but does not initiate */

	ep->rep_remote_cma.initiator_depth = 0;

	if (devattr.max_qp_rd_atom > 32)	/* arbitrary but <= 255 */

	if (devattr->max_qp_rd_atom > 32)	/* arbitrary but <= 255 */

		ep->rep_remote_cma.responder_resources = 32;

	else

		ep->rep_remote_cma.responder_resources = devattr.max_qp_rd_atom;

		ep->rep_remote_cma.responder_resources =

						devattr->max_qp_rd_atom;



	ep->rep_remote_cma.retry_count = 7;

	ep->rep_remote_cma.flow_control = 0;

net/sunrpc/xprtrdma/xprt_rdma.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct rpcrdma_ia { 
	int			ri_async_rc;

	enum rpcrdma_memreg	ri_memreg_strategy;

	unsigned int		ri_max_frmr_depth;

	struct ib_device_attr	ri_devattr;

};



/*