diff options
| author | Chuck Lever | 2015-12-16 23:23:20 +0100 |
|---|---|---|
| committer | Anna Schumaker | 2015-12-18 21:34:33 +0100 |
| commit | 26ae9d1c5af1b1d669ca1c28fc02bbca3d778d45 (patch) | |
| tree | d3bc75de097cbb8e9de3325a6e2bd80230c744a2 /net/sunrpc/xprtrdma/verbs.c | |
| parent | xprtrdma: Invalidate in the RPC reply handler (diff) | |
| download | kernel-qcow2-linux-26ae9d1c5af1b1d669ca1c28fc02bbca3d778d45.tar.gz kernel-qcow2-linux-26ae9d1c5af1b1d669ca1c28fc02bbca3d778d45.tar.xz kernel-qcow2-linux-26ae9d1c5af1b1d669ca1c28fc02bbca3d778d45.zip | |
xprtrdma: Revert commit e7104a2a9606 ('xprtrdma: Cap req_cqinit').
The root of the problem was that sends (especially unsignalled
FASTREG and LOCAL_INV Work Requests) were not properly flow-
controlled, which allowed a send queue overrun.
Now that the RPC/RDMA reply handler waits for invalidation to
complete, the send queue is properly flow-controlled. Thus this
limit is no longer necessary.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Devesh Sharma <devesh.sharma@avagotech.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net/sunrpc/xprtrdma/verbs.c')
| -rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 003630733ef3..732c71ce5dca 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -616,10 +616,8 @@ rpcrdma_ep_create(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia, /* set trigger for requesting send completion */ ep->rep_cqinit = ep->rep_attr.cap.max_send_wr/2 - 1; - if (ep->rep_cqinit > RPCRDMA_MAX_UNSIGNALED_SENDS) - ep->rep_cqinit = RPCRDMA_MAX_UNSIGNALED_SENDS; - else if (ep->rep_cqinit <= 2) - ep->rep_cqinit = 0; + if (ep->rep_cqinit <= 2) + ep->rep_cqinit = 0; /* always signal? */ INIT_CQCOUNT(ep); init_waitqueue_head(&ep->rep_connect_wait); INIT_DELAYED_WORK(&ep->rep_connect_worker, rpcrdma_connect_worker); |