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

Commit a57aa933 authored by Syed Rameez Mustafa's avatar Syed Rameez Mustafa Committed by Joonwoo Park
Browse files

sched: Optimize wakeup placement logic when need_idle is set 



Try and find the min cstate CPU within the little cluster when a
task fits there. If there is no idle CPU return the least busy
CPU. Also Add a prev CPU bias when C-states or load is the same.

CRs-fixed: 1006303
Change-Id: I577cc70a59f2b0c5309c87b54e106211f96e04a0
Signed-off-by: default avatarSyed Rameez Mustafa <rameezmustafa@codeaurora.org>
parent b20a943e

kernel/sched/fair.c

+35 −13
Original line number Diff line number Diff line
@@ -2911,8 +2911,10 @@ struct cpu_select_env { 
};



struct cluster_cpu_stats {

	int best_idle_cpu, best_capacity_cpu, best_cpu, best_sibling_cpu;

	int best_idle_cpu, least_loaded_cpu;

	int best_capacity_cpu, best_cpu, best_sibling_cpu;

	int min_cost, best_sibling_cpu_cost;

	int best_cpu_cstate;

	u64 min_load, best_sibling_cpu_load;

	s64 highest_spare_capacity;

};
@@ -3149,7 +3151,7 @@ next_best_cluster(struct sched_cluster *cluster, struct cpu_select_env *env, 
static void update_cluster_stats(int cpu, struct cluster_cpu_stats *stats,

					 struct cpu_select_env *env)

{

	int cpu_cost;

	int cpu_cost, cpu_cstate;

	int prev_cpu = env->prev_cpu;



	cpu_cost = power_cost(cpu, task_load(env->p) +
@@ -3168,21 +3170,36 @@ static void update_cluster_stats(int cpu, struct cluster_cpu_stats *stats, 
		}

	}



	if ((cpu_cost < stats->min_cost) ||

	    ((stats->best_cpu != prev_cpu && stats->min_load > env->cpu_load) ||

	     cpu == prev_cpu)) {

	if (env->need_idle) {

			if (idle_cpu(cpu)) {

		stats->min_cost = cpu_cost;

		if (idle_cpu(cpu)) {

			cpu_cstate = cpu_rq(cpu)->cstate;

			if (cpu_cstate < stats->best_cpu_cstate ||

				(cpu_cstate == stats->best_cpu_cstate &&

							cpu == prev_cpu)) {

				stats->best_idle_cpu = cpu;

				stats->best_cpu_cstate = cpu_cstate;

			}

		} else {

			if (env->cpu_load < stats->min_load ||

				(env->cpu_load == stats->min_load &&

							cpu == prev_cpu)) {

				stats->least_loaded_cpu = cpu;

				stats->min_load = env->cpu_load;

			}

		}



		return;

	}



	if ((cpu_cost < stats->min_cost) ||

	    ((stats->best_cpu != prev_cpu && stats->min_load > env->cpu_load) ||

	     cpu == prev_cpu)) {

		stats->min_cost = cpu_cost;

		stats->min_load = env->cpu_load;

		stats->best_cpu = cpu;

	}

}

}



static void find_best_cpu_in_cluster(struct sched_cluster *c,

	 struct cpu_select_env *env, struct cluster_cpu_stats *stats)
@@ -3224,6 +3241,8 @@ static inline void init_cluster_cpu_stats(struct cluster_cpu_stats *stats) 
	stats->min_cost = stats->best_sibling_cpu_cost = INT_MAX;

	stats->min_load	= stats->best_sibling_cpu_load = ULLONG_MAX;

	stats->highest_spare_capacity = 0;

	stats->least_loaded_cpu = -1;

	stats->best_cpu_cstate = INT_MAX;

}



/*
@@ -3390,8 +3409,11 @@ retry: 


	} while ((cluster = next_best_cluster(cluster, &env, &stats)));



	if (stats.best_idle_cpu >= 0) {

	if (env.need_idle) {

		if (stats.best_idle_cpu >= 0)

			target = stats.best_idle_cpu;

		else if (stats.least_loaded_cpu >= 0)

			target = stats.least_loaded_cpu;

	} else if (stats.best_cpu >= 0) {

		if (stats.best_cpu != task_cpu(p) &&

				stats.min_cost == stats.best_sibling_cpu_cost)