evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "sched: constrain HMP scheduler tunable range with in better way"

Browse source
This commit is contained in:
Linux Build Service Account 2016-09-29 11:20:30 -07:00 • committed by Gerrit - the friendly Code Review server
commit f6d68e27bf
2 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
kernel/sched/hmp.c
View file

@ -1502,28 +1502,10 @@ int sched_hmp_proc_update_handler(struct ctl_table *table, int write,
if (write && (old_val == *data))
goto done;
/*
* Special handling for sched_freq_aggregate_threshold_pct
* which can be greater than 100. Use 1000 as an upper bound
* value which works for all practical use cases.
*/
if (data == &sysctl_sched_freq_aggregate_threshold_pct) {
if (*data > 1000) {
*data = old_val;
ret = -EINVAL;
goto done;
}
} else if (data != &sysctl_sched_select_prev_cpu_us) {
/*
* all tunables other than sched_select_prev_cpu_us are
* in percentage.
*/
if (sysctl_sched_downmigrate_pct >
sysctl_sched_upmigrate_pct || *data > 100) {
*data = old_val;
ret = -EINVAL;
goto done;
}
if (sysctl_sched_downmigrate_pct > sysctl_sched_upmigrate_pct) {
*data = old_val;
ret = -EINVAL;
goto done;
}
/*

23
kernel/sysctl.c
View file

@ -130,6 +130,9 @@ static int one_hundred = 100;
#ifdef CONFIG_PRINTK
static int ten_thousand = 10000;
#endif
#ifdef CONFIG_SCHED_HMP
static int one_thousand = 1000;
#endif
/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
@ -336,6 +339,8 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_hmp_proc_update_handler,
.extra1 = &zero,
.extra2 = &one_hundred,
},
{
.procname = "sched_spill_nr_run",
@ -351,6 +356,8 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_hmp_proc_update_handler,
.extra1 = &zero,
.extra2 = &one_hundred,
},
{
.procname = "sched_downmigrate",
@ -358,6 +365,8 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_hmp_proc_update_handler,
.extra1 = &zero,
.extra2 = &one_hundred,
},
{
.procname = "sched_init_task_load",
@ -365,6 +374,8 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_hmp_proc_update_handler,
.extra1 = &zero,
.extra2 = &one_hundred,
},
{
.procname = "sched_select_prev_cpu_us",
@ -372,6 +383,7 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_hmp_proc_update_handler,
.extra1 = &zero,
},
{
.procname = "sched_enable_colocation",
@ -397,6 +409,8 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_hmp_proc_update_handler,
.extra1 = &zero,
.extra2 = &one_hundred,
},
{
.procname = "sched_big_waker_task_load",
@ -404,6 +418,8 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_hmp_proc_update_handler,
.extra1 = &zero,
.extra2 = &one_hundred,
},
{
.procname = "sched_enable_thread_grouping",
@ -440,6 +456,13 @@ static struct ctl_table kern_table[] = {
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_hmp_proc_update_handler,
.extra1 = &zero,
/*
* Special handling for sched_freq_aggregate_threshold_pct
* which can be greater than 100. Use 1000 as an upper bound
* value which works for all practical use cases.
*/
.extra2 = &one_thousand,
},
{
.procname = "sched_boost",