Linux NFS development
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: anna.schumaker@netapp.com
Cc: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v3 11/11] xprtrdma: Revert commit e7104a2a9606 ('xprtrdma: Cap req_cqinit').
Date: Mon, 14 Dec 2015 16:19:31 -0500	[thread overview]
Message-ID: <20151214211931.16295.74208.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20151214211317.16295.70115.stgit@manet.1015granger.net>

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>
---
 net/sunrpc/xprtrdma/verbs.c     |    6 ++----
 net/sunrpc/xprtrdma/xprt_rdma.h |    6 ------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index f23f3d6..1867e3a 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -608,10 +608,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);
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 089a7db..ba3bc3f 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -87,12 +87,6 @@ struct rpcrdma_ep {
 	struct delayed_work	rep_connect_worker;
 };
 
-/*
- * Force a signaled SEND Work Request every so often,
- * in case the provider needs to do some housekeeping.
- */
-#define RPCRDMA_MAX_UNSIGNALED_SENDS	(32)
-
 #define INIT_CQCOUNT(ep) atomic_set(&(ep)->rep_cqcount, (ep)->rep_cqinit)
 #define DECR_CQCOUNT(ep) atomic_sub_return(1, &(ep)->rep_cqcount)
 


  parent reply	other threads:[~2015-12-14 21:19 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-14 21:17 [PATCH v3 00/11] NFS/RDMA client patches for 4.5 Chuck Lever
2015-12-14 21:17 ` [PATCH v3 01/11] xprtrdma: Fix additional uses of spin_lock_irqsave(rb_lock) Chuck Lever
2015-12-14 21:17 ` [PATCH v3 02/11] xprtrdma: xprt_rdma_free() must not release backchannel reqs Chuck Lever
2015-12-14 21:18 ` [PATCH v3 03/11] xprtrdma: Disable RPC/RDMA backchannel debugging messages Chuck Lever
2015-12-14 21:18 ` [PATCH v3 04/11] xprtrdma: Move struct ib_send_wr off the stack Chuck Lever
2015-12-16 14:00   ` Sagi Grimberg
2015-12-16 15:06     ` Chuck Lever
2015-12-16 15:11       ` Christoph Hellwig
2015-12-16 15:13         ` Chuck Lever
2015-12-16 15:17           ` Christoph Hellwig
2015-12-14 21:18 ` [PATCH v3 05/11] xprtrdma: Introduce ro_unmap_sync method Chuck Lever
2015-12-14 21:18 ` [PATCH v3 06/11] xprtrdma: Add ro_unmap_sync method for FRWR Chuck Lever
2015-12-16 13:57   ` Sagi Grimberg
2015-12-16 15:09     ` Chuck Lever
2015-12-14 21:18 ` [PATCH v3 07/11] xprtrdma: Add ro_unmap_sync method for FMR Chuck Lever
2015-12-14 21:19 ` [PATCH v3 08/11] xprtrdma: Add ro_unmap_sync method for all-physical registration Chuck Lever
2015-12-14 21:19 ` [PATCH v3 09/11] SUNRPC: Introduce xprt_commit_rqst() Chuck Lever
2015-12-16 13:48   ` Anna Schumaker
2015-12-16 15:12     ` Chuck Lever
2015-12-14 21:19 ` [PATCH v3 10/11] xprtrdma: Invalidate in the RPC reply handler Chuck Lever
2015-12-14 21:19 ` Chuck Lever [this message]
2015-12-15 19:37 ` [PATCH v3 00/11] NFS/RDMA client patches for 4.5 Anna Schumaker
2015-12-16 12:11   ` Devesh Sharma

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20151214211931.16295.74208.stgit@manet.1015granger.net \
    --to=chuck.lever@oracle.com \
    --cc=anna.schumaker@netapp.com \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox