Whenever CPU hotplug state callbacks are registered (cpuhp_setup_state),
the startup callback is invoked on CPUs that have already reached the
provided state in order of ascending CPU id. For symmetry, we change
freeze_secondary_cpus to iterate through the CPUs in opposite order,
so that the teardown callback invocations happen in order of descending
CPU id.
One case where this is known to make a difference is the current
implementation of these callbacks in arch/x86/events/intel/uncore.c:
- uncore_event_cpu_online: designates the first CPU it is invoked for
on each package as the uncore event collector for that package
- uncore_event_cpu_offline: if the CPU being offlined is the event
collector for its package, transfers that responsibility over to
the next (by ascending CPU id) one in the same package
Without reversing the order of teardowns in freeze_secondary_cpus, the
latter ends up doing the ownership transfer work on every single CPU.
That work involves a synchronize_rcu call (in perf_pmu_migrate_context),
ultimately unnecessarily degrading the performance of the CPU offlining.
Signed-off-by: Stanislav Spassov <[email protected]>
---
kernel/cpu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/kernel/cpu.c b/kernel/cpu.c
index cc4a8068747c..aaa8b7d5f93e 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1942,7 +1942,10 @@ int freeze_secondary_cpus(int primary)
cpumask_clear(frozen_cpus);
pr_info("Disabling non-boot CPUs ...\n");
- for_each_online_cpu(cpu) {
+ for (cpu = nr_cpu_ids - 1; cpu >= 0; cpu--) {
+ if (!cpu_online(cpu))
+ continue;
+
if (cpu == primary)
continue;
base-commit: 266e95786452d97f42dcb9a881bba223584b9648
--
2.40.1
Amazon Web Services Development Center Germany GmbH
Krausenstr. 38
10117 Berlin
Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss
Eingetragen am Amtsgericht Charlottenburg unter HRB 257764 B
Sitz: Berlin
Ust-ID: DE 365 538 597