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

Commit 7cfe6ce3 authored by Vikram Mulukutla's avatar Vikram Mulukutla Committed by Gerrit - the friendly Code Review server
Browse files

sched: tune: Add schedtune+WALT snapshot 



This snapshot is taken from msm-4.9 as of commit 57637bbc4fb6537
(Revert "ANDROID: sched/tune: Initialize raw_spin_lock
in boosted_groups").

Change-Id: Ie624026a428c13a6a1f9a1cee259bf5cdd59860a
Signed-off-by: default avatarVikram Mulukutla <markivx@codeaurora.org>
[satyap@codeaurora.org: resolve merge conflicts & uncomment
code for compilation]
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
parent 5adaa343

kernel/sched/boost.c

+4 −4
Original line number Diff line number Diff line
@@ -119,8 +119,8 @@ static void _sched_set_boost(int old_val, int type) 
	case NO_BOOST:

		if (old_val == FULL_THROTTLE_BOOST)

			core_ctl_set_boost(false);

		//else if (old_val == CONSERVATIVE_BOOST)

		//	restore_cgroup_boost_settings();

		else if (old_val == CONSERVATIVE_BOOST)

			restore_cgroup_boost_settings();

		else

			update_freq_aggregate_threshold(

				freq_aggr_threshold_backup);
@@ -132,7 +132,7 @@ static void _sched_set_boost(int old_val, int type) 
		break;



	case CONSERVATIVE_BOOST:

		//update_cgroup_boost_settings();

		update_cgroup_boost_settings();

		boost_kick_cpus();

		break;
@@ -148,7 +148,7 @@ static void _sched_set_boost(int old_val, int type) 


	set_boost_policy(type);

	sysctl_sched_boost = type;

	//trace_sched_set_boost(type);

	trace_sched_set_boost(type);

}



void sched_boost_parse_dt(void)

kernel/sched/tune.c

+190 −0
Original line number Diff line number Diff line
@@ -29,6 +29,33 @@ struct schedtune { 
	/* Boost value for tasks on that SchedTune CGroup */

	int boost;



#ifdef CONFIG_SCHED_WALT

	/* Toggle ability to override sched boost enabled */

	bool sched_boost_no_override;



	/*

	 * Controls whether a cgroup is eligible for sched boost or not. This

	 * can temporariliy be disabled by the kernel based on the no_override

	 * flag above.

	 */

	bool sched_boost_enabled;



	/*

	 * This tracks the default value of sched_boost_enabled and is used

	 * restore the value following any temporary changes to that flag.

	 */

	bool sched_boost_enabled_backup;



	/*

	 * Controls whether tasks of this cgroup should be colocated with each

	 * other and tasks of other cgroups that have the same flag turned on.

	 */

	bool colocate;



/* Controls whether further updates are allowed to the colocate flag */

bool colocate_update_disabled;

#endif /* CONFIG_SCHED_WALT */



	/* Hint to bias scheduling of tasks on that SchedTune CGroup

	 * towards idle CPUs */

	int prefer_idle;
@@ -61,6 +88,13 @@ static inline struct schedtune *parent_st(struct schedtune *st) 
static struct schedtune

root_schedtune = {

	.boost	= 0,

#ifdef CONFIG_SCHED_WALT

	.sched_boost_no_override = false,

	.sched_boost_enabled = true,

	.sched_boost_enabled_backup = true,

	.colocate = false,

	.colocate_update_disabled = false,

#endif

	.prefer_idle = 0,

};
@@ -108,6 +142,77 @@ struct boost_groups { 
/* Boost groups affecting each CPU in the system */

DEFINE_PER_CPU(struct boost_groups, cpu_boost_groups);



#ifdef CONFIG_SCHED_WALT

static inline void init_sched_boost(struct schedtune *st)

{

	st->sched_boost_no_override = false;

	st->sched_boost_enabled = true;

	st->sched_boost_enabled_backup = st->sched_boost_enabled;

	st->colocate = false;

	st->colocate_update_disabled = false;

}



bool same_schedtune(struct task_struct *tsk1, struct task_struct *tsk2)

{

	return task_schedtune(tsk1) == task_schedtune(tsk2);

}



void update_cgroup_boost_settings(void)

{

	int i;



	for (i = 0; i < BOOSTGROUPS_COUNT; i++) {

		if (!allocated_group[i])

			break;



		if (allocated_group[i]->sched_boost_no_override)

			continue;



		allocated_group[i]->sched_boost_enabled = false;

	}

}



void restore_cgroup_boost_settings(void)

{

	int i;



	for (i = 0; i < BOOSTGROUPS_COUNT; i++) {

		if (!allocated_group[i])

			break;



		allocated_group[i]->sched_boost_enabled =

			allocated_group[i]->sched_boost_enabled_backup;

	}

}



bool task_sched_boost(struct task_struct *p)

{

	struct schedtune *st = task_schedtune(p);



	return st->sched_boost_enabled;

}



static u64

sched_boost_override_read(struct cgroup_subsys_state *css,

			struct cftype *cft)

{

	struct schedtune *st = css_st(css);



	return st->sched_boost_no_override;

}



static int sched_boost_override_write(struct cgroup_subsys_state *css,

			struct cftype *cft, u64 override)

{

	struct schedtune *st = css_st(css);



	st->sched_boost_no_override = !!override;



	return 0;

}



#endif /* CONFIG_SCHED_WALT */



static void

schedtune_cpu_update(int cpu)

{
@@ -300,6 +405,53 @@ int schedtune_can_attach(struct cgroup_taskset *tset) 
	return 0;

}



#ifdef CONFIG_SCHED_WALT

static u64 sched_boost_enabled_read(struct cgroup_subsys_state *css,

			struct cftype *cft)

{

	struct schedtune *st = css_st(css);



	return st->sched_boost_enabled;

}



static int sched_boost_enabled_write(struct cgroup_subsys_state *css,

			struct cftype *cft, u64 enable)

{

	struct schedtune *st = css_st(css);



	st->sched_boost_enabled = !!enable;

	st->sched_boost_enabled_backup = st->sched_boost_enabled;



	return 0;

}



static u64 sched_colocate_read(struct cgroup_subsys_state *css,

			struct cftype *cft)

{

	struct schedtune *st = css_st(css);



	return st->colocate;

}



static int sched_colocate_write(struct cgroup_subsys_state *css,

			struct cftype *cft, u64 colocate)

{

	struct schedtune *st = css_st(css);



	if (st->colocate_update_disabled)

		return -EPERM;



	st->colocate = !!colocate;

	st->colocate_update_disabled = true;

	return 0;

}



#else /* CONFIG_SCHED_WALT */



static inline void init_sched_boost(struct schedtune *st) { }



#endif /* CONFIG_SCHED_WALT */



void schedtune_cancel_attach(struct cgroup_taskset *tset)

{

	/* This can happen only if SchedTune controller is mounted with
@@ -406,6 +558,25 @@ boost_read(struct cgroup_subsys_state *css, struct cftype *cft) 
	return st->boost;

}



#ifdef CONFIG_SCHED_WALT

static void schedtune_attach(struct cgroup_taskset *tset)

{

	struct task_struct *task;

	struct cgroup_subsys_state *css;

	struct schedtune *st;

	bool colocate;



	cgroup_taskset_first(tset, &css);

	st = css_st(css);



	colocate = st->colocate;



	cgroup_taskset_for_each(task, css, tset)

		sync_cgroup_colocation(task, colocate);



}

#endif



static int

boost_write(struct cgroup_subsys_state *css, struct cftype *cft,

	    s64 boost)
@@ -424,6 +595,23 @@ boost_write(struct cgroup_subsys_state *css, struct cftype *cft, 
}



static struct cftype files[] = {

#ifdef CONFIG_SCHED_WALT

	{

		.name = "sched_boost_no_override",

		.read_u64 = sched_boost_override_read,

		.write_u64 = sched_boost_override_write,

	},

	{

		.name = "sched_boost_enabled",

		.read_u64 = sched_boost_enabled_read,

		.write_u64 = sched_boost_enabled_write,

	},

	{

		.name = "colocate",

		.read_u64 = sched_colocate_read,

		.write_u64 = sched_colocate_write,

	},

#endif

	{

		.name = "boost",

		.read_s64 = boost_read,
@@ -487,6 +675,7 @@ schedtune_css_alloc(struct cgroup_subsys_state *parent_css) 


	/* Initialize per CPUs boost group support */

	st->idx = idx;

	init_sched_boost(st);

	if (schedtune_boostgroup_init(st))

		goto release;
@@ -520,6 +709,7 @@ schedtune_css_free(struct cgroup_subsys_state *css) 
struct cgroup_subsys schedtune_cgrp_subsys = {

	.css_alloc	= schedtune_css_alloc,

	.css_free	= schedtune_css_free,

	.attach		= schedtune_attach,

	.can_attach     = schedtune_can_attach,

	.cancel_attach  = schedtune_cancel_attach,

	.legacy_cftypes	= files,

kernel/sched/walt.c

+6 −6
Original line number Diff line number Diff line
@@ -2476,10 +2476,10 @@ static void _set_preferred_cluster(struct related_thread_group *grp) 
		return;



	list_for_each_entry(p, &grp->tasks, grp_list) {

		//if (boost_on_big && task_sched_boost(p)) {

		//	group_boost = true;

		//	break;

		//}

		if (boost_on_big && task_sched_boost(p)) {

			group_boost = true;

			break;

		}



		if (p->ravg.mark_start < wallclock -

		    (sched_ravg_window * sched_ravg_hist_size))
@@ -2663,8 +2663,8 @@ void add_new_task_to_grp(struct task_struct *new) 
		return;



	if (leader_grp_id == DEFAULT_CGROUP_COLOC_ID) {

		//if (!same_schedtune(new, leader))

		//	return;

		if (!same_schedtune(new, leader))

			return;

	}



	write_lock_irqsave(&related_thread_group_lock, flags);