Unverified Commit c2e37a40 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13081 sched/fair: Take the scheduling domain into account in select_idle_smt() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Wenyu Huang <huangwenyu5@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CF4TTXL3WOCK5LVDTLB6XFAHK3427LUO/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2B23 
 
Link:https://gitee.com/openeuler/kernel/pulls/13081

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b8723410 8ed28dec

kernel/sched/fair.c

+9 −3
Original line number Diff line number Diff line
@@ -8070,7 +8070,7 @@ static int select_idle_core(struct task_struct *p, int core, struct cpumask *cpu 
/*

 * Scan the local SMT mask for idle CPUs.

 */

static int select_idle_smt(struct task_struct *p, int target)

static int select_idle_smt(struct task_struct *p, struct sched_domain *sd, int target)

{

	int cpu;
@@ -8081,6 +8081,12 @@ static int select_idle_smt(struct task_struct *p, int target) 
#endif

		if (cpu == target)

			continue;

		/*

		 * Check if the CPU is in the LLC scheduling domain of @target.

		 * Due to isolcpus, there is no guarantee that all the siblings are in the domain.

		 */

		if (!cpumask_test_cpu(cpu, sched_domain_span(sd)))

			continue;

		if (available_idle_cpu(cpu) || sched_idle_cpu(cpu))

			return cpu;

	}
@@ -8104,7 +8110,7 @@ static inline int select_idle_core(struct task_struct *p, int core, struct cpuma 
	return __select_idle_cpu(core, p);

}



static inline int select_idle_smt(struct task_struct *p, int target)

static inline int select_idle_smt(struct task_struct *p, struct sched_domain *sd, int target)

{

	return -1;

}
@@ -8441,7 +8447,7 @@ static int select_idle_sibling(struct task_struct *p, int prev, int target) 
		has_idle_core = test_idle_cores(target);



		if (!has_idle_core && cpus_share_cache(prev, target)) {

			i = select_idle_smt(p, prev);

			i = select_idle_smt(p, sd, prev);

			if ((unsigned int)i < nr_cpumask_bits)

				return i;

		}