sched/core: Remove sd->*_idx

The sched domain per rq load index files also disappear from the
/proc/sys/kernel/sched_domain/cpuX/domainY directories.

Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Rik van Riel <riel@surriel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Morten Rasmussen <morten.rasmussen@arm.com>
Cc: Patrick Bellasi <patrick.bellasi@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Perret <quentin.perret@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Valentin Schneider <valentin.schneider@arm.com>
Cc: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lkml.kernel.org/r/20190527062116.11512-6-dietmar.eggemann@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --git a/include/linux/sched/topology.h b/include/linux/sched/topology.h
index cfc0a89a715981ac1d7765257077740930d2fa25..53afbe07354a450210c0c2a9530ed97ce949dc1b 100644 (file)
--- a/include/linux/sched/topology.h
+++ b/include/linux/sched/topology.h
@@ -84,11 +84,6 @@ struct sched_domain {
        unsigned int busy_factor;       /* less balancing by factor if busy */
        unsigned int imbalance_pct;     /* No balance until over watermark */
        unsigned int cache_nice_tries;  /* Leave cache hot tasks for # tries */
-       unsigned int busy_idx;
-       unsigned int idle_idx;
-       unsigned int newidle_idx;
-       unsigned int wake_idx;
-       unsigned int forkexec_idx;
 
        int nohz_idle;                  /* NOHZ IDLE status */
        int flags;                      /* See SD_* */

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index a0b0d6e21e5be2d37ca718c9adbba71beca65dd9..7ffde8ce82fd23bc88f5e15e802233248cc748d5 100644 (file)
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -251,25 +251,20 @@ set_table_entry(struct ctl_table *entry,
 static struct ctl_table *
 sd_alloc_ctl_domain_table(struct sched_domain *sd)
 {
-       struct ctl_table *table = sd_alloc_ctl_entry(14);
+       struct ctl_table *table = sd_alloc_ctl_entry(9);
 
        if (table == NULL)
                return NULL;
 
-       set_table_entry(&table[0],  "min_interval",        &sd->min_interval,        sizeof(long), 0644, proc_doulongvec_minmax);
-       set_table_entry(&table[1],  "max_interval",        &sd->max_interval,        sizeof(long), 0644, proc_doulongvec_minmax);
-       set_table_entry(&table[2],  "busy_idx",            &sd->busy_idx,            sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[3],  "idle_idx",            &sd->idle_idx,            sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[4],  "newidle_idx",         &sd->newidle_idx,         sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[5],  "wake_idx",            &sd->wake_idx,            sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[6],  "forkexec_idx",        &sd->forkexec_idx,        sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[7],  "busy_factor",         &sd->busy_factor,         sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[8],  "imbalance_pct",       &sd->imbalance_pct,       sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[9],  "cache_nice_tries",    &sd->cache_nice_tries,    sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[10], "flags",               &sd->flags,               sizeof(int),  0644, proc_dointvec_minmax);
-       set_table_entry(&table[11], "max_newidle_lb_cost", &sd->max_newidle_lb_cost, sizeof(long), 0644, proc_doulongvec_minmax);
-       set_table_entry(&table[12], "name",                sd->name,            CORENAME_MAX_SIZE, 0444, proc_dostring);
-       /* &table[13] is terminator */
+       set_table_entry(&table[0], "min_interval",        &sd->min_interval,        sizeof(long), 0644, proc_doulongvec_minmax);
+       set_table_entry(&table[1], "max_interval",        &sd->max_interval,        sizeof(long), 0644, proc_doulongvec_minmax);
+       set_table_entry(&table[2], "busy_factor",         &sd->busy_factor,         sizeof(int),  0644, proc_dointvec_minmax);
+       set_table_entry(&table[3], "imbalance_pct",       &sd->imbalance_pct,       sizeof(int),  0644, proc_dointvec_minmax);
+       set_table_entry(&table[4], "cache_nice_tries",    &sd->cache_nice_tries,    sizeof(int),  0644, proc_dointvec_minmax);
+       set_table_entry(&table[5], "flags",               &sd->flags,               sizeof(int),  0644, proc_dointvec_minmax);
+       set_table_entry(&table[6], "max_newidle_lb_cost", &sd->max_newidle_lb_cost, sizeof(long), 0644, proc_doulongvec_minmax);
+       set_table_entry(&table[7], "name",                sd->name,            CORENAME_MAX_SIZE, 0444, proc_dostring);
+       /* &table[8] is terminator */
 
        return table;
 }

diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c
index f53f89df837d84786635a302209e45f4cc72da85..63184cf0d0d7156a5c09deb68a91dae5f603e7ec 100644 (file)
--- a/kernel/sched/topology.c
+++ b/kernel/sched/topology.c
@@ -1344,11 +1344,6 @@ sd_init(struct sched_domain_topology_level *tl,
                .imbalance_pct          = 125,
 
                .cache_nice_tries       = 0,
-               .busy_idx               = 0,
-               .idle_idx               = 0,
-               .newidle_idx            = 0,
-               .wake_idx               = 0,
-               .forkexec_idx           = 0,
 
                .flags                  = 1*SD_LOAD_BALANCE
                                        | 1*SD_BALANCE_NEWIDLE
@@ -1400,13 +1395,10 @@ sd_init(struct sched_domain_topology_level *tl,
        } else if (sd->flags & SD_SHARE_PKG_RESOURCES) {
                sd->imbalance_pct = 117;
                sd->cache_nice_tries = 1;
-               sd->busy_idx = 2;
 
 #ifdef CONFIG_NUMA
        } else if (sd->flags & SD_NUMA) {
                sd->cache_nice_tries = 2;
-               sd->busy_idx = 3;
-               sd->idle_idx = 2;
 
                sd->flags &= ~SD_PREFER_SIBLING;
                sd->flags |= SD_SERIALIZE;
@@ -1419,8 +1411,6 @@ sd_init(struct sched_domain_topology_level *tl,
 #endif
        } else {
                sd->cache_nice_tries = 1;
-               sd->busy_idx = 2;
-               sd->idle_idx = 1;
        }
 
        /*