github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 17:47:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

sunrpc: delay pc_release callback until after the reply is sent

Browse Source 
The server-side sunrpc code currently calls pc_release before sending
the reply. Change svc_process and svc_process_bc to call pc_release
after sending the reply instead.

Reviewed-by: NeilBrown <neil@brown.name>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Jeff Layton 2025-07-08 14:14:53 -04:00 committed by Chuck Lever
parent c1f203e46c
commit d9adbb6e10
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/sunrpc/svc.c
View File

@ -1426,8 +1426,6 @@ svc_process_common(struct svc_rqst *rqstp)
/* Call the function that processes the request. */ /* Call the function that processes the request. */
rc = process.dispatch(rqstp); rc = process.dispatch(rqstp);
if (procp->pc_release)
procp->pc_release(rqstp);
xdr_finish_decode(xdr); xdr_finish_decode(xdr);
if (!rc) if (!rc)
@ -1526,6 +1524,14 @@ static void svc_drop(struct svc_rqst *rqstp)
trace_svc_drop(rqstp); trace_svc_drop(rqstp);
} }
static void svc_release_rqst(struct svc_rqst *rqstp)
{
const struct svc_procedure *procp = rqstp->rq_procinfo;
if (procp && procp->pc_release)
procp->pc_release(rqstp);
}
/** /**
* svc_process - Execute one RPC transaction * svc_process - Execute one RPC transaction
* @rqstp: RPC transaction context * @rqstp: RPC transaction context
@ -1565,9 +1571,12 @@ void svc_process(struct svc_rqst *rqstp)
if (unlikely(*p != rpc_call)) if (unlikely(*p != rpc_call))
goto out_baddir; goto out_baddir;
if (!svc_process_common(rqstp)) if (!svc_process_common(rqstp)) {
svc_release_rqst(rqstp);
goto out_drop; goto out_drop;
}
svc_send(rqstp); svc_send(rqstp);
svc_release_rqst(rqstp);
return; return;
out_baddir: out_baddir:
@ -1635,6 +1644,7 @@ void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp)
if (!proc_error) { if (!proc_error) {
/* Processing error: drop the request */ /* Processing error: drop the request */
xprt_free_bc_request(req); xprt_free_bc_request(req);
svc_release_rqst(rqstp);
return; return;
} }
/* Finally, send the reply synchronously */ /* Finally, send the reply synchronously */
@ -1648,6 +1658,7 @@ void svc_process_bc(struct rpc_rqst *req, struct svc_rqst *rqstp)
timeout.to_maxval = timeout.to_initval; timeout.to_maxval = timeout.to_initval;
memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf)); memcpy(&req->rq_snd_buf, &rqstp->rq_res, sizeof(req->rq_snd_buf));
task = rpc_run_bc_task(req, &timeout); task = rpc_run_bc_task(req, &timeout);
svc_release_rqst(rqstp);
if (IS_ERR(task)) if (IS_ERR(task))
return; return;