Merge "sched: improve the scheduler" (0f420b93) · Commits · e / devices / android_kernel_fairphone_FP3

kernel/sched/boost.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -10,7 +10,6 @@
		* GNU General Public License for more details.
		*/

		#include <linux/jiffies.h>
		#include "sched.h"
		#include <linux/of.h>
		#include <linux/sched/core_ctl.h>
		@@ -140,7 +139,6 @@ static void _sched_set_boost(int old_val, int type)
		case RESTRAINED_BOOST:
		freq_aggr_threshold_backup =
		update_freq_aggregate_threshold(1);
		mod_timer(&sched_grp_timer, jiffies + 1);
		break;

		default:

kernel/sched/walt.c

+9 −41

Original line number	Diff line number	Diff line
		@@ -100,45 +100,6 @@ static void release_rq_locks_irqrestore(const cpumask_t *cpus,
		local_irq_restore(*flags);
		}

		struct timer_list sched_grp_timer;
		static void sched_agg_grp_load(unsigned long data)
		{
		struct sched_cluster *cluster;
		unsigned long flags;
		int cpu;

		acquire_rq_locks_irqsave(cpu_possible_mask, &flags);

		for_each_sched_cluster(cluster) {
		u64 aggr_grp_load = 0;

		for_each_cpu(cpu, &cluster->cpus) {
		struct rq *rq = cpu_rq(cpu);

		if (rq->curr)
		update_task_ravg(rq->curr, rq, TASK_UPDATE,
		sched_ktime_clock(), 0);
		aggr_grp_load +=
		rq->grp_time.prev_runnable_sum;
		}

		cluster->aggr_grp_load = aggr_grp_load;
		}

		release_rq_locks_irqrestore(cpu_possible_mask, &flags);

		if (sched_boost() == RESTRAINED_BOOST)
		mod_timer(&sched_grp_timer, jiffies + 1);
		}

		static int __init setup_sched_grp_timer(void)
		{
		init_timer_deferrable(&sched_grp_timer);
		sched_grp_timer.function = sched_agg_grp_load;
		return 0;
		}
		late_initcall(setup_sched_grp_timer);

		/* 1 -> use PELT based load stats, 0 -> use window-based load stats */
		unsigned int __read_mostly walt_disabled = 0;

		@@ -3058,6 +3019,8 @@ void walt_irq_work(struct irq_work *irq_work)
		wc = sched_ktime_clock();

		for_each_sched_cluster(cluster) {
		u64 aggr_grp_load = 0;

		raw_spin_lock(&cluster->load_lock);

		for_each_cpu(cpu, &cluster->cpus) {
		@@ -3066,14 +3029,19 @@ void walt_irq_work(struct irq_work *irq_work)
		update_task_ravg(rq->curr, rq,
		TASK_UPDATE, wc, 0);
		account_load_subtractions(rq);
		aggr_grp_load += rq->grp_time.prev_runnable_sum;
		}

		cpufreq_update_util(rq, 0);
		}

		cluster->aggr_grp_load = aggr_grp_load;

		raw_spin_unlock(&cluster->load_lock);
		}

		for_each_sched_cluster(cluster)
		for_each_cpu(cpu, &cluster->cpus)
		cpufreq_update_util(cpu_rq(cpu), 0);

		for_each_cpu(cpu, cpu_possible_mask)
		raw_spin_unlock(&cpu_rq(cpu)->lock);