UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

SUNRPC: The TCP back channel mustn't disappear while requests are outstanding 

If there are TCP back channel requests being processed by the
server threads, then we should hold a reference to the transport
to ensure it doesn't get freed from underneath us.

Reported-by: Neil Brown <neilb@suse.de>
Fixes: 2ea24497a1 ("SUNRPC: RPC callbacks may be split across several..")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2019-10-17 09:02:19 -04:00 committed by Anna Schumaker
parent 9e5eefba3d
commit 875f0706ac
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/sunrpc/backchannel_rqst.c
View File

@ -307,8 +307,8 @@ void xprt_free_bc_rqst(struct rpc_rqst *req)
*/ */
dprintk("RPC: Last session removed req=%p\n", req); dprintk("RPC: Last session removed req=%p\n", req);
xprt_free_allocation(req); xprt_free_allocation(req);
return;
} }
xprt_put(xprt);
} }
/* /*
@ -339,7 +339,7 @@ found:
spin_unlock(&xprt->bc_pa_lock); spin_unlock(&xprt->bc_pa_lock);
if (new) { if (new) {
if (req != new) if (req != new)
xprt_free_bc_rqst(new); xprt_free_allocation(new);
break; break;
} else if (req) } else if (req)
break; break;
@ -368,6 +368,7 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied)
set_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state); set_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state);
dprintk("RPC: add callback request to list\n"); dprintk("RPC: add callback request to list\n");
xprt_get(xprt);
spin_lock(&bc_serv->sv_cb_lock); spin_lock(&bc_serv->sv_cb_lock);
list_add(&req->rq_bc_list, &bc_serv->sv_cb_list); list_add(&req->rq_bc_list, &bc_serv->sv_cb_list);
wake_up(&bc_serv->sv_cb_waitq); wake_up(&bc_serv->sv_cb_waitq);