From: Chuck Lever <chuck.lever-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> To: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH v2 09/11] SUNRPC: Introduce xprt_commit_rqst() Date: Mon, 30 Nov 2015 17:15:10 -0500 [thread overview] Message-ID: <20151130221510.12235.65241.stgit@manet.1015granger.net> (raw) In-Reply-To: <20151130221349.12235.29565.stgit-FYjufvaPoItvLzlybtyyYzGyq/o6K9yX@public.gmane.org> I'm about to add code in the RPC/RDMA reply handler between the xprt_lookup_rqst() and xprt_complete_rqst() call site that needs to execute outside of spinlock critical sections. Add a hook to remove an rpc_rqst from the pending list once the transport knows its going to invoke xprt_complete_rqst(). Signed-off-by: Chuck Lever <chuck.lever-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> --- include/linux/sunrpc/xprt.h | 1 + net/sunrpc/xprt.c | 14 ++++++++++++++ net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index 69ef5b3..ab6c3a5 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h @@ -366,6 +366,7 @@ void xprt_wait_for_buffer_space(struct rpc_task *task, rpc_action action); void xprt_write_space(struct rpc_xprt *xprt); void xprt_adjust_cwnd(struct rpc_xprt *xprt, struct rpc_task *task, int result); struct rpc_rqst * xprt_lookup_rqst(struct rpc_xprt *xprt, __be32 xid); +void xprt_commit_rqst(struct rpc_task *task); void xprt_complete_rqst(struct rpc_task *task, int copied); void xprt_release_rqst_cong(struct rpc_task *task); void xprt_disconnect_done(struct rpc_xprt *xprt); diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 2e98f4a..a5be4ab 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -837,6 +837,20 @@ static void xprt_update_rtt(struct rpc_task *task) } /** + * xprt_commit_rqst - remove rqst from pending list early + * @task: RPC request to remove + * + * Caller holds transport lock. + */ +void xprt_commit_rqst(struct rpc_task *task) +{ + struct rpc_rqst *req = task->tk_rqstp; + + list_del_init(&req->rq_list); +} +EXPORT_SYMBOL_GPL(xprt_commit_rqst); + +/** * xprt_complete_rqst - called when reply processing is complete * @task: RPC request that recently completed * @copied: actual number of bytes received from the transport diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index c10d969..0bc8c39 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -804,6 +804,9 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep) if (req->rl_reply) goto out_duplicate; + xprt_commit_rqst(rqst->rq_task); + spin_unlock_bh(&xprt->transport_lock); + dprintk("RPC: %s: reply 0x%p completes request 0x%p\n" " RPC request 0x%p xid 0x%08x\n", __func__, rep, req, rqst, @@ -894,6 +897,7 @@ badheader: else if (credits > r_xprt->rx_buf.rb_max_requests) credits = r_xprt->rx_buf.rb_max_requests; + spin_lock_bh(&xprt->transport_lock); cwnd = xprt->cwnd; xprt->cwnd = credits << RPC_CWNDSHIFT; if (xprt->cwnd > cwnd) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Chuck Lever <chuck.lever@oracle.com> To: linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org Subject: [PATCH v2 09/11] SUNRPC: Introduce xprt_commit_rqst() Date: Mon, 30 Nov 2015 17:15:10 -0500 [thread overview] Message-ID: <20151130221510.12235.65241.stgit@manet.1015granger.net> (raw) In-Reply-To: <20151130221349.12235.29565.stgit@manet.1015granger.net> I'm about to add code in the RPC/RDMA reply handler between the xprt_lookup_rqst() and xprt_complete_rqst() call site that needs to execute outside of spinlock critical sections. Add a hook to remove an rpc_rqst from the pending list once the transport knows its going to invoke xprt_complete_rqst(). Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- include/linux/sunrpc/xprt.h | 1 + net/sunrpc/xprt.c | 14 ++++++++++++++ net/sunrpc/xprtrdma/rpc_rdma.c | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h index 69ef5b3..ab6c3a5 100644 --- a/include/linux/sunrpc/xprt.h +++ b/include/linux/sunrpc/xprt.h @@ -366,6 +366,7 @@ void xprt_wait_for_buffer_space(struct rpc_task *task, rpc_action action); void xprt_write_space(struct rpc_xprt *xprt); void xprt_adjust_cwnd(struct rpc_xprt *xprt, struct rpc_task *task, int result); struct rpc_rqst * xprt_lookup_rqst(struct rpc_xprt *xprt, __be32 xid); +void xprt_commit_rqst(struct rpc_task *task); void xprt_complete_rqst(struct rpc_task *task, int copied); void xprt_release_rqst_cong(struct rpc_task *task); void xprt_disconnect_done(struct rpc_xprt *xprt); diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 2e98f4a..a5be4ab 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -837,6 +837,20 @@ static void xprt_update_rtt(struct rpc_task *task) } /** + * xprt_commit_rqst - remove rqst from pending list early + * @task: RPC request to remove + * + * Caller holds transport lock. + */ +void xprt_commit_rqst(struct rpc_task *task) +{ + struct rpc_rqst *req = task->tk_rqstp; + + list_del_init(&req->rq_list); +} +EXPORT_SYMBOL_GPL(xprt_commit_rqst); + +/** * xprt_complete_rqst - called when reply processing is complete * @task: RPC request that recently completed * @copied: actual number of bytes received from the transport diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index c10d969..0bc8c39 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -804,6 +804,9 @@ rpcrdma_reply_handler(struct rpcrdma_rep *rep) if (req->rl_reply) goto out_duplicate; + xprt_commit_rqst(rqst->rq_task); + spin_unlock_bh(&xprt->transport_lock); + dprintk("RPC: %s: reply 0x%p completes request 0x%p\n" " RPC request 0x%p xid 0x%08x\n", __func__, rep, req, rqst, @@ -894,6 +897,7 @@ badheader: else if (credits > r_xprt->rx_buf.rb_max_requests) credits = r_xprt->rx_buf.rb_max_requests; + spin_lock_bh(&xprt->transport_lock); cwnd = xprt->cwnd; xprt->cwnd = credits << RPC_CWNDSHIFT; if (xprt->cwnd > cwnd)
next prev parent reply other threads:[~2015-11-30 22:15 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-30 22:13 [PATCH v2 00/11] NFS/RDMA client patches for 4.5 Chuck Lever 2015-11-30 22:13 ` Chuck Lever [not found] ` <20151130221349.12235.29565.stgit-FYjufvaPoItvLzlybtyyYzGyq/o6K9yX@public.gmane.org> 2015-11-30 22:14 ` [PATCH v2 01/11] xprtrdma: Fix additional uses of spin_lock_irqsave(rb_lock) Chuck Lever 2015-11-30 22:14 ` Chuck Lever 2015-11-30 22:14 ` [PATCH v2 02/11] xprtrdma: xprt_rdma_free() must not release backchannel reqs Chuck Lever 2015-11-30 22:14 ` Chuck Lever 2015-11-30 22:14 ` [PATCH v2 03/11] xprtrdma: Disable RPC/RDMA backchannel debugging messages Chuck Lever 2015-11-30 22:14 ` Chuck Lever 2015-11-30 22:14 ` [PATCH v2 04/11] xprtrdma: Move struct ib_send_wr off the stack Chuck Lever 2015-11-30 22:14 ` Chuck Lever 2015-11-30 22:14 ` [PATCH v2 05/11] xprtrdma: Introduce ro_unmap_sync method Chuck Lever 2015-11-30 22:14 ` Chuck Lever 2015-11-30 22:14 ` [PATCH v2 06/11] xprtrdma: Add ro_unmap_sync method for FRWR Chuck Lever 2015-11-30 22:14 ` Chuck Lever 2015-11-30 22:14 ` [PATCH v2 07/11] xprtrdma: Add ro_unmap_sync method for FMR Chuck Lever 2015-11-30 22:14 ` Chuck Lever 2015-11-30 22:15 ` [PATCH v2 08/11] xprtrdma: Add ro_unmap_sync method for all-physical registration Chuck Lever 2015-11-30 22:15 ` Chuck Lever 2015-11-30 22:15 ` Chuck Lever [this message] 2015-11-30 22:15 ` [PATCH v2 09/11] SUNRPC: Introduce xprt_commit_rqst() Chuck Lever 2015-11-30 22:15 ` [PATCH v2 10/11] xprtrdma: Invalidate in the RPC reply handler Chuck Lever 2015-11-30 22:15 ` Chuck Lever 2015-11-30 22:15 ` [PATCH v2 11/11] xprtrdma: Revert commit e7104a2a9606 ('xprtrdma: Cap req_cqinit') Chuck Lever 2015-11-30 22:15 ` 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=20151130221510.12235.65241.stgit@manet.1015granger.net \ --to=chuck.lever-qhclzuegtsvqt0dzr+alfa@public.gmane.org \ --cc=linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.