Rename scale_load() and scale_load_down() to user_to_kernel_load() and kernel_to_user_load() respectively, to allow the names to bear what they are really about.
Signed-off-by: Yuyang Du <[email protected]> [update calculate_imbalance] Signed-off-by: Vincent Guittot <[email protected]> Signed-off-by: Yuyang Du <[email protected]> --- kernel/sched/core.c | 8 ++++---- kernel/sched/fair.c | 14 ++++++++------ kernel/sched/sched.h | 16 ++++++++-------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 0b21e7a..81c876e 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -677,12 +677,12 @@ static void set_load_weight(struct task_struct *p) * SCHED_IDLE tasks get minimal weight: */ if (idle_policy(p->policy)) { - load->weight = scale_load(WEIGHT_IDLEPRIO); + load->weight = user_to_kernel_load(WEIGHT_IDLEPRIO); load->inv_weight = WMULT_IDLEPRIO; return; } - load->weight = scale_load(sched_prio_to_weight[prio]); + load->weight = user_to_kernel_load(sched_prio_to_weight[prio]); load->inv_weight = sched_prio_to_wmult[prio]; } @@ -8110,7 +8110,7 @@ static void cpu_cgroup_attach(struct cgroup_taskset *tset) static int cpu_shares_write_u64(struct cgroup_subsys_state *css, struct cftype *cftype, u64 shareval) { - return sched_group_set_shares(css_tg(css), scale_load(shareval)); + return sched_group_set_shares(css_tg(css), user_to_kernel_load(shareval)); } static u64 cpu_shares_read_u64(struct cgroup_subsys_state *css, @@ -8118,7 +8118,7 @@ static u64 cpu_shares_read_u64(struct cgroup_subsys_state *css, { struct task_group *tg = css_tg(css); - return (u64) scale_load_down(tg->shares); + return (u64) kernel_to_user_load(tg->shares); } #ifdef CONFIG_CFS_BANDWIDTH diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index da6642f..bcf1027 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -189,7 +189,7 @@ static void __update_inv_weight(struct load_weight *lw) if (likely(lw->inv_weight)) return; - w = scale_load_down(lw->weight); + w = kernel_to_user_load(lw->weight); if (BITS_PER_LONG > 32 && unlikely(w >= WMULT_CONST)) lw->inv_weight = 1; @@ -213,7 +213,7 @@ static void __update_inv_weight(struct load_weight *lw) */ static u64 __calc_delta(u64 delta_exec, unsigned long weight, struct load_weight *lw) { - u64 fact = scale_load_down(weight); + u64 fact = kernel_to_user_load(weight); int shift = WMULT_SHIFT; __update_inv_weight(lw); @@ -6875,10 +6875,11 @@ static inline void calculate_imbalance(struct lb_env *env, struct sd_lb_stats *s */ if (busiest->group_type == group_overloaded && local->group_type == group_overloaded) { + unsigned long min_cpu_load = + kernel_to_user_load(NICE_0_LOAD) * busiest->group_capacity; load_above_capacity = busiest->sum_nr_running * NICE_0_LOAD; - if (load_above_capacity > scale_load(busiest->group_capacity)) - load_above_capacity -= - scale_load(busiest->group_capacity); + if (load_above_capacity > min_cpu_load) + load_above_capacity -= min_cpu_load; else load_above_capacity = ~0UL; } @@ -8432,7 +8433,8 @@ int sched_group_set_shares(struct task_group *tg, unsigned long shares) if (!tg->se[0]) return -EINVAL; - shares = clamp(shares, scale_load(MIN_SHARES), scale_load(MAX_SHARES)); + shares = clamp(shares, user_to_kernel_load(MIN_SHARES), + user_to_kernel_load(MAX_SHARES)); mutex_lock(&shares_mutex); if (tg->shares == shares) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 94ba652..ebe16e3 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -55,22 +55,22 @@ static inline void update_cpu_load_active(struct rq *this_rq) { } */ #if 0 /* BITS_PER_LONG > 32 -- currently broken: it increases power usage under light load */ # define NICE_0_LOAD_SHIFT (SCHED_FIXEDPOINT_SHIFT + SCHED_FIXEDPOINT_SHIFT) -# define scale_load(w) ((w) << SCHED_FIXEDPOINT_SHIFT) -# define scale_load_down(w) ((w) >> SCHED_FIXEDPOINT_SHIFT) +# define user_to_kernel_load(w) ((w) << SCHED_FIXEDPOINT_SHIFT) +# define kernel_to_user_load(w) ((w) >> SCHED_FIXEDPOINT_SHIFT) #else # define NICE_0_LOAD_SHIFT (SCHED_FIXEDPOINT_SHIFT) -# define scale_load(w) (w) -# define scale_load_down(w) (w) +# define user_to_kernel_load(w) (w) +# define kernel_to_user_load(w) (w) #endif /* * Task weight (visible to user) and its load (invisible to user) have * independent resolution, but they should be well calibrated. We use - * scale_load() and scale_load_down(w) to convert between them. The - * following must be true: - * - * scale_load(sched_prio_to_weight[USER_PRIO(NICE_TO_PRIO(0))]) == NICE_0_LOAD + * user_to_kernel_load() and kernel_to_user_load(w) to convert between + * them. The following must be true: * + * user_to_kernel_load(sched_prio_to_weight[USER_PRIO(NICE_TO_PRIO(0))]) == NICE_0_LOAD + * kernel_to_user_load(NICE_0_LOAD) == sched_prio_to_weight[USER_PRIO(NICE_TO_PRIO(0))] */ #define NICE_0_LOAD (1L << NICE_0_LOAD_SHIFT) -- 2.1.4
