Merge "sched: window-stats: legacy mode" (5b159414) · Commits · e / devices / android_kernel_sony_msm8994

include/linux/sched/sysctl.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ extern unsigned int sysctl_sched_wakeup_load_threshold;
		extern unsigned int sysctl_sched_window_stats_policy;
		extern unsigned int sysctl_sched_account_wait_time;
		extern unsigned int sysctl_sched_ravg_hist_size;
		extern unsigned int sysctl_sched_freq_legacy_mode;

		#if defined(CONFIG_SCHED_FREQ_INPUT) \|\| defined(CONFIG_SCHED_HMP)
		extern unsigned int sysctl_sched_init_task_load_pct;

kernel/sched/core.c

+31 −9

Original line number	Diff line number	Diff line
		@@ -1120,9 +1120,10 @@ static inline void clear_hmp_request(int cpu) { }
		#if defined(CONFIG_SCHED_FREQ_INPUT) \|\| defined(CONFIG_SCHED_HMP)

		/*
		* sched_window_stats_policy, sched_account_wait_time and sched_ravg_hist_size
		* have a 'sysctl' copy associated with them. This is required for atomic update
		* of those variables when being modifed via sysctl interface.
		* sched_window_stats_policy, sched_account_wait_time, sched_ravg_hist_size
		* and sched_freq_legacy_mode have a 'sysctl' copy associated with them. This
		* is required for atomic update of those variables when being modifed via
		* sysctl interface.
		*
		* IMPORTANT: Initialize both copies to same value!!
		*/
		@@ -1139,6 +1140,9 @@ __read_mostly unsigned int sysctl_sched_window_stats_policy =
		static __read_mostly unsigned int sched_account_wait_time = 1;
		__read_mostly unsigned int sysctl_sched_account_wait_time = 1;

		static __read_mostly unsigned int sched_freq_legacy_mode;
		__read_mostly unsigned int sysctl_sched_freq_legacy_mode;


		/* Window size (in ns) */
		__read_mostly unsigned int sched_ravg_window = 10000000;
		@@ -1291,14 +1295,15 @@ compute_demand:
		if (new_window)
		p->ravg.demand = demand;

		if (update_sum && (p->ravg.flags & CURR_WINDOW_CONTRIB)) {
		if (!sched_freq_legacy_mode && update_sum &&
		(p->ravg.flags & CURR_WINDOW_CONTRIB)) {
		rq->curr_runnable_sum -= p->ravg.partial_demand;
		BUG_ON((s64)rq->curr_runnable_sum < 0);
		}

		p->ravg.partial_demand = demand;

		if (update_sum && !new_window) {
		if (!sched_freq_legacy_mode && update_sum && !new_window) {
		rq->curr_runnable_sum += p->ravg.partial_demand;
		p->ravg.flags \|= CURR_WINDOW_CONTRIB;
		}
		@@ -1448,6 +1453,9 @@ static void update_task_ravg(struct task_struct p, struct rq rq,
		BUG_ON(delta < 0);

		p->ravg.sum += delta;
		if (sched_freq_legacy_mode && (event == PUT_PREV_TASK))
		rq->curr_runnable_sum += delta;

		if (unlikely(p->ravg.sum > window_size))
		p->ravg.sum = window_size;
		}
		@@ -1468,6 +1476,18 @@ static void update_task_ravg(struct task_struct p, struct rq rq,

		if (update_sum) {
		if (event == PUT_PREV_TASK \|\| event == TASK_UPDATE) {
		if (sched_freq_legacy_mode) {
		if (nr_full_windows) {
		/* sum == scaled window_size */
		rq->curr_runnable_sum = sum;
		}
		rq->prev_runnable_sum =
		rq->curr_runnable_sum;
		rq->curr_runnable_sum = 0;
		mark_start = window_start;
		continue;
		}

		if (!nr_full_windows) {
		rq->curr_runnable_sum -= partial_demand;
		rq->curr_runnable_sum += p->ravg.demand;
		@@ -1478,7 +1498,7 @@ static void update_task_ravg(struct task_struct p, struct rq rq,
		}
		rq->curr_runnable_sum = p->ravg.partial_demand;
		p->ravg.flags \|= CURR_WINDOW_CONTRIB;
		} else {
		} else if (!sched_freq_legacy_mode) {
		if (!nr_full_windows) {
		rq->prev_runnable_sum -= partial_demand;
		BUG_ON((s64)rq->prev_runnable_sum < 0);
		@@ -1502,12 +1522,12 @@ static void update_task_ravg(struct task_struct p, struct rq rq,
		* sched_account_wait_time == 0, ensure this dependency is met.
		*/

		if (!(p->ravg.flags & CURR_WINDOW_CONTRIB)) {
		if (!sched_freq_legacy_mode && !(p->ravg.flags & CURR_WINDOW_CONTRIB)) {
		rq->curr_runnable_sum += p->ravg.partial_demand;
		p->ravg.flags \|= CURR_WINDOW_CONTRIB;
		}

		if (!(p->ravg.flags & PREV_WINDOW_CONTRIB)) {
		if (!sched_freq_legacy_mode && !(p->ravg.flags & PREV_WINDOW_CONTRIB)) {
		rq->prev_runnable_sum += p->ravg.demand;
		p->ravg.flags \|= PREV_WINDOW_CONTRIB;
		}
		@@ -1679,6 +1699,7 @@ void reset_all_window_stats(u64 window_start, unsigned int window_size)
		sched_window_stats_policy = sysctl_sched_window_stats_policy;
		sched_account_wait_time = sysctl_sched_account_wait_time;
		sched_ravg_hist_size = sysctl_sched_ravg_hist_size;
		sched_freq_legacy_mode = sysctl_sched_freq_legacy_mode;

		for_each_online_cpu(cpu) {
		struct rq *rq = cpu_rq(cpu);
		@@ -2073,7 +2094,8 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)

		atomic_notifier_call_chain(&task_migration_notifier, 0, &tmn);

		if (sched_enable_hmp && (p->on_rq \|\| p->state == TASK_WAKING))
		if (sched_enable_hmp && (p->on_rq \|\| p->state == TASK_WAKING)
		&& !sched_freq_legacy_mode)
		fixup_busy_time(p, new_cpu);
		}

kernel/sched/fair.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1903,7 +1903,8 @@ static inline int invalid_value(unsigned int *data)

		/*
		* Handle "atomic" update of sysctl_sched_window_stats_policy,
		* sysctl_sched_ravg_hist_size and sysctl_sched_account_wait_time variables.
		* sysctl_sched_ravg_hist_size, sysctl_sched_account_wait_time and
		* sched_freq_legacy_mode variables.
		*/
		int sched_window_update_handler(struct ctl_table *table, int write,
		void __user buffer, size_t lenp,

kernel/sched/sched.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -808,6 +808,7 @@ extern void boost_kick(int cpu);
		#else /* CONFIG_SCHED_HMP */

		#define sched_enable_hmp 0
		#define sched_freq_legacy_mode 1

		static inline void check_for_migration(struct rq rq, struct task_struct p) { }
		static inline void pre_big_small_task_count_change(void) { }

kernel/sysctl.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -311,6 +311,13 @@ static struct ctl_table kern_table[] = {
		},
		#endif
		#if defined(CONFIG_SCHED_FREQ_INPUT) \|\| defined(CONFIG_SCHED_HMP)
		{
		.procname = "sched_freq_legacy_mode",
		.data = &sysctl_sched_freq_legacy_mode,
		.maxlen = sizeof(unsigned int),
		.mode = 0644,
		.proc_handler = sched_window_update_handler,
		},
		{
		.procname = "sched_account_wait_time",
		.data = &sysctl_sched_account_wait_time,