All of lore.kernel.org
 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 05/19] xprtrdma: Remove the RPCRDMA_REQ_F_PENDING flag
Date: Wed, 19 Jun 2019 10:32:54 -0400	[thread overview]
Message-ID: <20190619143253.3826.13658.stgit@manet.1015granger.net> (raw)
In-Reply-To: <20190619143031.3826.46412.stgit@manet.1015granger.net>

Commit 9590d083c1bb ("xprtrdma: Use xprt_pin_rqst in
rpcrdma_reply_handler") pins incoming RPC/RDMA replies so they
can be left in the pending requests queue while they are being
processed without introducing a race between ->buf_free and the
transport's reply handler. Therefore RPCRDMA_REQ_F_PENDING is no
longer necessary.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 net/sunrpc/xprtrdma/rpc_rdma.c  |    1 -
 net/sunrpc/xprtrdma/transport.c |    4 +---
 net/sunrpc/xprtrdma/xprt_rdma.h |    1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
index 59b214b..fbc0a9f 100644
--- a/net/sunrpc/xprtrdma/rpc_rdma.c
+++ b/net/sunrpc/xprtrdma/rpc_rdma.c
@@ -1371,7 +1371,6 @@ void rpcrdma_reply_handler(struct rpcrdma_rep *rep)
 	}
 	req->rl_reply = rep;
 	rep->rr_rqst = rqst;
-	clear_bit(RPCRDMA_REQ_F_PENDING, &req->rl_flags);
 
 	trace_xprtrdma_reply(rqst->rq_task, rep, req, credits);
 	queue_work(buf->rb_completion_wq, &rep->rr_work);
diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
index 1f73a6a..f84375d 100644
--- a/net/sunrpc/xprtrdma/transport.c
+++ b/net/sunrpc/xprtrdma/transport.c
@@ -618,8 +618,7 @@ static bool rpcrdma_check_regbuf(struct rpcrdma_xprt *r_xprt,
 	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(rqst->rq_xprt);
 	struct rpcrdma_req *req = rpcr_to_rdmar(rqst);
 
-	if (test_bit(RPCRDMA_REQ_F_PENDING, &req->rl_flags))
-		rpcrdma_release_rqst(r_xprt, req);
+	rpcrdma_release_rqst(r_xprt, req);
 	trace_xprtrdma_op_free(task, req);
 }
 
@@ -667,7 +666,6 @@ static bool rpcrdma_check_regbuf(struct rpcrdma_xprt *r_xprt,
 		goto drop_connection;
 	rqst->rq_xtime = ktime_get();
 
-	__set_bit(RPCRDMA_REQ_F_PENDING, &req->rl_flags);
 	if (rpcrdma_ep_post(&r_xprt->rx_ia, &r_xprt->rx_ep, req))
 		goto drop_connection;
 
diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
index 2c6c5d8..3c39aa3 100644
--- a/net/sunrpc/xprtrdma/xprt_rdma.h
+++ b/net/sunrpc/xprtrdma/xprt_rdma.h
@@ -344,7 +344,6 @@ struct rpcrdma_req {
 
 /* rl_flags */
 enum {
-	RPCRDMA_REQ_F_PENDING = 0,
 	RPCRDMA_REQ_F_TX_RESOURCES,
 };
 


  parent reply	other threads:[~2019-06-19 14:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-19 14:32 [PATCH v4 00/19] for-5.3 patches Chuck Lever
2019-06-19 14:32 ` [PATCH v4 01/19] xprtrdma: Fix a BUG when tracing is enabled with NFSv4.1 on RDMA Chuck Lever
2019-06-19 14:32 ` [PATCH v4 02/19] xprtrdma: Fix use-after-free in rpcrdma_post_recvs Chuck Lever
2019-06-19 14:32 ` [PATCH v4 03/19] xprtrdma: Replace use of xdr_stream_pos in rpcrdma_marshal_req Chuck Lever
2019-06-19 14:32 ` [PATCH v4 04/19] xprtrdma: Fix occasional transport deadlock Chuck Lever
2019-06-19 14:32 ` Chuck Lever [this message]
2019-06-19 14:32 ` [PATCH v4 06/19] xprtrdma: Remove fr_state Chuck Lever
2019-06-19 14:33 ` [PATCH v4 07/19] xprtrdma: Add mechanism to place MRs back on the free list Chuck Lever
2019-06-19 14:33 ` [PATCH v4 08/19] xprtrdma: Reduce context switching due to Local Invalidation Chuck Lever
2019-06-19 14:33 ` [PATCH v4 09/19] xprtrdma: Wake RPCs directly in rpcrdma_wc_send path Chuck Lever
2019-06-19 14:33 ` [PATCH v4 10/19] xprtrdma: Simplify rpcrdma_rep_create Chuck Lever
2019-06-19 14:33 ` [PATCH v4 11/19] xprtrdma: Streamline rpcrdma_post_recvs Chuck Lever
2019-06-19 14:33 ` [PATCH v4 12/19] xprtrdma: Refactor chunk encoding Chuck Lever
2019-06-19 14:33 ` [PATCH v4 13/19] xprtrdma: Remove rpcrdma_req::rl_buffer Chuck Lever
2019-06-19 14:33 ` [PATCH v4 14/19] xprtrdma: Modernize ops->connect Chuck Lever
2019-06-19 14:33 ` [PATCH v4 15/19] NFS4: Add a trace event to record invalid CB sequence IDs Chuck Lever
2019-06-19 14:33 ` [PATCH v4 16/19] NFS: Fix show_nfs_errors macros again Chuck Lever
2019-06-19 14:33 ` [PATCH v4 17/19] NFS: Display symbolic status code names in trace log Chuck Lever
2019-06-19 14:34 ` [PATCH v4 18/19] NFS: Update symbolic flags displayed by trace events Chuck Lever
2019-06-19 14:34 ` [PATCH v4 19/19] NFS: Record task, client ID, and XID in xdr_status trace points 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=20190619143253.3826.13658.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 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.