| Message ID | 20220305160424.1040102-3-amir73il@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Generic per-sb io stats | expand |
On Sat, Mar 5, 2022 at 6:04 PM Amir Goldstein <amir73il@gmail.com> wrote: > > Hoist the helpers to init/destroy an array of counters from > nfsd_stats to percpu_counter library. > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> > --- > fs/nfsd/export.c | 10 ++++++--- > fs/nfsd/nfscache.c | 5 +++-- > fs/nfsd/stats.c | 37 +++------------------------------- > fs/nfsd/stats.h | 3 --- > include/linux/percpu_counter.h | 19 +++++++++++++++++ > lib/percpu_counter.c | 27 +++++++++++++++++++++++++ > 6 files changed, 59 insertions(+), 42 deletions(-) > > diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c > index 668c7527b17e..ec97a086077a 100644 > --- a/fs/nfsd/export.c > +++ b/fs/nfsd/export.c > @@ -334,17 +334,21 @@ static void nfsd4_fslocs_free(struct nfsd4_fs_locations *fsloc) > static int export_stats_init(struct export_stats *stats) > { > stats->start_time = ktime_get_seconds(); > - return nfsd_percpu_counters_init(stats->counter, EXP_STATS_COUNTERS_NUM); > + return percpu_counters_init(stats->counter, EXP_STATS_COUNTERS_NUM, 0, > + GFP_KERNEL); > } > > static void export_stats_reset(struct export_stats *stats) > { > - nfsd_percpu_counters_reset(stats->counter, EXP_STATS_COUNTERS_NUM); > + int i; > + > + for (i = 0; i < EXP_STATS_COUNTERS_NUM; i++) > + percpu_counter_set(&stats->counter[i], 0); > } > > static void export_stats_destroy(struct export_stats *stats) > { > - nfsd_percpu_counters_destroy(stats->counter, EXP_STATS_COUNTERS_NUM); > + percpu_counters_destroy(stats->counter, EXP_STATS_COUNTERS_NUM); > } > > static void svc_export_put(struct kref *ref) > diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c > index 0b3f12aa37ff..d93bb4866d07 100644 > --- a/fs/nfsd/nfscache.c > +++ b/fs/nfsd/nfscache.c > @@ -150,12 +150,13 @@ void nfsd_drc_slab_free(void) > > static int nfsd_reply_cache_stats_init(struct nfsd_net *nn) > { > - return nfsd_percpu_counters_init(nn->counter, NFSD_NET_COUNTERS_NUM); > + return percpu_counters_init(nn->counter, NFSD_NET_COUNTERS_NUM, 0, > + GFP_KERNEL); > } > > static void nfsd_reply_cache_stats_destroy(struct nfsd_net *nn) > { > - nfsd_percpu_counters_destroy(nn->counter, NFSD_NET_COUNTERS_NUM); > + percpu_counters_destroy(nn->counter, NFSD_NET_COUNTERS_NUM); > } > > int nfsd_reply_cache_init(struct nfsd_net *nn) > diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c > index a8c5a02a84f0..933e703cbb3b 100644 > --- a/fs/nfsd/stats.c > +++ b/fs/nfsd/stats.c > @@ -84,46 +84,15 @@ static const struct proc_ops nfsd_proc_ops = { > .proc_release = single_release, > }; > > -int nfsd_percpu_counters_init(struct percpu_counter counters[], int num) > -{ > - int i, err = 0; > - > - for (i = 0; !err && i < num; i++) > - err = percpu_counter_init(&counters[i], 0, GFP_KERNEL); > - > - if (!err) > - return 0; > - > - for (; i > 0; i--) > - percpu_counter_destroy(&counters[i-1]); > - > - return err; > -} > - > -void nfsd_percpu_counters_reset(struct percpu_counter counters[], int num) > -{ > - int i; > - > - for (i = 0; i < num; i++) > - percpu_counter_set(&counters[i], 0); > -} > - > -void nfsd_percpu_counters_destroy(struct percpu_counter counters[], int num) > -{ > - int i; > - > - for (i = 0; i < num; i++) > - percpu_counter_destroy(&counters[i]); > -} > - > static int nfsd_stat_counters_init(void) > { > - return nfsd_percpu_counters_init(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM); > + return percpu_counters_init(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM, > + 0, GFP_KERNEL); > } > > static void nfsd_stat_counters_destroy(void) > { > - nfsd_percpu_counters_destroy(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM); > + percpu_counters_destroy(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM); > } > > int nfsd_stat_init(void) > diff --git a/fs/nfsd/stats.h b/fs/nfsd/stats.h > index 9b43dc3d9991..61840f9035a9 100644 > --- a/fs/nfsd/stats.h > +++ b/fs/nfsd/stats.h > @@ -36,9 +36,6 @@ extern struct nfsd_stats nfsdstats; > > extern struct svc_stat nfsd_svcstats; > > -int nfsd_percpu_counters_init(struct percpu_counter counters[], int num); > -void nfsd_percpu_counters_reset(struct percpu_counter counters[], int num); > -void nfsd_percpu_counters_destroy(struct percpu_counter counters[], int num); > int nfsd_stat_init(void); > void nfsd_stat_shutdown(void); > > diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h > index 7f01f2e41304..37dd81c85411 100644 > --- a/include/linux/percpu_counter.h > +++ b/include/linux/percpu_counter.h > @@ -46,6 +46,10 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc); > int __percpu_counter_compare(struct percpu_counter *fbc, s64 rhs, s32 batch); > void percpu_counter_sync(struct percpu_counter *fbc); > > +int percpu_counters_init(struct percpu_counter counters[], int num, s64 amount, > + gfp_t gfp); > +void percpu_counters_destroy(struct percpu_counter counters[], int num); > + > static inline int percpu_counter_compare(struct percpu_counter *fbc, s64 rhs) > { > return __percpu_counter_compare(fbc, rhs, percpu_counter_batch); > @@ -109,6 +113,21 @@ static inline void percpu_counter_destroy(struct percpu_counter *fbc) > { > } > > +static inline int percpu_counters_init(struct percpu_counter counters[], > + int num, s64 amount, gfp_t gfp) > +{ > + int i; > + > + for (i = 0; i < num; i++) > + counters[i] = amount; OOPS: + counters[i].count = amount; > + return 0; > +} > + > +static inline void percpu_counters_destroy(struct percpu_counter counters[], > + int num) > +{ > +} > + > static inline void percpu_counter_set(struct percpu_counter *fbc, s64 amount) > { > fbc->count = amount; > diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c > index ed610b75dc32..f75a45c63c18 100644 > --- a/lib/percpu_counter.c > +++ b/lib/percpu_counter.c > @@ -181,6 +181,33 @@ void percpu_counter_destroy(struct percpu_counter *fbc) > } > EXPORT_SYMBOL(percpu_counter_destroy); > > +int percpu_counters_init(struct percpu_counter counters[], int num, s64 amount, > + gfp_t gfp) > +{ > + int i, err = 0; > + > + for (i = 0; !err && i < num; i++) > + err = percpu_counter_init(&counters[i], amount, gfp); > + > + if (!err) > + return 0; > + > + for (; i > 0; i--) > + percpu_counter_destroy(&counters[i-1]); > + > + return err; > +} > +EXPORT_SYMBOL(percpu_counters_init); > + > +void percpu_counters_destroy(struct percpu_counter counters[], int num) > +{ > + int i; > + > + for (i = 0; i < num; i++) > + percpu_counter_destroy(&counters[i]); > +} > +EXPORT_SYMBOL(percpu_counters_destroy); > + > int percpu_counter_batch __read_mostly = 32; > EXPORT_SYMBOL(percpu_counter_batch); > > -- > 2.25.1 >
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 668c7527b17e..ec97a086077a 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -334,17 +334,21 @@ static void nfsd4_fslocs_free(struct nfsd4_fs_locations *fsloc) static int export_stats_init(struct export_stats *stats) { stats->start_time = ktime_get_seconds(); - return nfsd_percpu_counters_init(stats->counter, EXP_STATS_COUNTERS_NUM); + return percpu_counters_init(stats->counter, EXP_STATS_COUNTERS_NUM, 0, + GFP_KERNEL); } static void export_stats_reset(struct export_stats *stats) { - nfsd_percpu_counters_reset(stats->counter, EXP_STATS_COUNTERS_NUM); + int i; + + for (i = 0; i < EXP_STATS_COUNTERS_NUM; i++) + percpu_counter_set(&stats->counter[i], 0); } static void export_stats_destroy(struct export_stats *stats) { - nfsd_percpu_counters_destroy(stats->counter, EXP_STATS_COUNTERS_NUM); + percpu_counters_destroy(stats->counter, EXP_STATS_COUNTERS_NUM); } static void svc_export_put(struct kref *ref) diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index 0b3f12aa37ff..d93bb4866d07 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -150,12 +150,13 @@ void nfsd_drc_slab_free(void) static int nfsd_reply_cache_stats_init(struct nfsd_net *nn) { - return nfsd_percpu_counters_init(nn->counter, NFSD_NET_COUNTERS_NUM); + return percpu_counters_init(nn->counter, NFSD_NET_COUNTERS_NUM, 0, + GFP_KERNEL); } static void nfsd_reply_cache_stats_destroy(struct nfsd_net *nn) { - nfsd_percpu_counters_destroy(nn->counter, NFSD_NET_COUNTERS_NUM); + percpu_counters_destroy(nn->counter, NFSD_NET_COUNTERS_NUM); } int nfsd_reply_cache_init(struct nfsd_net *nn) diff --git a/fs/nfsd/stats.c b/fs/nfsd/stats.c index a8c5a02a84f0..933e703cbb3b 100644 --- a/fs/nfsd/stats.c +++ b/fs/nfsd/stats.c @@ -84,46 +84,15 @@ static const struct proc_ops nfsd_proc_ops = { .proc_release = single_release, }; -int nfsd_percpu_counters_init(struct percpu_counter counters[], int num) -{ - int i, err = 0; - - for (i = 0; !err && i < num; i++) - err = percpu_counter_init(&counters[i], 0, GFP_KERNEL); - - if (!err) - return 0; - - for (; i > 0; i--) - percpu_counter_destroy(&counters[i-1]); - - return err; -} - -void nfsd_percpu_counters_reset(struct percpu_counter counters[], int num) -{ - int i; - - for (i = 0; i < num; i++) - percpu_counter_set(&counters[i], 0); -} - -void nfsd_percpu_counters_destroy(struct percpu_counter counters[], int num) -{ - int i; - - for (i = 0; i < num; i++) - percpu_counter_destroy(&counters[i]); -} - static int nfsd_stat_counters_init(void) { - return nfsd_percpu_counters_init(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM); + return percpu_counters_init(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM, + 0, GFP_KERNEL); } static void nfsd_stat_counters_destroy(void) { - nfsd_percpu_counters_destroy(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM); + percpu_counters_destroy(nfsdstats.counter, NFSD_STATS_COUNTERS_NUM); } int nfsd_stat_init(void) diff --git a/fs/nfsd/stats.h b/fs/nfsd/stats.h index 9b43dc3d9991..61840f9035a9 100644 --- a/fs/nfsd/stats.h +++ b/fs/nfsd/stats.h @@ -36,9 +36,6 @@ extern struct nfsd_stats nfsdstats; extern struct svc_stat nfsd_svcstats; -int nfsd_percpu_counters_init(struct percpu_counter counters[], int num); -void nfsd_percpu_counters_reset(struct percpu_counter counters[], int num); -void nfsd_percpu_counters_destroy(struct percpu_counter counters[], int num); int nfsd_stat_init(void); void nfsd_stat_shutdown(void); diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h index 7f01f2e41304..37dd81c85411 100644 --- a/include/linux/percpu_counter.h +++ b/include/linux/percpu_counter.h @@ -46,6 +46,10 @@ s64 __percpu_counter_sum(struct percpu_counter *fbc); int __percpu_counter_compare(struct percpu_counter *fbc, s64 rhs, s32 batch); void percpu_counter_sync(struct percpu_counter *fbc); +int percpu_counters_init(struct percpu_counter counters[], int num, s64 amount, + gfp_t gfp); +void percpu_counters_destroy(struct percpu_counter counters[], int num); + static inline int percpu_counter_compare(struct percpu_counter *fbc, s64 rhs) { return __percpu_counter_compare(fbc, rhs, percpu_counter_batch); @@ -109,6 +113,21 @@ static inline void percpu_counter_destroy(struct percpu_counter *fbc) { } +static inline int percpu_counters_init(struct percpu_counter counters[], + int num, s64 amount, gfp_t gfp) +{ + int i; + + for (i = 0; i < num; i++) + counters[i] = amount; + return 0; +} + +static inline void percpu_counters_destroy(struct percpu_counter counters[], + int num) +{ +} + static inline void percpu_counter_set(struct percpu_counter *fbc, s64 amount) { fbc->count = amount; diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c index ed610b75dc32..f75a45c63c18 100644 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c @@ -181,6 +181,33 @@ void percpu_counter_destroy(struct percpu_counter *fbc) } EXPORT_SYMBOL(percpu_counter_destroy); +int percpu_counters_init(struct percpu_counter counters[], int num, s64 amount, + gfp_t gfp) +{ + int i, err = 0; + + for (i = 0; !err && i < num; i++) + err = percpu_counter_init(&counters[i], amount, gfp); + + if (!err) + return 0; + + for (; i > 0; i--) + percpu_counter_destroy(&counters[i-1]); + + return err; +} +EXPORT_SYMBOL(percpu_counters_init); + +void percpu_counters_destroy(struct percpu_counter counters[], int num) +{ + int i; + + for (i = 0; i < num; i++) + percpu_counter_destroy(&counters[i]); +} +EXPORT_SYMBOL(percpu_counters_destroy); + int percpu_counter_batch __read_mostly = 32; EXPORT_SYMBOL(percpu_counter_batch);
Hoist the helpers to init/destroy an array of counters from nfsd_stats to percpu_counter library. Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- fs/nfsd/export.c | 10 ++++++--- fs/nfsd/nfscache.c | 5 +++-- fs/nfsd/stats.c | 37 +++------------------------------- fs/nfsd/stats.h | 3 --- include/linux/percpu_counter.h | 19 +++++++++++++++++ lib/percpu_counter.c | 27 +++++++++++++++++++++++++ 6 files changed, 59 insertions(+), 42 deletions(-)