timers/migration: Exclude isolated cpus from hierarchy

The timer migration mechanism allows active CPUs to pull timers from
idle ones to improve the overall idle time. This is however undesired
when CPU intensive workloads run on isolated cores, as the algorithm
would move the timers from housekeeping to isolated cores, negatively
affecting the isolation.

Exclude isolated cores from the timer migration algorithm, extend the
concept of unavailable cores, currently used for offline ones, to
isolated ones:
* A core is unavailable if isolated or offline;
* A core is available if non isolated and online;

A core is considered unavailable as isolated if it belongs to:
* the isolcpus (domain) list
* an isolated cpuset
Except if it is:
* in the nohz_full list (already idle for the hierarchy)
* the nohz timekeeper core (must be available to handle global timers)

CPUs are added to the hierarchy during late boot, excluding isolated
ones, the hierarchy is also adapted when the cpuset isolation changes.

Due to how the timer migration algorithm works, any CPU part of the
hierarchy can have their global timers pulled by remote CPUs and have to
pull remote timers, only skipping pulling remote timers would break the
logic.
For this reason, prevent isolated CPUs from pulling remote global
timers, but also the other way around: any global timer started on an
isolated CPU will run there. This does not break the concept of
isolation (global timers don't come from outside the CPU) and, if
considered inappropriate, can usually be mitigated with other isolation
techniques (e.g. IRQ pinning).

This effect was noticed on a 128 cores machine running oslat on the
isolated cores (1-31,33-63,65-95,97-127). The tool monopolises CPUs,
and the CPU with lowest count in a timer migration hierarchy (here 1
and 65) appears as always active and continuously pulls global timers,
from the housekeeping CPUs. This ends up moving driver work (e.g.
delayed work) to isolated CPUs and causes latency spikes:

before the change:

 # oslat -c 1-31,33-63,65-95,97-127 -D 62s
 ...
  Maximum:     1203 10 3 4 ... 5 (us)

after the change:

 # oslat -c 1-31,33-63,65-95,97-127 -D 62s
 ...
  Maximum:      10 4 3 4 3 ... 5 (us)

The same behaviour was observed on a machine with as few as 20 cores /
40 threads with isocpus set to: 1-9,11-39 with rtla-osnoise-top.

Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: John B. Wyatt IV <jwyatt@redhat.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Frederic Weisbecker <frederic@kernel.org>
Link: https://patch.msgid.link/20251120145653.296659-8-gmonaco@redhat.com

diff --git a/include/linux/timer.h b/include/linux/timer.h
index 0414d9e6b4fcd5cf41d99de50549693810b9b0d9..62e1cea711257e01ed2cd5e2351bff3c0090ccde 100644 (file)
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -188,4 +188,13 @@ int timers_dead_cpu(unsigned int cpu);
 #define timers_dead_cpu                NULL
 #endif
 
+#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
+extern int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_cpumask);
+#else
+static inline int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_cpumask)
+{
+       return 0;
+}
+#endif
+
 #endif

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index cf34623fe66f26925480929de085e06850fe7746..bfc3b319e1c00cf86e1994640ecce04f064a1555 100644 (file)
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -1350,6 +1350,9 @@ static void update_isolation_cpumasks(bool isolcpus_updated)
 
        ret = workqueue_unbound_exclude_cpumask(isolated_cpus);
        WARN_ON_ONCE(ret < 0);
+
+       ret = tmigr_isolated_exclude_cpumask(isolated_cpus);
+       WARN_ON_ONCE(ret < 0);
 }
 
 /**

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index a01c7f8bdf52144471c8e20c58d5421c182a19b3..18dda1aa782d50780c7af32f5c5873f1c1dafab1 100644 (file)
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -10,6 +10,7 @@
 #include <linux/spinlock.h>
 #include <linux/timerqueue.h>
 #include <trace/events/ipi.h>
+#include <linux/sched/isolation.h>
 
 #include "timer_migration.h"
 #include "tick-internal.h"
@@ -427,8 +428,13 @@ static DEFINE_PER_CPU(struct tmigr_cpu, tmigr_cpu);
 /*
  * CPUs available for timer migration.
  * Protected by cpuset_mutex (with cpus_read_lock held) or cpus_write_lock.
+ * Additionally tmigr_available_mutex serializes set/clear operations with each other.
  */
 static cpumask_var_t tmigr_available_cpumask;
+static DEFINE_MUTEX(tmigr_available_mutex);
+
+/* Enabled during late initcall */
+static DEFINE_STATIC_KEY_FALSE(tmigr_exclude_isolated);
 
 #define TMIGR_NONE     0xFF
 #define BIT_CNT                8
@@ -438,6 +444,33 @@ static inline bool tmigr_is_not_available(struct tmigr_cpu *tmc)
        return !(tmc->tmgroup && tmc->available);
 }
 
+/*
+ * Returns true if @cpu should be excluded from the hierarchy as isolated.
+ * Domain isolated CPUs don't participate in timer migration, nohz_full CPUs
+ * are still part of the hierarchy but become idle (from a tick and timer
+ * migration perspective) when they stop their tick. This lets the timekeeping
+ * CPU handle their global timers. Marking also isolated CPUs as idle would be
+ * too costly, hence they are completely excluded from the hierarchy.
+ * This check is necessary, for instance, to prevent offline isolated CPUs from
+ * being incorrectly marked as available once getting back online.
+ *
+ * This function returns false during early boot and the isolation logic is
+ * enabled only after isolated CPUs are marked as unavailable at late boot.
+ * The tick CPU can be isolated at boot, however we cannot mark it as
+ * unavailable to avoid having no global migrator for the nohz_full CPUs. This
+ * should be ensured by the callers of this function: implicitly from hotplug
+ * callbacks and explicitly in tmigr_init_isolation() and
+ * tmigr_isolated_exclude_cpumask().
+ */
+static inline bool tmigr_is_isolated(int cpu)
+{
+       if (!static_branch_unlikely(&tmigr_exclude_isolated))
+               return false;
+       return (!housekeeping_cpu(cpu, HK_TYPE_DOMAIN) ||
+               cpuset_cpu_is_isolated(cpu)) &&
+              housekeeping_cpu(cpu, HK_TYPE_KERNEL_NOISE);
+}
+
 /*
  * Returns true, when @childmask corresponds to the group migrator or when the
  * group is not active - so no migrator is set.
@@ -1439,8 +1472,12 @@ static int tmigr_clear_cpu_available(unsigned int cpu)
        int migrator;
        u64 firstexp;
 
+       guard(mutex)(&tmigr_available_mutex);
+
        cpumask_clear_cpu(cpu, tmigr_available_cpumask);
        scoped_guard(raw_spinlock_irq, &tmc->lock) {
+               if (!tmc->available)
+                       return 0;
                tmc->available = false;
                WRITE_ONCE(tmc->wakeup, KTIME_MAX);
 
@@ -1468,8 +1505,15 @@ static int tmigr_set_cpu_available(unsigned int cpu)
        if (WARN_ON_ONCE(!tmc->tmgroup))
                return -EINVAL;
 
+       if (tmigr_is_isolated(cpu))
+               return 0;
+
+       guard(mutex)(&tmigr_available_mutex);
+
        cpumask_set_cpu(cpu, tmigr_available_cpumask);
        scoped_guard(raw_spinlock_irq, &tmc->lock) {
+               if (tmc->available)
+                       return 0;
                trace_tmigr_cpu_available(tmc);
                tmc->idle = timer_base_is_idle();
                if (!tmc->idle)
@@ -1479,6 +1523,105 @@ static int tmigr_set_cpu_available(unsigned int cpu)
        return 0;
 }
 
+static void tmigr_cpu_isolate(struct work_struct *ignored)
+{
+       tmigr_clear_cpu_available(smp_processor_id());
+}
+
+static void tmigr_cpu_unisolate(struct work_struct *ignored)
+{
+       tmigr_set_cpu_available(smp_processor_id());
+}
+
+/**
+ * tmigr_isolated_exclude_cpumask - Exclude given CPUs from hierarchy
+ * @exclude_cpumask: the cpumask to be excluded from timer migration hierarchy
+ *
+ * This function can be called from cpuset code to provide the new set of
+ * isolated CPUs that should be excluded from the hierarchy.
+ * Online CPUs not present in exclude_cpumask but already excluded are brought
+ * back to the hierarchy.
+ * Functions to isolate/unisolate need to be called locally and can sleep.
+ */
+int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_cpumask)
+{
+       struct work_struct __percpu *works __free(free_percpu) =
+               alloc_percpu(struct work_struct);
+       cpumask_var_t cpumask __free(free_cpumask_var) = CPUMASK_VAR_NULL;
+       int cpu;
+
+       lockdep_assert_cpus_held();
+
+       if (!works)
+               return -ENOMEM;
+       if (!alloc_cpumask_var(&cpumask, GFP_KERNEL))
+               return -ENOMEM;
+
+       /*
+        * First set previously isolated CPUs as available (unisolate).
+        * This cpumask contains only CPUs that switched to available now.
+        */
+       cpumask_andnot(cpumask, cpu_online_mask, exclude_cpumask);
+       cpumask_andnot(cpumask, cpumask, tmigr_available_cpumask);
+
+       for_each_cpu(cpu, cpumask) {
+               struct work_struct *work = per_cpu_ptr(works, cpu);
+
+               INIT_WORK(work, tmigr_cpu_unisolate);
+               schedule_work_on(cpu, work);
+       }
+       for_each_cpu(cpu, cpumask)
+               flush_work(per_cpu_ptr(works, cpu));
+
+       /*
+        * Then clear previously available CPUs (isolate).
+        * This cpumask contains only CPUs that switched to not available now.
+        * There cannot be overlap with the newly available ones.
+        */
+       cpumask_and(cpumask, exclude_cpumask, tmigr_available_cpumask);
+       cpumask_and(cpumask, cpumask, housekeeping_cpumask(HK_TYPE_KERNEL_NOISE));
+       /*
+        * Handle this here and not in the cpuset code because exclude_cpumask
+        * might include also the tick CPU if included in isolcpus.
+        */
+       for_each_cpu(cpu, cpumask) {
+               if (!tick_nohz_cpu_hotpluggable(cpu)) {
+                       cpumask_clear_cpu(cpu, cpumask);
+                       break;
+               }
+       }
+
+       for_each_cpu(cpu, cpumask) {
+               struct work_struct *work = per_cpu_ptr(works, cpu);
+
+               INIT_WORK(work, tmigr_cpu_isolate);
+               schedule_work_on(cpu, work);
+       }
+       for_each_cpu(cpu, cpumask)
+               flush_work(per_cpu_ptr(works, cpu));
+
+       return 0;
+}
+
+static int __init tmigr_init_isolation(void)
+{
+       cpumask_var_t cpumask __free(free_cpumask_var) = CPUMASK_VAR_NULL;
+
+       static_branch_enable(&tmigr_exclude_isolated);
+
+       if (!housekeeping_enabled(HK_TYPE_DOMAIN))
+               return 0;
+       if (!alloc_cpumask_var(&cpumask, GFP_KERNEL))
+               return -ENOMEM;
+
+       cpumask_andnot(cpumask, cpu_possible_mask, housekeeping_cpumask(HK_TYPE_DOMAIN));
+
+       /* Protect against RCU torture hotplug testing */
+       guard(cpus_read_lock)();
+       return tmigr_isolated_exclude_cpumask(cpumask);
+}
+late_initcall(tmigr_init_isolation);
+
 static void tmigr_init_group(struct tmigr_group *group, unsigned int lvl,
                             int node)
 {