Skip to content

Commit fbc4498

Browse files
Alex ShiIngo Molnar
authored andcommitted
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: Alex Shi <alexs@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Tested-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> Reviewed-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org> Link: https://lore.kernel.org/r/20240210113924.1130448-4-alexs@kernel.org
1 parent 45de206 commit fbc4498

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

kernel/sched/fair.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9744,6 +9744,9 @@ group_type group_classify(unsigned int imbalance_pct,
97449744
*/
97459745
static bool sched_use_asym_prio(struct sched_domain *sd, int cpu)
97469746
{
9747+
if (!(sd->flags & SD_ASYM_PACKING))
9748+
return false;
9749+
97479750
if (!sched_smt_active())
97489751
return true;
97499752

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

99399942
/* Check if dst CPU is idle and preferred to this group */
9940-
if (!local_group && env->sd->flags & SD_ASYM_PACKING &&
9941-
env->idle != CPU_NOT_IDLE && sgs->sum_h_nr_running &&
9942-
sched_group_asym(env, sgs, group)) {
9943+
if (!local_group && env->idle != CPU_NOT_IDLE && sgs->sum_h_nr_running &&
9944+
sched_group_asym(env, sgs, group))
99439945
sgs->group_asym_packing = 1;
9944-
}
99459946

99469947
/* Check for loaded SMT group to be balanced to dst CPU */
99479948
if (!local_group && smt_balance(env, sgs, group))
@@ -11024,9 +11025,7 @@ static struct rq *find_busiest_queue(struct lb_env *env,
1102411025
* If balancing between cores, let lower priority CPUs help
1102511026
* SMT cores with more than one busy sibling.
1102611027
*/
11027-
if ((env->sd->flags & SD_ASYM_PACKING) &&
11028-
sched_asym(env->sd, i, env->dst_cpu) &&
11029-
nr_running == 1)
11028+
if (sched_asym(env->sd, i, env->dst_cpu) && nr_running == 1)
1103011029
continue;
1103111030

1103211031
switch (env->migration_type) {
@@ -11122,8 +11121,7 @@ asym_active_balance(struct lb_env *env)
1112211121
* the lower priority @env::dst_cpu help it. Do not follow
1112311122
* CPU priority.
1112411123
*/
11125-
return env->idle != CPU_NOT_IDLE && (env->sd->flags & SD_ASYM_PACKING) &&
11126-
sched_use_asym_prio(env->sd, env->dst_cpu) &&
11124+
return env->idle != CPU_NOT_IDLE && sched_use_asym_prio(env->sd, env->dst_cpu) &&
1112711125
(sched_asym_prefer(env->dst_cpu, env->src_cpu) ||
1112811126
!sched_use_asym_prio(env->sd, env->src_cpu));
1112911127
}

0 commit comments

Comments
 (0)