sched/topology: Allow sched_asym_cpucapacity to be disabled
Subsystems (2)
PATCH v2 1/1 sched/topology: Allow sched_asym_cpucapacity to be disabled
While the static key is correctly initialized as being disabled, it will remain forever enabled once turned on. This means that if we start with an asymmetric system and hotplug out enough CPUs to end up with an SMP system, the static key will remain set - which is obviously wrong. We should detect this and turn off things like misfit migration and capacity aware wakeups.
As Quentin pointed out, having separate root domains makes this slightly trickier. We could have exclusive cpusets that create an SMP island - IOW, the domains within this root domain will not see any asymmetry. This means we need to count how many asymmetric root domains we have.
Change the simple key enablement to an increment, and decrement the key counter when destroying domains that cover asymmetric CPUs.
---
Changes since v1:
Use static_branch_{inc,dec} rather than enable/disable
--- kernel/sched/topology.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
kernel/sched/topology.c +10 -1
@@ -2026,7 +2026,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",
@@ -2124,8 +2124,17 @@ static void detach_destroy_domains(const struct cpumask *cpu_map)int i;rcu_read_lock (); + +if (static_key_enabled (&sched_asym_cpucapacity)) { +unsigned int cpu =cpumask_any (cpu_map); + +if (rcu_dereference (per_cpu (sd_asym_cpucapacity, cpu))) +static_branch_dec_cpuslocked (&sched_asym_cpucapacity); + } +for_each_cpu (i, cpu_map)cpu_attach_domain (NULL , &def_root_domain, i); +rcu_read_unlock (); }
Signature · 1 line
2.22.0
Quoted 39 lines · Valentin Schneider
While the static key is correctly initialized as being disabled, it will remain forever enabled once turned on. This means that if we start with an asymmetric system and hotplug out enough CPUs to end up with an SMP system, the static key will remain set - which is obviously wrong. We should detect this and turn off things like misfit migration and capacity aware wakeups.
As Quentin pointed out, having separate root domains makes this slightly trickier. We could have exclusive cpusets that create an SMP island - IOW, the domains within this root domain will not see any asymmetry. This means we need to count how many asymmetric root domains we have.
Change the simple key enablement to an increment, and decrement the key counter when destroying domains that cover asymmetric CPUs.
Cc <[email protected]>Fixes df054e8445a4 ("sched/topology: Add static_key for asymmetric CPU capacity optimizations")Signed-off-by Valentin Schneider <[email protected]>---
Changes since v1:Use static_branch_{inc,dec} rather than enable/disable
--- kernel/sched/topology.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)kernel/sched/topology.c +1
-1@@ -2026,7 +2026,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",
kernel/sched/topology.c static void detach_destroy_domains(const struct cpumask *cpu_map) · line 2132
Quoted 9 lines
kernel/sched/topology.c +6
-0@@ -2124,8 +2124,17 @@ static void detach_destroy_domains(const struct cpumask *cpu_map)int i;rcu_read_lock (); + +if (static_key_enabled (&sched_asym_cpucapacity)) { +unsigned int cpu =cpumask_any (cpu_map); + +if (rcu_dereference (per_cpu (sd_asym_cpucapacity, cpu))) +static_branch_dec_cpuslocked (&sched_asym_cpucapacity);
Lockdep should scream for this :)
Quoted 11 lines
kernel/sched/topology.c +3
-0+ } +for_each_cpu (i, cpu_map)cpu_attach_domain (NULL , &def_root_domain, i); +rcu_read_unlock (); }Signature · 1 line
2.22.0
Quoted 12 lines · Quentin Perret
kernel/sched/topology.c static void detach_destroy_domains(const struct cpumask *cpu_map) · line 2132
Quoted 10 lines
kernel/sched/topology.c +6
-0@@ -2124,8 +2124,17 @@ static void detach_destroy_domains(const struct cpumask *cpu_map)int i;rcu_read_lock (); + +if (static_key_enabled (&sched_asym_cpucapacity)) { +unsigned int cpu =cpumask_any (cpu_map); + +if (rcu_dereference (per_cpu (sd_asym_cpucapacity, cpu))) +static_branch_dec_cpuslocked (&sched_asym_cpucapacity);Lockdep should scream for this :)
Bleh, yes indeed...
Quoted 11 lines
Quoted 11 lines
kernel/sched/topology.c +3
-0+ } +for_each_cpu (i, cpu_map)cpu_attach_domain (NULL , &def_root_domain, i); +rcu_read_unlock (); }Signature · 1 line
2.22.0
Quoted 14 lines · Valentin Schneider
Quoted 12 lines · Quentin Perret
kernel/sched/topology.c static void detach_destroy_domains(const struct cpumask *cpu_map) · line 2132
Quoted 10 lines
kernel/sched/topology.c +6
-0@@ -2124,8 +2124,17 @@ static void detach_destroy_domains(const struct cpumask *cpu_map)int i;rcu_read_lock (); + +if (static_key_enabled (&sched_asym_cpucapacity)) { +unsigned int cpu =cpumask_any (cpu_map); + +if (rcu_dereference (per_cpu (sd_asym_cpucapacity, cpu))) +static_branch_dec_cpuslocked (&sched_asym_cpucapacity);Lockdep should scream for this :)
Quoted 2 lines
Bleh, yes indeed...
Urgh, I forgot about the funny hotplug lock scenario at boot time. rebuild_sched_domains() takes the lock but sched_init_domains() doesn't, so we don't get the might_sleep warn at boot time.
So if we want to flip the key post boot time we probably need to separately count our asymmetric root domains and flip the key after all the rebuilds, outside of the hotplug lock.
Quoted 20 lines · Valentin Schneider
Quoted 14 lines · Valentin Schneider
Quoted 12 lines · Quentin Perret
kernel/sched/topology.c static void detach_destroy_domains(const struct cpumask *cpu_map) · line 2132
Quoted 10 lines
kernel/sched/topology.c +6
-0@@ -2124,8 +2124,17 @@ static void detach_destroy_domains(const struct cpumask *cpu_map)int i;rcu_read_lock (); + +if (static_key_enabled (&sched_asym_cpucapacity)) { +unsigned int cpu =cpumask_any (cpu_map); + +if (rcu_dereference (per_cpu (sd_asym_cpucapacity, cpu))) +static_branch_dec_cpuslocked (&sched_asym_cpucapacity);Lockdep should scream for this :)
Quoted 2 lines
Bleh, yes indeed...
Quoted 7 lines
Urgh, I forgot about the funny hotplug lock scenario at boot time.
rebuild_sched_domains()takes the lock butsched_init_domains()doesn't, so we don't get themight_sleepwarn at boot time.So if we want to flip the key post boot time we probably need to separately count our asymmetric root domains and flip the key after all the rebuilds, outside of the hotplug lock.
Hmm, a problem here is that static_branch*() can block (it uses a mutex) while you're in the rcu section, I think.
I suppose you could just move this above rcu_read_lock() and use rcu_access_pointer() instead ?
Thanks,
Quentin
Quoted 6 lines · Quentin Perret
Hmm, a problem here is that static_branch*() can block (it uses a mutex) while you're in the rcu section, I think.
I suppose you could just move this above
rcu_read_lock()and usercu_access_pointer()instead ?
Right, I got confused again, the only problem is with the rcu_read_lock(), so the increment is fine but the decrement isn't.
Let me try this again with more coffee.
Quoted 3 lines
Thanks,
Quentin