Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 12:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sunrpc: pass in the sv_stats struct through svc_create_pooled

Browse Source 
[ Upstream commit f094323867 ]

Since only one service actually reports the rpc stats there's not much
of a reason to have a pointer to it in the svc_program struct.  Adjust
the svc_create_pooled function to take the sv_stats as an argument and
pass the struct through there as desired instead of getting it from the
svc_program->pg_stats.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
[ cel: adjusted to apply to v6.1.y ]
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Josef Bacik 2024-08-10 16:00:02 -04:00 committed by Greg Kroah-Hartman
parent 4240c2f543
commit 94f2dc2667
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfsd/nfssvc.c
View File

@ -657,7 +657,8 @@ int nfsd_create_serv(struct net *net)
if (nfsd_max_blksize == 0) if (nfsd_max_blksize == 0)
nfsd_max_blksize = nfsd_get_default_max_blksize(); nfsd_max_blksize = nfsd_get_default_max_blksize();
nfsd_reset_versions(nn); nfsd_reset_versions(nn);
serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize, nfsd); serv = svc_create_pooled(&nfsd_program, &nfsd_svcstats,
nfsd_max_blksize, nfsd);
if (serv == NULL) if (serv == NULL)
return -ENOMEM; return -ENOMEM;

4
include/linux/sunrpc/svc.h
View File

@ -493,7 +493,9 @@ void svc_rqst_replace_page(struct svc_rqst *rqstp,
struct page *page); struct page *page);
void svc_rqst_free(struct svc_rqst *); void svc_rqst_free(struct svc_rqst *);
void svc_exit_thread(struct svc_rqst *); void svc_exit_thread(struct svc_rqst *);
struct svc_serv * svc_create_pooled(struct svc_program *, unsigned int, struct svc_serv * svc_create_pooled(struct svc_program *prog,
struct svc_stat *stats,
unsigned int bufsize,
int (*threadfn)(void *data)); int (*threadfn)(void *data));
int svc_set_num_threads(struct svc_serv *, struct svc_pool *, int); int svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
int svc_pool_stats_open(struct svc_serv *serv, struct file *file); int svc_pool_stats_open(struct svc_serv *serv, struct file *file);

12
net/sunrpc/svc.c
View File

@ -453,8 +453,8 @@ __svc_init_bc(struct svc_serv *serv)
* Create an RPC service * Create an RPC service
*/ */
static struct svc_serv * static struct svc_serv *
__svc_create(struct svc_program *prog, unsigned int bufsize, int npools, __svc_create(struct svc_program *prog, struct svc_stat *stats,
int (*threadfn)(void *data)) unsigned int bufsize, int npools, int (*threadfn)(void *data))
{ {
struct svc_serv *serv; struct svc_serv *serv;
unsigned int vers; unsigned int vers;
@ -466,7 +466,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
serv->sv_name = prog->pg_name; serv->sv_name = prog->pg_name;
serv->sv_program = prog; serv->sv_program = prog;
kref_init(&serv->sv_refcnt); kref_init(&serv->sv_refcnt);
serv->sv_stats = prog->pg_stats; serv->sv_stats = stats;
if (bufsize > RPCSVC_MAXPAYLOAD) if (bufsize > RPCSVC_MAXPAYLOAD)
bufsize = RPCSVC_MAXPAYLOAD; bufsize = RPCSVC_MAXPAYLOAD;
serv->sv_max_payload = bufsize? bufsize : 4096; serv->sv_max_payload = bufsize? bufsize : 4096;
@ -528,26 +528,28 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
struct svc_serv *svc_create(struct svc_program *prog, unsigned int bufsize, struct svc_serv *svc_create(struct svc_program *prog, unsigned int bufsize,
int (*threadfn)(void *data)) int (*threadfn)(void *data))
{ {
return __svc_create(prog, bufsize, 1, threadfn); return __svc_create(prog, NULL, bufsize, 1, threadfn);
} }
EXPORT_SYMBOL_GPL(svc_create); EXPORT_SYMBOL_GPL(svc_create);
/** /**
* svc_create_pooled - Create an RPC service with pooled threads * svc_create_pooled - Create an RPC service with pooled threads
* @prog: the RPC program the new service will handle * @prog: the RPC program the new service will handle
* @stats: the stats struct if desired
* @bufsize: maximum message size for @prog * @bufsize: maximum message size for @prog
* @threadfn: a function to service RPC requests for @prog * @threadfn: a function to service RPC requests for @prog
* *
* Returns an instantiated struct svc_serv object or NULL. * Returns an instantiated struct svc_serv object or NULL.
*/ */
struct svc_serv *svc_create_pooled(struct svc_program *prog, struct svc_serv *svc_create_pooled(struct svc_program *prog,
struct svc_stat *stats,
unsigned int bufsize, unsigned int bufsize,
int (*threadfn)(void *data)) int (*threadfn)(void *data))
{ {
struct svc_serv *serv; struct svc_serv *serv;
unsigned int npools = svc_pool_map_get(); unsigned int npools = svc_pool_map_get();
serv = __svc_create(prog, bufsize, npools, threadfn); serv = __svc_create(prog, stats, bufsize, npools, threadfn);
if (!serv) if (!serv)
goto out_err; goto out_err;
return serv; return serv;