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

!1630 sched: Add feature 'UTIL_TASKGROUP' for dynamic affinity 

Merge Pull Request from: @ci-robot 
 
PR sync from: Hui Tang <tanghui20@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/25WFMRKCSRO72P3FCQ5FNDCGWK6GYMAZ/ 
 
https://gitee.com/openeuler/kernel/issues/I526XC 
 
Link:https://gitee.com/openeuler/kernel/pulls/1630

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 3ea5ef11 0af02522

kernel/sched/fair.c

+14 −5
Original line number Diff line number Diff line
@@ -7097,6 +7097,17 @@ static inline bool prefer_cpus_valid(struct task_struct *p) 
	       cpumask_subset(p->prefer_cpus, p->cpus_ptr);

}



static inline unsigned long taskgroup_cpu_util(struct task_group *tg,

					       int cpu)

{

#ifdef CONFIG_FAIR_GROUP_SCHED

	if (tg->se[cpu] && sched_feat(DA_UTIL_TASKGROUP))

		return tg->se[cpu]->avg.util_avg;

#endif



	return cpu_util(cpu);

}



/*

 * set_task_select_cpus: select the cpu range for task

 * @p: the task whose available cpu range will to set
@@ -7127,13 +7138,11 @@ static void set_task_select_cpus(struct task_struct *p, int *idlest_cpu, 
	rcu_read_lock();

	tg = task_group(p);

	for_each_cpu(cpu, p->prefer_cpus) {

		if (unlikely(!tg->se[cpu]))

			continue;



		if (idlest_cpu && available_idle_cpu(cpu)) {

			*idlest_cpu = cpu;

		} else if (idlest_cpu) {

			spare = (long)(capacity_of(cpu) - tg->se[cpu]->avg.util_avg);

			spare = (long)(capacity_of(cpu) -

				taskgroup_cpu_util(tg, cpu));

			if (spare > min_util) {

				min_util = spare;

				*idlest_cpu = cpu;
@@ -7148,7 +7157,7 @@ static void set_task_select_cpus(struct task_struct *p, int *idlest_cpu, 
			return;

		}



		util_avg_sum += tg->se[cpu]->avg.util_avg;

		util_avg_sum += taskgroup_cpu_util(tg, cpu);

		tg_capacity += capacity_of(cpu);

	}

	rcu_read_unlock();

kernel/sched/features.h

+7 −0
Original line number Diff line number Diff line
@@ -106,3 +106,10 @@ SCHED_FEAT(UTIL_EST_FASTUP, true) 


SCHED_FEAT(ALT_PERIOD, true)

SCHED_FEAT(BASE_SLICE, true)



#ifdef CONFIG_QOS_SCHED_DYNAMIC_AFFINITY

/*

 * Use util_avg of bottom-Level taskgroup

 */

SCHED_FEAT(DA_UTIL_TASKGROUP, true)

#endif