On Mon 11-12-17 16:55:28, Josef Bacik wrote:
> From: Josef Bacik <jbacik@xxxxxx>
>
> This helper allows us to add an arbitrary amount to the fprop
> structures.
>
> Signed-off-by: Josef Bacik <jbacik@xxxxxx>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> include/linux/flex_proportions.h | 11 +++++++++--
> lib/flex_proportions.c | 9 +++++----
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/include/linux/flex_proportions.h b/include/linux/flex_proportions.h
> index 0d348e011a6e..9f88684bf0a0 100644
> --- a/include/linux/flex_proportions.h
> +++ b/include/linux/flex_proportions.h
> @@ -83,8 +83,8 @@ struct fprop_local_percpu {
> int fprop_local_init_percpu(struct fprop_local_percpu *pl, gfp_t gfp);
> void fprop_local_destroy_percpu(struct fprop_local_percpu *pl);
> void __fprop_inc_percpu(struct fprop_global *p, struct fprop_local_percpu *pl);
> -void __fprop_inc_percpu_max(struct fprop_global *p, struct fprop_local_percpu *pl,
> - int max_frac);
> +void __fprop_add_percpu_max(struct fprop_global *p, struct fprop_local_percpu *pl,
> + unsigned long nr, int max_frac);
> void fprop_fraction_percpu(struct fprop_global *p,
> struct fprop_local_percpu *pl, unsigned long *numerator,
> unsigned long *denominator);
> @@ -99,4 +99,11 @@ void fprop_inc_percpu(struct fprop_global *p, struct fprop_local_percpu *pl)
> local_irq_restore(flags);
> }
>
> +static inline
> +void __fprop_inc_percpu_max(struct fprop_global *p,
> + struct fprop_local_percpu *pl, int max_frac)
> +{
> + __fprop_add_percpu_max(p, pl, 1, max_frac);
> +}
> +
> #endif
> diff --git a/lib/flex_proportions.c b/lib/flex_proportions.c
> index 2cc1f94e03a1..31003989d34a 100644
> --- a/lib/flex_proportions.c
> +++ b/lib/flex_proportions.c
> @@ -255,8 +255,9 @@ void fprop_fraction_percpu(struct fprop_global *p,
> * Like __fprop_inc_percpu() except that event is counted only if the given
> * type has fraction smaller than @max_frac/FPROP_FRAC_BASE
> */
> -void __fprop_inc_percpu_max(struct fprop_global *p,
> - struct fprop_local_percpu *pl, int max_frac)
> +void __fprop_add_percpu_max(struct fprop_global *p,
> + struct fprop_local_percpu *pl, unsigned long nr,
> + int max_frac)
> {
> if (unlikely(max_frac < FPROP_FRAC_BASE)) {
> unsigned long numerator, denominator;
> @@ -267,6 +268,6 @@ void __fprop_inc_percpu_max(struct fprop_global *p,
> return;
> } else
> fprop_reflect_period_percpu(p, pl);
> - percpu_counter_add_batch(&pl->events, 1, PROP_BATCH);
> - percpu_counter_add(&p->events, 1);
> + percpu_counter_add_batch(&pl->events, nr, PROP_BATCH);
> + percpu_counter_add(&p->events, nr);
> }
> --
> 2.7.5
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
