Commit fbc44986 authored by Alex Shi's avatar Alex Shi Committed by Ingo Molnar
Browse files

sched/fair: Check the SD_ASYM_PACKING flag in sched_use_asym_prio() 



sched_use_asym_prio() checks whether CPU priorities should be used. It
makes sense to check for the SD_ASYM_PACKING() inside the function.
Since both sched_asym() and sched_group_asym() use sched_use_asym_prio(),
remove the now superfluous checks for the flag in various places.

Signed-off-by: default avatarAlex Shi <alexs@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarRicardo Neri <ricardo.neri-calderon@linux.intel.com>
Reviewed-by: default avatarRicardo Neri <ricardo.neri-calderon@linux.intel.com>
Reviewed-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20240210113924.1130448-4-alexs@kernel.org
parent 45de2062

kernel/sched/fair.c

+7 −9
Original line number Diff line number Diff line
@@ -9744,6 +9744,9 @@ group_type group_classify(unsigned int imbalance_pct, 
 */

static bool sched_use_asym_prio(struct sched_domain *sd, int cpu)

{

	if (!(sd->flags & SD_ASYM_PACKING))

		return false;



	if (!sched_smt_active())

		return true;
@@ -9937,11 +9940,9 @@ static inline void update_sg_lb_stats(struct lb_env *env, 
	sgs->group_weight = group->group_weight;



	/* Check if dst CPU is idle and preferred to this group */

	if (!local_group && env->sd->flags & SD_ASYM_PACKING &&

	    env->idle != CPU_NOT_IDLE && sgs->sum_h_nr_running &&

	    sched_group_asym(env, sgs, group)) {

	if (!local_group && env->idle != CPU_NOT_IDLE && sgs->sum_h_nr_running &&

	    sched_group_asym(env, sgs, group))

		sgs->group_asym_packing = 1;

	}



	/* Check for loaded SMT group to be balanced to dst CPU */

	if (!local_group && smt_balance(env, sgs, group))
@@ -11024,9 +11025,7 @@ static struct rq *find_busiest_queue(struct lb_env *env, 
		 * If balancing between cores, let lower priority CPUs help

		 * SMT cores with more than one busy sibling.

		 */

		if ((env->sd->flags & SD_ASYM_PACKING) &&

		    sched_asym(env->sd, i, env->dst_cpu) &&

		    nr_running == 1)

		if (sched_asym(env->sd, i, env->dst_cpu) && nr_running == 1)

			continue;



		switch (env->migration_type) {
@@ -11122,8 +11121,7 @@ asym_active_balance(struct lb_env *env) 
	 * the lower priority @env::dst_cpu help it. Do not follow

	 * CPU priority.

	 */

	return env->idle != CPU_NOT_IDLE && (env->sd->flags & SD_ASYM_PACKING) &&

	       sched_use_asym_prio(env->sd, env->dst_cpu) &&

	return env->idle != CPU_NOT_IDLE && sched_use_asym_prio(env->sd, env->dst_cpu) &&

	       (sched_asym_prefer(env->dst_cpu, env->src_cpu) ||

		!sched_use_asym_prio(env->sd, env->src_cpu));

}