Merge "sched: use cuml demand for idle selection" (454b4c82) · Commits · e / devices / android_kernel_oneplus_sm8150

kernel/sched/fair.c

+19 −15

Original line number	Diff line number	Diff line
		@@ -7053,6 +7053,15 @@ static int start_cpu(struct task_struct *p, bool boosted,
		if (boosted)
		return rd->max_cap_orig_cpu;

		/* A task always fits on its rtg_target */
		if (rtg_target) {
		int rtg_target_cpu = cpumask_first_and(rtg_target,
		cpu_online_mask);

		if (rtg_target_cpu < nr_cpu_ids)
		return rtg_target_cpu;
		}

		/* Where the task should land based on its demand */
		if (rd->min_cap_orig_cpu != -1
		&& task_fits_max(p, rd->min_cap_orig_cpu))
		@@ -7063,20 +7072,6 @@ static int start_cpu(struct task_struct *p, bool boosted,
		else
		start_cpu = rd->max_cap_orig_cpu;

		/*
		* start it up to its preferred cluster if the preferred clusteris
		* higher capacity
		*/
		if (start_cpu != -1 && rtg_target &&
		!cpumask_test_cpu(start_cpu, rtg_target)) {
		int rtg_target_cpu = cpumask_first(rtg_target);

		if (capacity_orig_of(start_cpu) <
		capacity_orig_of(rtg_target_cpu)) {
		start_cpu = rtg_target_cpu;
		}
		}

		return start_cpu;
		}

		@@ -7091,6 +7086,7 @@ static inline int find_best_target(struct task_struct p, int backup_cpu,
		unsigned long target_util = ULONG_MAX;
		unsigned long best_active_util = ULONG_MAX;
		unsigned long best_active_cuml_util = ULONG_MAX;
		unsigned long best_idle_cuml_util = ULONG_MAX;
		int best_idle_cstate = INT_MAX;
		struct sched_domain *sd;
		struct sched_group *sg;
		@@ -7101,6 +7097,7 @@ static inline int find_best_target(struct task_struct p, int backup_cpu,
		long spare_cap, most_spare_cap = 0;
		int most_spare_cap_cpu = -1;
		unsigned int active_cpus_count = 0;
		int prev_cpu = task_cpu(p);

		*backup_cpu = -1;

		@@ -7297,12 +7294,19 @@ static inline int find_best_target(struct task_struct p, int backup_cpu,
		* shallow idle big CPU.
		*/
		if (sysctl_sched_cstate_aware &&
		best_idle_cstate <= idle_idx)
		best_idle_cstate < idle_idx)
		continue;

		if (best_idle_cstate == idle_idx &&
		(best_idle_cpu == prev_cpu \|\|
		(i != prev_cpu &&
		new_util_cuml > best_idle_cuml_util)))
		continue;

		/* Keep track of best idle CPU */
		target_capacity = capacity_orig;
		best_idle_cstate = idle_idx;
		best_idle_cuml_util = new_util_cuml;
		best_idle_cpu = i;
		continue;
		}