2015-02-13 18:08:28

by Chuck Lever III

Subject: [PATCH] SUNRPC: Always manipulate rpc_rqst::rq_bc_pa_list under xprt->bc_pa_lock

Other code that accesses rq_bc_pa_list holds xprt->bc_pa_lock.
xprt_complete_bc_request() should do the same.

Fixes: 2ea24497a1b3 ("SUNRPC: RPC callbacks may be split . . .")
Signed-off-by: Chuck Lever <[email protected]>
---
How about this (compile-tested only)?

net/sunrpc/backchannel_rqst.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c
index 651f49a..9dd0ea8d 100644
--- a/net/sunrpc/backchannel_rqst.c
+++ b/net/sunrpc/backchannel_rqst.c
@@ -309,12 +309,15 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied)
struct rpc_xprt *xprt = req->rq_xprt;
struct svc_serv *bc_serv = xprt->bc_serv;

+ spin_lock(&xprt->bc_pa_lock);
+ list_del(&req->rq_bc_pa_list);
+ spin_unlock(&xprt->bc_pa_lock);
+
req->rq_private_buf.len = copied;
set_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state);

dprintk("RPC: add callback request to list\n");
spin_lock(&bc_serv->sv_cb_lock);
- list_del(&req->rq_bc_pa_list);
list_add(&req->rq_bc_list, &bc_serv->sv_cb_list);
wake_up(&bc_serv->sv_cb_waitq);
spin_unlock(&bc_serv->sv_cb_lock);

2015-02-13 18:38:30

by Trond Myklebust

Subject: Re: [PATCH] SUNRPC: Always manipulate rpc_rqst::rq_bc_pa_list under xprt->bc_pa_lock

On Fri, Feb 13, 2015 at 1:08 PM, Chuck Lever <[email protected]> wrote:
> Other code that accesses rq_bc_pa_list holds xprt->bc_pa_lock.
> xprt_complete_bc_request() should do the same.
>
> Fixes: 2ea24497a1b3 ("SUNRPC: RPC callbacks may be split . . .")
> Signed-off-by: Chuck Lever <[email protected]>
> ---
> How about this (compile-tested only)?

Looks just fine to me. Thanks!

--
Trond Myklebust
Linux NFS client maintainer, PrimaryData
[email protected]