diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-18 23:48:38 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-18 23:48:38 -0800 |
| commit | fbbaeb656aa52d5a18e947c5b3611ff849f363d1 (patch) | |
| tree | 2f93be0cfb66c4787a9f5129cc556eeaa0c2b427 | |
| parent | 3d4b6ca81878a5e086b6b391564df1a99e1d9afc (diff) | |
| parent | e7dd50fa46d3e1397da7ef880c8d411a7839b566 (diff) | |
Merge "sched: hmp: Remove the global sysctl_sched_enable_colocation tunable"
| -rw-r--r-- | include/linux/sched/sysctl.h | 1 | ||||
| -rw-r--r-- | kernel/sched/hmp.c | 16 | ||||
| -rw-r--r-- | kernel/sysctl.c | 9 |
3 files changed, 3 insertions, 23 deletions
diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h index f7aeb14f4d63..418eb97110a3 100644 --- a/include/linux/sched/sysctl.h +++ b/include/linux/sched/sysctl.h @@ -63,7 +63,6 @@ extern unsigned int sysctl_sched_boost; extern unsigned int sysctl_sched_small_wakee_task_load_pct; extern unsigned int sysctl_sched_big_waker_task_load_pct; extern unsigned int sysctl_sched_select_prev_cpu_us; -extern unsigned int sysctl_sched_enable_colocation; extern unsigned int sysctl_sched_restrict_cluster_spill; extern unsigned int sysctl_sched_new_task_windows; extern unsigned int sysctl_sched_pred_alert_freq; diff --git a/kernel/sched/hmp.c b/kernel/sched/hmp.c index 443f16732414..e28f2b424643 100644 --- a/kernel/sched/hmp.c +++ b/kernel/sched/hmp.c @@ -718,8 +718,6 @@ __read_mostly unsigned int sysctl_sched_window_stats_policy = __read_mostly unsigned int sysctl_sched_cpu_high_irqload = (10 * NSEC_PER_MSEC); -unsigned int __read_mostly sysctl_sched_enable_colocation = 1; - /* * Enable colocation and frequency aggregation for all threads in a process. * The children inherits the group id from the parent. @@ -1292,14 +1290,12 @@ void reset_hmp_stats(struct hmp_sched_stats *stats, int reset_cra) int preferred_cluster(struct sched_cluster *cluster, struct task_struct *p) { struct related_thread_group *grp; - int rc = 0; + int rc = 1; rcu_read_lock(); grp = task_related_thread_group(p); - if (!grp || !sysctl_sched_enable_colocation) - rc = 1; - else + if (grp) rc = (grp->preferred_cluster == cluster); rcu_read_unlock(); @@ -3751,7 +3747,7 @@ static struct sched_cluster *best_cluster(struct related_thread_group *grp, return cluster; } - return NULL; + return sched_cluster[0]; } static void _set_preferred_cluster(struct related_thread_group *grp) @@ -3762,12 +3758,6 @@ static void _set_preferred_cluster(struct related_thread_group *grp) bool group_boost = false; u64 wallclock; - if (!sysctl_sched_enable_colocation) { - grp->last_update = sched_ktime_clock(); - grp->preferred_cluster = NULL; - return; - } - if (list_empty(&grp->tasks)) return; diff --git a/kernel/sysctl.c b/kernel/sysctl.c index eced92aa492a..d3873333c766 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -404,15 +404,6 @@ static struct ctl_table kern_table[] = { .extra1 = &zero, }, { - .procname = "sched_enable_colocation", - .data = &sysctl_sched_enable_colocation, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec, - .extra1 = &zero, - .extra2 = &one, - }, - { .procname = "sched_restrict_cluster_spill", .data = &sysctl_sched_restrict_cluster_spill, .maxlen = sizeof(unsigned int), |