public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Chuck Lever <chuck.lever@oracle.com>
To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org
Subject: [PATCH v2 05/10] xprtrdma: Re-write rpcrdma_flush_cqs()
Date: Sat, 08 Nov 2014 20:14:45 -0500	[thread overview]
Message-ID: <20141109011445.8806.70952.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20141109010328.8806.5861.stgit@manet.1015granger.net>

Currently rpcrdma_flush_cqs() attempts to avoid code duplication,
and simply invokes rpcrdma_recvcq_upcall and rpcrdma_sendcq_upcall.

1. rpcrdma_flush_cqs() can run concurrently with provider upcalls.
   Both flush_cqs() and the upcalls were invoking ib_poll_cq() in
   different threads using the same wc buffers (ep->rep_recv_wcs
   and ep->rep_send_wcs), added by commit 1c00dd077654 ("xprtrmda:
   Reduce calls to ib_poll_cq() in completion handlers").

   During transport disconnect processing, this sometimes resulted
   in the same reply getting added to the rpcrdma_tasklets_g list
   more than once, which corrupted the list.

2. The upcall functions drain only a limited number of CQEs,
   thanks to the poll budget added by commit 8301a2c047cc
   ("xprtrdma: Limit work done by completion handler").

Fixes: a7bc211ac926 ("xprtrdma: On disconnect, don't ignore ... ")
BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=276
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 net/sunrpc/xprtrdma/verbs.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
index 478b2fd..e6ac964 100644
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@ -317,8 +317,15 @@ rpcrdma_recvcq_upcall(struct ib_cq *cq, void *cq_context)
 static void
 rpcrdma_flush_cqs(struct rpcrdma_ep *ep)
 {
-	rpcrdma_recvcq_upcall(ep->rep_attr.recv_cq, ep);
-	rpcrdma_sendcq_upcall(ep->rep_attr.send_cq, ep);
+	struct ib_wc wc;
+	LIST_HEAD(sched_list);
+
+	while (ib_poll_cq(ep->rep_attr.recv_cq, 1, &wc) > 0)
+		rpcrdma_recvcq_process_wc(&wc, &sched_list);
+	if (!list_empty(&sched_list))
+		rpcrdma_schedule_tasklet(&sched_list);
+	while (ib_poll_cq(ep->rep_attr.send_cq, 1, &wc) > 0)
+		rpcrdma_sendcq_process_wc(&wc);
 }
 
 #ifdef RPC_DEBUG


  parent reply	other threads:[~2014-11-09  1:14 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-09  1:14 [PATCH v2 00/10] NFS/RDMA patches for 3.19 Chuck Lever
2014-11-09  1:14 ` [PATCH v2 01/10] xprtrdma: Return an errno from rpcrdma_register_external() Chuck Lever
2014-11-09  1:14 ` [PATCH v2 02/10] xprtrdma: Cap req_cqinit Chuck Lever
2014-11-09 10:13   ` Sagi Grimberg
2014-11-09 21:43     ` Chuck Lever
2014-11-09  1:14 ` [PATCH v2 03/10] xprtrdma: unmap all FMRs during transport disconnect Chuck Lever
2014-11-09  1:14 ` [PATCH v2 04/10] xprtrdma: Refactor tasklet scheduling Chuck Lever
2014-11-09  1:14 ` Chuck Lever [this message]
2014-11-09  1:14 ` [PATCH v2 06/10] xprtrdma: Enable pad optimization Chuck Lever
2014-11-10 14:36   ` Anna Schumaker
2014-11-10 14:54     ` Chuck Lever
2014-11-10 15:05       ` J. Bruce Fields
2014-11-09  1:15 ` [PATCH v2 07/10] xprtrdma: Display async errors Chuck Lever
2014-11-11 14:30   ` Sagi Grimberg
2014-11-11 16:52     ` Chuck Lever
2014-11-11 18:49       ` Sagi Grimberg
2014-11-11 20:30         ` Or Gerlitz
2014-11-09  1:15 ` [PATCH v2 08/10] SUNRPC: serialize iostats updates Chuck Lever
2014-11-09  1:15 ` [PATCH v2 09/10] NFS: SETCLIENTID XDR buffer sizes are incorrect Chuck Lever
2014-11-10 15:22   ` Anna Schumaker
2014-11-10 16:21     ` Trond Myklebust
2014-11-09  1:15 ` [PATCH v2 10/10] NFS: Clean up nfs4_init_callback() Chuck Lever
2014-11-26 16:25 ` [PATCH v2 00/10] NFS/RDMA patches for 3.19 Anna Schumaker
2014-11-26 16:36   ` 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=20141109011445.8806.70952.stgit@manet.1015granger.net \
    --to=chuck.lever@oracle.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