Commit 36bdd905 authored Aug 19, 2019 by Chuck Lever Committed by Anna Schumaker Aug 20, 2019

xprtrdma: Fix calculation of ri_max_segs again



Commit 302d3deb ("xprtrdma: Prevent inline overflow") added this
calculation back in 2016, but got it wrong. I tested only the lower
bound, which is why there is a max_t there. The upper bound should be
rounded up too.

Now, when using DIV_ROUND_UP, that takes care of the lower bound as
well.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent af08a775

net/sunrpc/xprtrdma/frwr_ops.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -260,8 +260,8 @@ int frwr_open(struct rpcrdma_ia ia, struct rpcrdma_ep ep)
		ep->rep_attr.cap.max_recv_wr += RPCRDMA_BACKWARD_WRS;
		ep->rep_attr.cap.max_recv_wr += 1; /* for ib_drain_rq */

		ia->ri_max_segs = max_t(unsigned int, 1, RPCRDMA_MAX_DATA_SEGS /
		ia->ri_max_frwr_depth);
		ia->ri_max_segs =
		DIV_ROUND_UP(RPCRDMA_MAX_DATA_SEGS, ia->ri_max_frwr_depth);
		/* Reply chunks require segments for head and tail buffers */
		ia->ri_max_segs += 2;
		if (ia->ri_max_segs > RPCRDMA_MAX_HDR_SEGS)

Admin message