Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f838988d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched/walt: Improve the scheduler"

parents e2539ffd 862319bb

include/linux/sched.h

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ struct walt_task_struct { 
	struct list_head		grp_list;

	u64				cpu_cycles;

	cpumask_t			cpus_requested;

	bool				iowaited;

};



#else

kernel/sched/core.c

+1 −0
Original line number Diff line number Diff line
@@ -2828,6 +2828,7 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p) 
	p->wts.boost_expires		= 0;

	p->wts.boost_period		= 0;

	p->wts.low_latency		= 0;

	p->wts.iowaited			= false;

#endif

	INIT_LIST_HEAD(&p->se.group_node);

kernel/sched/fair.c

+23 −9
Original line number Diff line number Diff line
@@ -6573,17 +6573,28 @@ static void walt_find_best_target(struct sched_domain *sd, cpumask_t *cpus, 
	int prev_cpu = task_cpu(p);

	int unisolated_candidate = -1;

	int order_index = fbt_env->order_index, end_index = fbt_env->end_index;

	int stop_index = INT_MAX;

	int cluster;

	unsigned int target_nr_rtg_high_prio = UINT_MAX;

	bool rtg_high_prio_task = task_rtg_high_prio(p);

	cpumask_t visit_cpus;

	bool io_task_pack = (order_index > 0 && p->in_iowait);



	/* Find start CPU based on boost value */

	start_cpu = fbt_env->start_cpu;



	if (fbt_env->strict_max || io_task_pack)

		target_max_spare_cap = LONG_MIN;

	/*

	 * For higher capacity worth I/O tasks, stop the search

	 * at the end of higher capacity cluster(s).

	 */

	if (order_index > 0 && p->wts.iowaited) {

		stop_index = num_sched_clusters - 2;

		most_spare_wake_cap = LONG_MIN;

	}



	if (fbt_env->strict_max) {

		stop_index = 0;

		most_spare_wake_cap = LONG_MIN;

	}



	if (p->state == TASK_RUNNING)

		most_spare_wake_cap = ULONG_MAX;
@@ -6647,9 +6658,8 @@ static void walt_find_best_target(struct sched_domain *sd, cpumask_t *cpus, 
				most_spare_cap_cpu = i;

			}



			if ((per_task_boost(cpu_rq(i)->curr) ==

					TASK_BOOST_STRICT_MAX) &&

					!fbt_env->strict_max)

			if (per_task_boost(cpu_rq(i)->curr) ==

					TASK_BOOST_STRICT_MAX)

				continue;

			/*

			 * Cumulative demand may already be accounting for the
@@ -6668,8 +6678,7 @@ static void walt_find_best_target(struct sched_domain *sd, cpumask_t *cpus, 
			 * than the one required to boost the task.

			 */

			new_util = max(min_util, new_util);

			if (!(fbt_env->strict_max || io_task_pack) &&

					new_util > capacity_orig)

			if (new_util > capacity_orig)

				continue;



			/*
@@ -6760,6 +6769,9 @@ static void walt_find_best_target(struct sched_domain *sd, cpumask_t *cpus, 
		if ((cluster >= end_index) && (target_cpu != -1) &&

			walt_target_ok(target_cpu, order_index))

			break;



		if (most_spare_cap_cpu != -1 && cluster >= stop_index)

			break;

	}



	walt_adjust_cpus_for_packing(p, &target_cpu, &best_idle_cpu,
@@ -8153,9 +8165,11 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env) 
	if (!can_migrate_boosted_task(p, env->src_cpu, env->dst_cpu))

		return 0;



	if (p->in_iowait && is_min_capacity_cpu(env->dst_cpu) &&

#ifdef CONFIG_SCHED_WALT

	if (p->wts.iowaited && is_min_capacity_cpu(env->dst_cpu) &&

			!is_min_capacity_cpu(env->src_cpu))

		return 0;

#endif



	if (!cpumask_test_cpu(env->dst_cpu, p->cpus_ptr)) {

		int cpu;