Merge "sched: core_ctl: Improve the scheduler" (eba274e9) · Commits · e / devices / android_kernel_fairphone_FP4

kernel/sched/core_ctl.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -769,6 +769,13 @@ static bool adjustment_possible(const struct cluster_data *cluster,
		cluster->nr_isolated_cpus));
		}

		static bool need_all_cpus(const struct cluster_data *cluster)
		{

		return (is_min_capacity_cpu(cluster->first_cpu) &&
		sched_ravg_window < DEFAULT_SCHED_RAVG_WINDOW);
		}

		static bool eval_need(struct cluster_data *cluster)
		{
		unsigned long flags;
		@@ -784,7 +791,7 @@ static bool eval_need(struct cluster_data *cluster)

		spin_lock_irqsave(&state_lock, flags);

		if (cluster->boost \|\| !cluster->enable) {
		if (cluster->boost \|\| !cluster->enable \|\| need_all_cpus(cluster)) {
		need_cpus = cluster->max_cpus;
		} else {
		cluster->active_cpus = get_active_cpu_count(cluster);

kernel/sched/walt.c

+5 −21

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

		#ifdef CONFIG_HZ_300
		/*
		* Tick interval becomes to 3333333 due to
		* rounding error when HZ=300.
		*/
		#define MIN_SCHED_RAVG_WINDOW (3333333 * 6)
		#else
		/* Min window size (in ns) = 20ms */
		#define MIN_SCHED_RAVG_WINDOW 20000000
		#endif

		/* Max window size (in ns) = 1s */
		#define MAX_SCHED_RAVG_WINDOW 1000000000

		#define NR_WINDOWS_PER_SEC (NSEC_PER_SEC / MIN_SCHED_RAVG_WINDOW)

		__read_mostly unsigned int sysctl_sched_cpu_high_irqload = TICK_NSEC;

		unsigned int sysctl_sched_walt_rotate_big_tasks;
		@@ -131,8 +115,8 @@ static unsigned int display_sched_ravg_window_nr_ticks =
		unsigned int sysctl_sched_dynamic_ravg_window_enable = (HZ == 250);

		/* Window size (in ns) */
		__read_mostly unsigned int sched_ravg_window = MIN_SCHED_RAVG_WINDOW;
		__read_mostly unsigned int new_sched_ravg_window = MIN_SCHED_RAVG_WINDOW;
		__read_mostly unsigned int sched_ravg_window = DEFAULT_SCHED_RAVG_WINDOW;
		__read_mostly unsigned int new_sched_ravg_window = DEFAULT_SCHED_RAVG_WINDOW;

		static DEFINE_SPINLOCK(sched_ravg_window_lock);
		u64 sched_ravg_window_change_time;
		@@ -172,11 +156,11 @@ unsigned int __read_mostly sched_disable_window_stats;
		* The entire range of load from 0 to sched_ravg_window needs to be covered
		* in NUM_LOAD_INDICES number of buckets. Therefore the size of each bucket
		* is given by sched_ravg_window / NUM_LOAD_INDICES. Since the default value
		* of sched_ravg_window is MIN_SCHED_RAVG_WINDOW, use that to compute
		* of sched_ravg_window is DEFAULT_SCHED_RAVG_WINDOW, use that to compute
		* sched_load_granule.
		*/
		__read_mostly unsigned int sched_load_granule =
		MIN_SCHED_RAVG_WINDOW / NUM_LOAD_INDICES;
		DEFAULT_SCHED_RAVG_WINDOW / NUM_LOAD_INDICES;
		/* Size of bitmaps maintained to track top tasks */
		static const unsigned int top_tasks_bitmap_size =
		BITS_TO_LONGS(NUM_LOAD_INDICES + 1) * sizeof(unsigned long);
		@@ -193,7 +177,7 @@ static int __init set_sched_ravg_window(char *str)

		get_option(&str, &window_size);

		if (window_size < MIN_SCHED_RAVG_WINDOW \|\|
		if (window_size < DEFAULT_SCHED_RAVG_WINDOW \|\|
		window_size > MAX_SCHED_RAVG_WINDOW) {
		WARN_ON(1);
		return -EINVAL;

kernel/sched/walt.h

+15 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,21 @@

		#define MAX_NR_CLUSTERS 3

		#ifdef CONFIG_HZ_300
		/*
		* Tick interval becomes to 3333333 due to
		* rounding error when HZ=300.
		*/
		#define DEFAULT_SCHED_RAVG_WINDOW (3333333 * 6)
		#else
		/* Default window size (in ns) = 20ms */
		#define DEFAULT_SCHED_RAVG_WINDOW 20000000
		#endif

		/* Max window size (in ns) = 1s */
		#define MAX_SCHED_RAVG_WINDOW 1000000000
		#define NR_WINDOWS_PER_SEC (NSEC_PER_SEC / DEFAULT_SCHED_RAVG_WINDOW)

		#define WINDOW_STATS_RECENT 0
		#define WINDOW_STATS_MAX 1
		#define WINDOW_STATS_MAX_RECENT_AVG 2