Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 14:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Fix transport accounting when caller specifies an rpc_xprt

Browse Source 
Ensure that we do the required accounting for the round robin queue
when the caller to rpc_init_task() has passed in a transport to be
used.

Reported-by: Olga Kornievskaia <aglo@umich.edu>
Reported-by: Neil Brown <neilb@suse.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2019-07-11 16:33:12 -04:00
parent 347543e640
commit a101b043c4
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/sunrpc/clnt.h
View File

@ -164,6 +164,8 @@ void rpc_shutdown_client(struct rpc_clnt *);
void rpc_release_client(struct rpc_clnt *); void rpc_release_client(struct rpc_clnt *);
void rpc_task_release_transport(struct rpc_task *); void rpc_task_release_transport(struct rpc_task *);
void rpc_task_release_client(struct rpc_task *); void rpc_task_release_client(struct rpc_task *);
struct rpc_xprt *rpc_task_get_xprt(struct rpc_clnt *clnt,
struct rpc_xprt *xprt);
int rpcb_create_local(struct net *); int rpcb_create_local(struct net *);
void rpcb_put_local(struct net *); void rpcb_put_local(struct net *);

42
net/sunrpc/clnt.c
View File

@ -978,11 +978,10 @@ out:
} }
EXPORT_SYMBOL_GPL(rpc_bind_new_program); EXPORT_SYMBOL_GPL(rpc_bind_new_program);
static struct rpc_xprt * struct rpc_xprt *
rpc_task_get_xprt(struct rpc_clnt *clnt) rpc_task_get_xprt(struct rpc_clnt *clnt, struct rpc_xprt *xprt)
{ {
struct rpc_xprt_switch *xps; struct rpc_xprt_switch *xps;
struct rpc_xprt *xprt= xprt_iter_get_next(&clnt->cl_xpi);
if (!xprt) if (!xprt)
return NULL; return NULL;
@ -995,24 +994,6 @@ rpc_task_get_xprt(struct rpc_clnt *clnt)
return xprt; return xprt;
} }
static struct rpc_xprt *
rpc_task_get_first_xprt(struct rpc_clnt *clnt)
{
struct rpc_xprt_switch *xps;
struct rpc_xprt *xprt;
rcu_read_lock();
xprt = xprt_get(rcu_dereference(clnt->cl_xprt));
if (xprt) {
atomic_long_inc(&xprt->queuelen);
xps = rcu_dereference(clnt->cl_xpi.xpi_xpswitch);
atomic_long_inc(&xps->xps_queuelen);
}
rcu_read_unlock();
return xprt;
}
static void static void
rpc_task_release_xprt(struct rpc_clnt *clnt, struct rpc_xprt *xprt) rpc_task_release_xprt(struct rpc_clnt *clnt, struct rpc_xprt *xprt)
{ {
@ -1057,6 +1038,23 @@ void rpc_task_release_client(struct rpc_task *task)
} }
} }
static struct rpc_xprt *
rpc_task_get_first_xprt(struct rpc_clnt *clnt)
{
struct rpc_xprt *xprt;
rcu_read_lock();
xprt = xprt_get(rcu_dereference(clnt->cl_xprt));
rcu_read_unlock();
return rpc_task_get_xprt(clnt, xprt);
}
static struct rpc_xprt *
rpc_task_get_next_xprt(struct rpc_clnt *clnt)
{
return rpc_task_get_xprt(clnt, xprt_iter_get_next(&clnt->cl_xpi));
}
static static
void rpc_task_set_transport(struct rpc_task *task, struct rpc_clnt *clnt) void rpc_task_set_transport(struct rpc_task *task, struct rpc_clnt *clnt)
{ {
@ -1065,7 +1063,7 @@ void rpc_task_set_transport(struct rpc_task *task, struct rpc_clnt *clnt)
if (task->tk_flags & RPC_TASK_NO_ROUND_ROBIN) if (task->tk_flags & RPC_TASK_NO_ROUND_ROBIN)
task->tk_xprt = rpc_task_get_first_xprt(clnt); task->tk_xprt = rpc_task_get_first_xprt(clnt);
else else
task->tk_xprt = rpc_task_get_xprt(clnt); task->tk_xprt = rpc_task_get_next_xprt(clnt);
} }
static static

3
net/sunrpc/sched.c
View File

@ -1092,7 +1092,8 @@ static void rpc_init_task(struct rpc_task *task, const struct rpc_task_setup *ta
/* Initialize workqueue for async tasks */ /* Initialize workqueue for async tasks */
task->tk_workqueue = task_setup_data->workqueue; task->tk_workqueue = task_setup_data->workqueue;
task->tk_xprt = xprt_get(task_setup_data->rpc_xprt); task->tk_xprt = rpc_task_get_xprt(task_setup_data->rpc_client,
xprt_get(task_setup_data->rpc_xprt));
task->tk_op_cred = get_rpccred(task_setup_data->rpc_op_cred); task->tk_op_cred = get_rpccred(task_setup_data->rpc_op_cred);