Commit b48e16a6 authored by Qais Yousef's avatar Qais Yousef Committed by Peter Zijlstra
Browse files

sched/uclamp: Make task_fits_capacity() use util_fits_cpu() 



So that the new uclamp rules in regard to migration margin and capacity
pressure are taken into account correctly.

Fixes: a7008c07 ("sched/fair: Make task_fits_capacity() consider uclamp restrictions")
Co-developed-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: default avatarQais Yousef <qais.yousef@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220804143609.515789-3-qais.yousef@arm.com
parent 48d5e9da

kernel/sched/fair.c

+16 −10
Original line number Diff line number Diff line
@@ -4549,10 +4549,12 @@ static inline int util_fits_cpu(unsigned long util, 
	return fits;

}



static inline int task_fits_capacity(struct task_struct *p,

				     unsigned long capacity)

static inline int task_fits_cpu(struct task_struct *p, int cpu)

{

	return fits_capacity(uclamp_task_util(p), capacity);

	unsigned long uclamp_min = uclamp_eff_value(p, UCLAMP_MIN);

	unsigned long uclamp_max = uclamp_eff_value(p, UCLAMP_MAX);

	unsigned long util = task_util_est(p);

	return util_fits_cpu(util, uclamp_min, uclamp_max, cpu);

}



static inline void update_misfit_status(struct task_struct *p, struct rq *rq)
@@ -4565,7 +4567,7 @@ static inline void update_misfit_status(struct task_struct *p, struct rq *rq) 
		return;

	}



	if (task_fits_capacity(p, capacity_of(cpu_of(rq)))) {

	if (task_fits_cpu(p, cpu_of(rq))) {

		rq->misfit_task_load = 0;

		return;

	}
@@ -8399,7 +8401,7 @@ static int detach_tasks(struct lb_env *env) 


		case migrate_misfit:

			/* This is not a misfit task */

			if (task_fits_capacity(p, capacity_of(env->src_cpu)))

			if (task_fits_cpu(p, env->src_cpu))

				goto next;



			env->imbalance = 0;
@@ -9404,6 +9406,10 @@ static inline void update_sg_wakeup_stats(struct sched_domain *sd, 


	memset(sgs, 0, sizeof(*sgs));



	/* Assume that task can't fit any CPU of the group */

	if (sd->flags & SD_ASYM_CPUCAPACITY)

		sgs->group_misfit_task_load = 1;



	for_each_cpu(i, sched_group_span(group)) {

		struct rq *rq = cpu_rq(i);

		unsigned int local;
@@ -9423,12 +9429,12 @@ static inline void update_sg_wakeup_stats(struct sched_domain *sd, 
		if (!nr_running && idle_cpu_without(i, p))

			sgs->idle_cpus++;



	}



	/* Check if task fits in the group */

		/* Check if task fits in the CPU */

		if (sd->flags & SD_ASYM_CPUCAPACITY &&

	    !task_fits_capacity(p, group->sgc->max_capacity)) {

		sgs->group_misfit_task_load = 1;

		    sgs->group_misfit_task_load &&

		    task_fits_cpu(p, i))

			sgs->group_misfit_task_load = 0;



	}



	sgs->group_capacity = group->sgc->capacity;

kernel/sched/sched.h

+9 −0
Original line number Diff line number Diff line
@@ -3060,6 +3060,15 @@ static inline bool uclamp_is_used(void) 
	return static_branch_likely(&sched_uclamp_used);

}

#else /* CONFIG_UCLAMP_TASK */

static inline unsigned long uclamp_eff_value(struct task_struct *p,

					     enum uclamp_id clamp_id)

{

	if (clamp_id == UCLAMP_MIN)

		return 0;



	return SCHED_CAPACITY_SCALE;

}



static inline

unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long util,

				  struct task_struct *p)