[PATCH-next 1/3] tick/sched: Make tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask consistent

From: Waiman Long

Date: Fri Nov 20 2026 - 22:14:28 EST


When the nohz_full boot parameter is first set, the cpu list parameter is
passed directly to tick_nohz_full_setup() to set up tick_nohz_full_mask
cpumask. Then the HK_TYPE_KERNEL_NOISE cpumask will be set up as the
inverse of given cpu list parameter. Some of the timer code and RCU
uses tick_nohz_full_mask directly while other timer code, scheduler
and other subsystems use the HK_TYPE_KERNEL_NOISE cpumask.

There are two problems that can cause inconsistency between
tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask. First of all,
if there are more than one nohz_full boot parameters in the boot
command line, only the first one is passed to tick_nohz_full_setup()
while the setting of HK_TYPE_KERNEL_NOISE cpumask is controlled by
the last nohz_full parameter.

Secondly, with CONFIG_PM_SLEEP_SMP && !CONFIG_PM_SLEEP_SMP_NONZERO_CPU
config options, the boot CPU will be cleared from tick_nohz_full_mask if
set while the corresponding HK_TYPE_KERNEL_NOISE cpumask isn't touched.
The nohz_full entry in kernel-parameters.txt does state that the boot
CPU will be forced outside the range to maintain the timekeeping. So it
makes sense that the HK_TYPE_KERNEL_NOISE should be modified accordingly.

PM_SLEEP_SMP_NONZERO_CPU depends on ARCH_SUSPEND_NONZERO_CPU which can
only be set for the PowerPC architecture. Moreover CONFIG_PM_SLEEP_SMP is
on by default, it means most kernels will not allow CPU 0 to be set in
the tick_nohz_full_mask and hence should be set in HK_TYPE_KERNEL_NOISE
cpumask.

The first inconsistency problem is fixed by calling tick_nohz_full_setup()
every time a nohz_full parameter is hit with tick_nohz_full_setup()
modified to allow multiple calls. The second problem is fixed by adding
a new cpumask_set_cpu() init function to be called by tick_nohz_init()
when the boot CPU is cleared from tick_nohz_full_mask.

Fixes: 6010d245ddc9 ("sched/isolation: Consolidate housekeeping cpumasks that are always identical")
Fixes: 6f1982fedd59 ("sched/isolation: Handle the nohz_full= parameter")
Signed-off-by: Waiman Long <longman@xxxxxxxxxx>
---
include/linux/sched/isolation.h | 2 ++
kernel/sched/isolation.c | 14 +++++++++++++-
kernel/time/tick-sched.c | 8 ++++++--
3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h
index cf0fd03dd7a2..ae5109450ac9 100644
--- a/include/linux/sched/isolation.h
+++ b/include/linux/sched/isolation.h
@@ -44,6 +44,7 @@ extern bool housekeeping_enabled(enum hk_type type);
extern void housekeeping_affine(struct task_struct *t, enum hk_type type);
extern bool housekeeping_test_cpu(int cpu, enum hk_type type);
extern int housekeeping_update(struct cpumask *isol_mask);
+extern void __init housekeeping_set_cpu(int cpu, enum hk_type type);
extern void __init housekeeping_init(void);

#else
@@ -72,6 +73,7 @@ static inline bool housekeeping_test_cpu(int cpu, enum hk_type type)
}

static inline int housekeeping_update(struct cpumask *isol_mask) { return 0; }
+static inline void housekeeping_set_cpu(int cpu, enum hk_type type) { }
static inline void housekeeping_init(void) { }
#endif /* CONFIG_CPU_ISOLATION */

diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c
index 156025ef81b7..18b50c0d807a 100644
--- a/kernel/sched/isolation.c
+++ b/kernel/sched/isolation.c
@@ -120,6 +120,18 @@ bool housekeeping_test_cpu(int cpu, enum hk_type type)
}
EXPORT_SYMBOL_GPL(housekeeping_test_cpu);

+void __init housekeeping_set_cpu(int cpu, enum hk_type type)
+{
+ /* Only CPU setting of HK_TYPE_KERNEL_NOISE is currently supported */
+ if (type != HK_TYPE_KERNEL_NOISE)
+ return;
+
+ if (static_branch_unlikely(&housekeeping_overridden) &&
+ READ_ONCE(housekeeping.flags) & BIT(type))
+ cpumask_set_cpu(cpu, housekeeping.cpumasks[type]);
+}
+EXPORT_SYMBOL_GPL(housekeeping_set_cpu);
+
int housekeeping_update(struct cpumask *isol_mask)
{
struct cpumask *trial, *old = NULL;
@@ -301,7 +313,7 @@ static int __init housekeeping_setup(char *str, unsigned long flags)
housekeeping_setup_type(type, housekeeping_staging);
}

- if ((flags & HK_FLAG_KERNEL_NOISE) && !(housekeeping.flags & HK_FLAG_KERNEL_NOISE))
+ if (flags & HK_FLAG_KERNEL_NOISE)
tick_nohz_full_setup(non_housekeeping_mask);

housekeeping.flags |= flags;
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index 255488366d7c..a4dbb154242f 100644
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -22,6 +22,7 @@
#include <linux/sched/stat.h>
#include <linux/sched/nohz.h>
#include <linux/sched/loadavg.h>
+#include <linux/sched/isolation.h>
#include <linux/module.h>
#include <linux/irq_work.h>
#include <linux/posix-timers.h>
@@ -634,9 +635,11 @@ void __tick_nohz_task_switch(void)
/* Get the boot-time nohz CPU list from the kernel parameters. */
void __init tick_nohz_full_setup(cpumask_var_t cpumask)
{
- alloc_bootmem_cpumask_var(&tick_nohz_full_mask);
+ if (!tick_nohz_full_running) {
+ alloc_bootmem_cpumask_var(&tick_nohz_full_mask);
+ tick_nohz_full_running = true;
+ }
cpumask_copy(tick_nohz_full_mask, cpumask);
- tick_nohz_full_running = true;
}

bool tick_nohz_cpu_hotpluggable(unsigned int cpu)
@@ -683,6 +686,7 @@ void __init tick_nohz_init(void)
pr_warn("NO_HZ: Clearing %d from nohz_full range "
"for timekeeping\n", cpu);
cpumask_clear_cpu(cpu, tick_nohz_full_mask);
+ housekeeping_set_cpu(cpu, HK_TYPE_KERNEL_NOISE);
}
}

--
2.56.1