[PATCH 6/7] rpc: move rpc server threads into their own thread group

J. Bruce Fields
2019-02-08T20:11:32Z

include/linux/sunrpc/svc.h | 1 +
net/sunrpc/svc.c | 23 ++++++++++++++++++-----
2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index e52385340b3b..07d428dd067f 100644
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -101,6 +101,7 @@ struct svc_serv {

unsigned int sv_nrpools; /* number of thread pools */
struct svc_pool * sv_pools; /* array of thread pools */
+ struct kthread_group * sv_kthread_grp;
const struct svc_serv_ops *sv_ops; /* server operations */
#if defined(CONFIG_SUNRPC_BACKCHANNEL)
struct list_head sv_cb_list; /* queue for callback requests
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 502e09a28f84..d8586a57da40 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -464,10 +464,16 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
serv->sv_pools =
kcalloc(serv->sv_nrpools, sizeof(struct svc_pool),
GFP_KERNEL);
- if (!serv->sv_pools) {
- kfree(serv);
- return NULL;
- }
+ if (!serv->sv_pools)
+ goto out_free_serv;
+
+ serv->sv_kthread_grp = kthread_start_group(CLONE_THREAD |
+ CLONE_SIGHAND | CLONE_VM | CLONE_FS |
+ CLONE_FILES | SIGCHLD,
+ serv->sv_name);
+
+ if (IS_ERR(serv->sv_kthread_grp))
+ goto out_free_pools;

for (i = 0; i < serv->sv_nrpools; i++) {
struct svc_pool *pool = &serv->sv_pools[i];
@@ -482,6 +488,11 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
}

return serv;
+out_free_pools:
+ kfree(serv->sv_pools);
+out_free_serv:
+ kfree(serv);
+ return NULL;
}

struct svc_serv *
@@ -551,6 +562,7 @@ svc_destroy(struct svc_serv *serv)
if (svc_serv_is_pooled(serv))
svc_pool_map_put();

+ kthread_stop_group(serv->sv_kthread_grp);
kfree(serv->sv_pools);
kfree(serv);
}
@@ -719,7 +731,8 @@ svc_start_kthread(struct svc_serv *serv, struct svc_pool *pool,
return PTR_ERR(rqstp);

__module_get(serv->sv_ops->svo_module);
- task = kthread_create_on_node(serv->sv_ops->svo_function, rqstp,
+ task = kthread_group_create_on_node(serv->sv_kthread_grp,
+ serv->sv_ops->svo_function, rqstp,
node, "%s", serv->sv_name);
if (IS_ERR(task)) {
module_put(serv->sv_ops->svo_module);
--
2.20.1