scheduler fixes
Subsystems (3)
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus
# HEAD: e284df705cf1eeedb5ec3a66ed82d17a64659150 sched/topology: Allow sched_asym_cpucapacity to be disabled
Fix two scheduler topology bugs/oversights on Juno r0 2+4 big.LITTLE systems.
Thanks,
Ingo
------------------>
Valentin Schneider (2):
sched/topology: Don't try to build empty sched domains sched/topology: Allow sched_asym_cpucapacity to be disabled
kernel/cgroup/cpuset.c | 3 ++- kernel/sched/topology.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)
kernel/cgroup/cpuset.c +2 -1
@@ -798,7 +798,8 @@ static int generate_sched_domains(cpumask_var_t **domains, cpumask_subset(cp->cpus_allowed, top_cpuset.effective_cpus)) continue; -if (is_sched_load_balance (cp)) +if (is_sched_load_balance (cp) && + !cpumask_empty (cp->effective_cpus)) csa[csn++] = cp;/* skip @cp's subtree if not a partition root */
kernel/sched/topology.c +9 -2
@@ -1948,7 +1948,7 @@ static struct sched_domain_topology_levelstatic int build_sched_domains (const struct cpumask *cpu_map,struct sched_domain_attr *attr) { -enum s_alloc alloc_state; +enum s_alloc alloc_state = sa_none;struct sched_domain *sd;struct s_data d;struct rq *rq =NULL ;
@@ -1956,6 +1956,9 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *attstruct sched_domain_topology_level *tl_asym;bool has_asym = false; +if (WARN_ON (cpumask_empty (cpu_map))) + goto error; + alloc_state =__visit_domain_allocation_hell (&d, cpu_map);if (alloc_state != sa_rootdomain) goto error;
@@ -2026,7 +2029,7 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *attrcu_read_unlock ();if (has_asym) -static_branch_enable_cpuslocked (&sched_asym_cpucapacity); +static_branch_inc_cpuslocked (&sched_asym_cpucapacity);if (rq && sched_debug_enabled) { pr_info("root domain span: %*pbl (max cpu_capacity = %lu)\n",
@@ -2121,8 +2124,12 @@ int sched_init_domains(const struct cpumask *cpu_map)*/ static void detach_destroy_domains (const struct cpumask *cpu_map) { +unsigned int cpu =cpumask_any (cpu_map);int i; +if (rcu_access_pointer (per_cpu (sd_asym_cpucapacity, cpu))) +static_branch_dec_cpuslocked (&sched_asym_cpucapacity); +rcu_read_lock ();for_each_cpu (i, cpu_map)cpu_attach_domain (NULL , &def_root_domain, i);
The pull request you sent on Fri, 1 Nov 2019 18:55:08 +0100:
The pull request you sent on Fri, 1 Nov 2019 18:55:08 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitsched-urgent-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0dbe6cb8f7e05bc9611602ef45980a6c57b245a3
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker
Hi,
Quoted 11 lines · Ingo Molnar
Linus,
Please pull the latest sched-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched-urgent-for-linus # HEAD: e284df705cf1eeedb5ec3a66ed82d17a64659150 sched/topology: Allow sched_asym_cpucapacity to be disabledFix two scheduler topology bugs/oversights on Juno r0 2+4 big.LITTLE systems.
I was hoping to fix this up before the PR got out, but as I've been traveling that didn't happen. FWIW Michal spotted that the empty cpumask fix is not complete, it also needs to check against the housekeeping cpumask. I've done that at [email protected].
Sorry about that,
Valentin
Quoted 74 lines
Thanks,
Ingo
------------------>
Valentin Schneider (2):
sched/topology: Don't try to build empty sched domains sched/topology: Allowsched_asym_cpucapacityto be disabledkernel/cgroup/cpuset.c | 3 ++- kernel/sched/topology.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)kernel/cgroup/cpuset.c +2
-1@@ -798,7 +798,8 @@ static int generate_sched_domains(cpumask_var_t **domains, cpumask_subset(cp->cpus_allowed, top_cpuset.effective_cpus)) continue; -if (is_sched_load_balance (cp)) +if (is_sched_load_balance (cp) && + !cpumask_empty (cp->effective_cpus)) csa[csn++] = cp;/* skip @cp's subtree if not a partition root */ kernel/sched/topology.c +9
-2@@ -1948,7 +1948,7 @@ static struct sched_domain_topology_levelstatic int build_sched_domains (const struct cpumask *cpu_map,struct sched_domain_attr *attr) { -enum s_alloc alloc_state; +enum s_alloc alloc_state = sa_none;struct sched_domain *sd;struct s_data d;struct rq *rq =NULL ;@@ -1956,6 +1956,9 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *attstruct sched_domain_topology_level *tl_asym;bool has_asym = false; +if (WARN_ON (cpumask_empty (cpu_map))) + goto error; + alloc_state =__visit_domain_allocation_hell (&d, cpu_map);if (alloc_state != sa_rootdomain) goto error;@@ -2026,7 +2029,7 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *attrcu_read_unlock ();if (has_asym) -static_branch_enable_cpuslocked (&sched_asym_cpucapacity); +static_branch_inc_cpuslocked (&sched_asym_cpucapacity);if (rq && sched_debug_enabled) { pr_info("root domain span: %*pbl (max cpu_capacity = %lu)\n",@@ -2121,8 +2124,12 @@ int sched_init_domains(const struct cpumask *cpu_map)*/ static void detach_destroy_domains (const struct cpumask *cpu_map) { +unsigned int cpu =cpumask_any (cpu_map);int i; +if (rcu_access_pointer (per_cpu (sd_asym_cpucapacity, cpu))) +static_branch_dec_cpuslocked (&sched_asym_cpucapacity); +rcu_read_lock ();for_each_cpu (i, cpu_map)cpu_attach_domain (NULL , &def_root_domain, i);