linux-nfs.vger.kernel.org archive mirror
 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 v4 11/24] xprtrdma: Reply buffer exhaustion can be catastrophic
Date: Wed, 29 Jun 2016 13:53:35 -0400	[thread overview]
Message-ID: <20160629175335.15094.20314.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20160629173231.15094.52660.stgit@manet.1015granger.net>

Not having an rpcrdma_rep at call_allocate time can be a problem.
It means that send_request can't post a receive buffer to catch
the RPC's reply. Possible consequences are RPC timeouts or even
transport deadlock.

Instead of allowing an RPC to proceed if an rpcrdma_rep is
not available, return NULL to force call_allocate to wait and
try again.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Steve Wise <swise@opengridcomputing.com>
---
 net/sunrpc/xprtrdma/verbs.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index cd4c5f1..6fb73ff 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -871,7 +871,7 @@ rpcrdma_buffer_create(struct rpcrdma_xprt *r_xprt)
 	}
 
 	INIT_LIST_HEAD(&buf->rb_recv_bufs);
-	for (i = 0; i < buf->rb_max_requests + 2; i++) {
+	for (i = 0; i < buf->rb_max_requests; i++) {
 		struct rpcrdma_rep *rep;
 
 		rep = rpcrdma_create_rep(r_xprt);
@@ -989,8 +989,6 @@ rpcrdma_put_mw(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mw *mw)
 
 /*
  * Get a set of request/reply buffers.
- *
- * Reply buffer (if available) is attached to send buffer upon return.
  */
 struct rpcrdma_req *
 rpcrdma_buffer_get(struct rpcrdma_buffer *buffers)
@@ -1009,13 +1007,13 @@ rpcrdma_buffer_get(struct rpcrdma_buffer *buffers)
 
 out_reqbuf:
 	spin_unlock(&buffers->rb_lock);
-	pr_warn("RPC:       %s: out of request buffers\n", __func__);
+	pr_warn("rpcrdma: out of request buffers (%p)\n", buffers);
 	return NULL;
 out_repbuf:
+	list_add(&req->rl_free, &buffers->rb_send_bufs);
 	spin_unlock(&buffers->rb_lock);
-	pr_warn("RPC:       %s: out of reply buffers\n", __func__);
-	req->rl_reply = NULL;
-	return req;
+	pr_warn("rpcrdma: out of reply buffers (%p)\n", buffers);
+	return NULL;
 }
 
 /*


  parent reply	other threads:[~2016-06-29 17:53 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-29 17:52 [PATCH v4 00/24] NFS/RDMA client patches proposed for v4.8 Chuck Lever
2016-06-29 17:52 ` [PATCH v4 01/24] xprtrdma: Remove FMRs from the unmap list after unmapping Chuck Lever
2016-06-29 17:52 ` [PATCH v4 02/24] xprtrdma: Create common scatterlist fields in rpcrdma_mw Chuck Lever
2016-06-29 17:52 ` [PATCH v4 03/24] xprtrdma: Move init and release helpers Chuck Lever
2016-06-29 17:52 ` [PATCH v4 04/24] xprtrdma: Rename fields in rpcrdma_fmr Chuck Lever
2016-06-29 17:52 ` [PATCH v4 05/24] xprtrdma: Use scatterlist for DMA mapping and unmapping under FMR Chuck Lever
2016-06-29 17:52 ` [PATCH v4 06/24] xprtrdma: Refactor MR recovery work queues Chuck Lever
2016-06-29 17:53 ` [PATCH v4 07/24] xprtrdma: Do not leak an MW during a DMA map failure Chuck Lever
2016-06-29 17:53 ` [PATCH v4 08/24] xprtrdma: Remove ALLPHYSICAL memory registration mode Chuck Lever
2016-06-29 17:53 ` [PATCH v4 09/24] xprtrdma: Remove rpcrdma_map_one() and friends Chuck Lever
2016-06-29 17:53 ` [PATCH v4 10/24] xprtrdma: Clean up device capability detection Chuck Lever
2016-06-29 17:53 ` Chuck Lever [this message]
2016-06-29 17:53 ` [PATCH v4 12/24] xprtrdma: Honor ->send_request API contract Chuck Lever
2016-06-29 17:53 ` [PATCH v4 13/24] xprtrdma: Chunk list encoders must not return zero Chuck Lever
2016-06-29 17:54 ` [PATCH v4 14/24] xprtrdma: Allocate MRs on demand Chuck Lever
2016-06-29 17:54 ` [PATCH v4 15/24] xprtrdma: Release orphaned MRs immediately Chuck Lever
2016-06-29 17:54 ` [PATCH v4 16/24] xprtrdma: Place registered MWs on a per-req list Chuck Lever
2016-06-29 17:54 ` [PATCH v4 17/24] xprtrdma: Chunk list encoders no longer share one rl_segments array Chuck Lever
2016-06-29 17:54 ` [PATCH v4 18/24] xprtrdma: rpcrdma_inline_fixup() overruns the receive page list Chuck Lever
2016-06-29 17:54 ` [PATCH v4 19/24] xprtrdma: Do not update {head, tail}.iov_len in rpcrdma_inline_fixup() Chuck Lever
2016-06-29 17:54 ` [PATCH v4 20/24] xprtrdma: Update only specific fields in private receive buffer Chuck Lever
2016-06-29 17:54 ` [PATCH v4 21/24] xprtrdma: Clean up fixup_copy_count accounting Chuck Lever
2016-06-29 17:55 ` [PATCH v4 22/24] xprtrdma: No direct data placement with krb5i and krb5p Chuck Lever
2016-06-29 17:55 ` [PATCH v4 23/24] svc: Avoid garbage replies when pc_func() returns rpc_drop_reply Chuck Lever
2016-06-29 17:55 ` [PATCH v4 24/24] NFS: Don't drop CB requests with invalid principals Chuck Lever

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=20160629175335.15094.20314.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;
as well as URLs for NNTP newsgroup(s).