SUNRPC: Fix transport accounting when caller specifies an rpc_xprt

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.

Trond Myklebust committed 7 years ago

Commit a101b041 parent 347543e3 files · +24 −23Browse files

Unified · Split

3 files

@@ -164,6 +164,8 @@ void rpc_shutdown_client(struct rpc_clnt *); · 163 unmodified lines
164	void rpc_release_client(struct rpc_clnt *);	164	void rpc_release_client(struct rpc_clnt *);
165	void rpc_task_release_transport(struct rpc_task *);	165	void rpc_task_release_transport(struct rpc_task *);
166	void rpc_task_release_client(struct rpc_task *);	166	void rpc_task_release_client(struct rpc_task *);
		167	struct rpc_xprt rpc_task_get_xprt(struct rpc_clnt clnt,
		168	struct rpc_xprt *xprt);
167		169
168	int rpcb_create_local(struct net *);	170	int rpcb_create_local(struct net *);
169	void rpcb_put_local(struct net *);	171	void rpcb_put_local(struct net *);

 }
 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 *xprt= xprt_iter_get_next(&clnt->cl_xpi);
 	if (!xprt)
 		return NULL;
 	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
 rpc_task_release_xprt(struct rpc_clnt *clnt, struct rpc_xprt *xprt)
 {
 	}
 }
+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
 void rpc_task_set_transport(struct rpc_task *task, struct rpc_clnt *clnt)
 {
 	if (task->tk_flags & RPC_TASK_NO_ROUND_ROBIN)
 		task->tk_xprt = rpc_task_get_first_xprt(clnt);
 	else
-		task->tk_xprt = rpc_task_get_xprt(clnt);
+		task->tk_xprt = rpc_task_get_next_xprt(clnt);
 }
 static

@@ -1092,7 +1092,8 @@ static void rpc_init_task(struct rpc_task task, const struct rpc_task_setup ta · 1091 unmodified lines
1092	/* Initialize workqueue for async tasks */	1092	/* Initialize workqueue for async tasks */
1093	task->tk_workqueue = task_setup_data->workqueue;	1093	task->tk_workqueue = task_setup_data->workqueue;
1094		1094
1095	task->tk_xprt = xprt_get(task_setup_data->rpc_xprt);	1095	task->tk_xprt = rpc_task_get_xprt(task_setup_data->rpc_client,
		1096	xprt_get(task_setup_data->rpc_xprt));
1096		1097
1097	task->tk_op_cred = get_rpccred(task_setup_data->rpc_op_cred);	1098	task->tk_op_cred = get_rpccred(task_setup_data->rpc_op_cred);
1098		1099

Keyboard shortcuts