| Message ID | 161721936504.515226.14877637433211331378.stgit@manet.1015granger.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xprtrdma Receive Queue fixes | expand |
On 3/31/2021 3:36 PM, Chuck Lever wrote: > Commit e340c2d6ef2a ("xprtrdma: Reduce the doorbell rate (Receive)") > increased the number of Receive WRs that are posted by the client, > but did not increase the size of the Receive Queue allocated during > transport set-up. > > This is usually not an issue because RPCRDMA_BACKWARD_WRS is defined > as (32) when SUNRPC_BACKCHANNEL is defined. In cases where it isn't, > there is a real risk of Receive Queue wrapping. > > Fixes: e340c2d6ef2a ("xprtrdma: Reduce the doorbell rate (Receive)") > Signed-off-by: Chuck Lever <chuck.lever@oracle.com> > --- > net/sunrpc/xprtrdma/frwr_ops.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c > index 766a1048a48a..132df9b59ab4 100644 > --- a/net/sunrpc/xprtrdma/frwr_ops.c > +++ b/net/sunrpc/xprtrdma/frwr_ops.c > @@ -257,6 +257,7 @@ int frwr_query_device(struct rpcrdma_ep *ep, const struct ib_device *device) > ep->re_attr.cap.max_send_wr += 1; /* for ib_drain_sq */ > ep->re_attr.cap.max_recv_wr = ep->re_max_requests; > ep->re_attr.cap.max_recv_wr += RPCRDMA_BACKWARD_WRS; > + ep->re_attr.cap.max_recv_wr += RPCRDMA_MAX_RECV_BATCH; Naively, it seems to me this should be max(BACKWARD, BATCH). But, extra WR slots are cheap and safe. Reviewed-By: Tom Talpey <tom@talpey.com> > ep->re_attr.cap.max_recv_wr += 1; /* for ib_drain_rq */ > > ep->re_max_rdma_segs = > > >
diff --git a/net/sunrpc/xprtrdma/frwr_ops.c b/net/sunrpc/xprtrdma/frwr_ops.c index 766a1048a48a..132df9b59ab4 100644 --- a/net/sunrpc/xprtrdma/frwr_ops.c +++ b/net/sunrpc/xprtrdma/frwr_ops.c @@ -257,6 +257,7 @@ int frwr_query_device(struct rpcrdma_ep *ep, const struct ib_device *device) ep->re_attr.cap.max_send_wr += 1; /* for ib_drain_sq */ ep->re_attr.cap.max_recv_wr = ep->re_max_requests; ep->re_attr.cap.max_recv_wr += RPCRDMA_BACKWARD_WRS; + ep->re_attr.cap.max_recv_wr += RPCRDMA_MAX_RECV_BATCH; ep->re_attr.cap.max_recv_wr += 1; /* for ib_drain_rq */ ep->re_max_rdma_segs =
Commit e340c2d6ef2a ("xprtrdma: Reduce the doorbell rate (Receive)") increased the number of Receive WRs that are posted by the client, but did not increase the size of the Receive Queue allocated during transport set-up. This is usually not an issue because RPCRDMA_BACKWARD_WRS is defined as (32) when SUNRPC_BACKCHANNEL is defined. In cases where it isn't, there is a real risk of Receive Queue wrapping. Fixes: e340c2d6ef2a ("xprtrdma: Reduce the doorbell rate (Receive)") Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- net/sunrpc/xprtrdma/frwr_ops.c | 1 + 1 file changed, 1 insertion(+)