Commit abeae76a authored by Mel Gorman's avatar Mel Gorman Committed by Peter Zijlstra
Browse files

sched/numa: Rename nr_running and break out the magic number 



This is simply a preparation patch to make the following patches easier
to read. No functional change.

Signed-off-by: default avatarMel Gorman <mgorman@techsingularity.net>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Link: https://lkml.kernel.org/r/20201120090630.3286-2-mgorman@techsingularity.net
parent 74d862b6

kernel/sched/fair.c

+6 −4
Original line number Diff line number Diff line
@@ -1559,7 +1559,7 @@ struct task_numa_env { 
static unsigned long cpu_load(struct rq *rq);

static unsigned long cpu_runnable(struct rq *rq);

static unsigned long cpu_util(int cpu);

static inline long adjust_numa_imbalance(int imbalance, int nr_running);

static inline long adjust_numa_imbalance(int imbalance, int dst_running);



static inline enum

numa_type numa_classify(unsigned int imbalance_pct,
@@ -8991,7 +8991,9 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd 
	}

}



static inline long adjust_numa_imbalance(int imbalance, int nr_running)

#define NUMA_IMBALANCE_MIN 2



static inline long adjust_numa_imbalance(int imbalance, int dst_running)

{

	unsigned int imbalance_min;
@@ -8999,8 +9001,8 @@ static inline long adjust_numa_imbalance(int imbalance, int nr_running) 
	 * Allow a small imbalance based on a simple pair of communicating

	 * tasks that remain local when the source domain is almost idle.

	 */

	imbalance_min = 2;

	if (nr_running <= imbalance_min)

	imbalance_min = NUMA_IMBALANCE_MIN;

	if (dst_running <= imbalance_min)

		return 0;



	return imbalance;