Commit b623589d authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

svcrdma: Eliminate RPCRDMA_SQ_DEPTH_MULT 



The Send Queue depth is temporarily reduced to 1 SQE per credit. The
new rdma_rw API does an internal computation, during QP creation, to
increase the depth of the Send Queue to handle RDMA Read and Write
operations.

This change has to come before the NFSD code paths are updated to
use the rdma_rw API. Without this patch, rdma_rw_init_qp() increases
the size of the SQ too much, resulting in memory allocation failures
during QP creation.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 6e6092ca

include/linux/sunrpc/svc_rdma.h

+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ struct svcxprt_rdma { 
/* The default ORD value is based on two outstanding full-size writes with a

 * page size of 4k, or 32k * 2 ops / 4k = 16 outstanding RDMA_READ.  */

#define RPCRDMA_ORD             (64/4)

#define RPCRDMA_SQ_DEPTH_MULT   8

#define RPCRDMA_MAX_REQUESTS    32

#define RPCRDMA_MAX_REQ_SIZE    4096

net/sunrpc/xprtrdma/svc_rdma.c

+0 −2
Original line number Diff line number Diff line
@@ -247,8 +247,6 @@ int svc_rdma_init(void) 
	dprintk("SVCRDMA Module Init, register RPC RDMA transport\n");

	dprintk("\tsvcrdma_ord      : %d\n", svcrdma_ord);

	dprintk("\tmax_requests     : %u\n", svcrdma_max_requests);

	dprintk("\tsq_depth         : %u\n",

		svcrdma_max_requests * RPCRDMA_SQ_DEPTH_MULT);

	dprintk("\tmax_bc_requests  : %u\n", svcrdma_max_bc_requests);

	dprintk("\tmax_inline       : %d\n", svcrdma_max_req_size);

net/sunrpc/xprtrdma/svc_rdma_transport.c

+1 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,7 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt) 
					    svcrdma_max_bc_requests);

	newxprt->sc_rq_depth = newxprt->sc_max_requests +

			       newxprt->sc_max_bc_requests;

	newxprt->sc_sq_depth = RPCRDMA_SQ_DEPTH_MULT * newxprt->sc_rq_depth;

	newxprt->sc_sq_depth = newxprt->sc_rq_depth;

	atomic_set(&newxprt->sc_sq_avail, newxprt->sc_sq_depth);



	if (!svc_rdma_prealloc_ctxts(newxprt))

CRA Git | Maintained and supported by SUSTech CRA and CCSE