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 v2 15/20] xprtrdma: Don't disable BH's in backchannel server
Date: Mon, 01 Oct 2018 14:26:24 -0400 [thread overview]
Message-ID: <20181001182624.18578.80389.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20181001182005.18578.57544.stgit@manet.1015granger.net>
Clean up: This code was copied from xprtsock.c and
backchannel_rqst.c. For rpcrdma, the backchannel server runs
exclusively in process context, thus disabling bottom-halves is
unnecessary.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
net/sunrpc/xprtrdma/backchannel.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/net/sunrpc/xprtrdma/backchannel.c b/net/sunrpc/xprtrdma/backchannel.c
index 90adeff..675b530 100644
--- a/net/sunrpc/xprtrdma/backchannel.c
+++ b/net/sunrpc/xprtrdma/backchannel.c
@@ -54,9 +54,9 @@ static int rpcrdma_bc_setup_reqs(struct rpcrdma_xprt *r_xprt,
INIT_LIST_HEAD(&rqst->rq_list);
INIT_LIST_HEAD(&rqst->rq_bc_list);
__set_bit(RPC_BC_PA_IN_USE, &rqst->rq_bc_pa_state);
- spin_lock_bh(&xprt->bc_pa_lock);
+ spin_lock(&xprt->bc_pa_lock);
list_add(&rqst->rq_bc_pa_list, &xprt->bc_pa_list);
- spin_unlock_bh(&xprt->bc_pa_lock);
+ spin_unlock(&xprt->bc_pa_lock);
size = r_xprt->rx_data.inline_rsize;
rb = rpcrdma_alloc_regbuf(size, DMA_TO_DEVICE, GFP_KERNEL);
@@ -228,16 +228,16 @@ void xprt_rdma_bc_destroy(struct rpc_xprt *xprt, unsigned int reqs)
struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
struct rpc_rqst *rqst, *tmp;
- spin_lock_bh(&xprt->bc_pa_lock);
+ spin_lock(&xprt->bc_pa_lock);
list_for_each_entry_safe(rqst, tmp, &xprt->bc_pa_list, rq_bc_pa_list) {
list_del(&rqst->rq_bc_pa_list);
- spin_unlock_bh(&xprt->bc_pa_lock);
+ spin_unlock(&xprt->bc_pa_lock);
rpcrdma_bc_free_rqst(r_xprt, rqst);
- spin_lock_bh(&xprt->bc_pa_lock);
+ spin_lock(&xprt->bc_pa_lock);
}
- spin_unlock_bh(&xprt->bc_pa_lock);
+ spin_unlock(&xprt->bc_pa_lock);
}
/**
@@ -255,9 +255,9 @@ void xprt_rdma_bc_free_rqst(struct rpc_rqst *rqst)
rpcrdma_recv_buffer_put(req->rl_reply);
req->rl_reply = NULL;
- spin_lock_bh(&xprt->bc_pa_lock);
+ spin_lock(&xprt->bc_pa_lock);
list_add_tail(&rqst->rq_bc_pa_list, &xprt->bc_pa_list);
- spin_unlock_bh(&xprt->bc_pa_lock);
+ spin_unlock(&xprt->bc_pa_lock);
}
/**
next prev parent reply other threads:[~2018-10-02 1:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-01 18:25 [PATCH v2 00/20] NFS/RDMA client patches for v4.20 Chuck Lever
2018-10-01 18:25 ` [PATCH v2 01/20] xprtrdma: xprt_release_rqst_cong is called outside of transport_lock Chuck Lever
2018-10-01 18:25 ` [PATCH v2 02/20] xprtrdma: Reset credit grant properly after a disconnect Chuck Lever
2018-10-01 18:25 ` [PATCH v2 03/20] xprtrdma: Create more MRs at a time Chuck Lever
2018-10-01 18:25 ` [PATCH v2 04/20] xprtrdma: Explicitly resetting MRs is no longer necessary Chuck Lever
2018-10-01 18:25 ` [PATCH v2 05/20] xprtrdma: Name MR trace events consistently Chuck Lever
2018-10-01 18:25 ` [PATCH v2 06/20] sunrpc: Fix connect metrics Chuck Lever
2018-10-01 18:25 ` [PATCH v2 07/20] sunrpc: Report connect_time in seconds Chuck Lever
2018-10-01 18:25 ` [PATCH v2 08/20] xprtrdma: Rename rpcrdma_conn_upcall Chuck Lever
2018-10-01 18:25 ` [PATCH v2 09/20] xprtrdma: Conventional variable names in rpcrdma_conn_upcall Chuck Lever
2018-10-01 18:25 ` [PATCH v2 10/20] xprtrdma: Eliminate "connstate" variable from rpcrdma_conn_upcall() Chuck Lever
2018-10-01 18:26 ` [PATCH v2 11/20] xprtrdma: Re-organize the switch() in rpcrdma_conn_upcall Chuck Lever
2018-10-01 18:26 ` [PATCH v2 12/20] xprtrdma: Simplify RPC wake-ups on connect Chuck Lever
2018-10-01 18:26 ` [PATCH v2 13/20] xprtrdma: Rename rpcrdma_qp_async_error_upcall Chuck Lever
2018-10-01 18:26 ` [PATCH v2 14/20] xprtrdma: Remove memory address of "ep" from an error message Chuck Lever
2018-10-01 18:26 ` Chuck Lever [this message]
2018-10-01 18:26 ` [PATCH v2 16/20] xprtrdma: Move rb_flags initialization Chuck Lever
2018-10-01 18:26 ` [PATCH v2 17/20] xprtrdma: Report when there were zero posted Receives Chuck Lever
2018-10-01 18:26 ` [PATCH v2 18/20] xprtrdma: Add documenting comments Chuck Lever
2018-10-01 18:26 ` [PATCH v2 19/20] xprtrdma: Clean up xprt_rdma_disconnect_inject Chuck Lever
2018-10-01 18:26 ` [PATCH v2 20/20] xprtrdma: Squelch a sparse warning 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=20181001182624.18578.80389.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).