* [PATCH-next 1/3] tick/sched: Make tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask consistent
2026-11-21 3:13 [PATCH-next 0/3] Skip boot CPU or don't allow it from being used in isolcpus and isolated partitions Waiman Long
@ 2026-11-21 3:13 ` Waiman Long
2026-11-21 10:01 ` kernel test robot
2026-11-21 3:13 ` [PATCH-next 2/3] sched/isolation: Forbid the boot CPU from being isolated Waiman Long
2026-11-21 3:13 ` [PATCH-next 3/3] cgroup/cpuset: Disallow CPU 0 from being used in isolated partition Waiman Long
2 siblings, 1 reply; 5+ messages in thread
From: Waiman Long @ 2026-11-21 3:13 UTC (permalink / raw)
To: Tejun Heo, Johannes Weiner, Michal Koutný, Jonathan Corbet,
Shuah Khan, Randy Dunlap, Ridong Chen, Ingo Molnar,
Peter Zijlstra, Juri Lelli, Vincent Guittot, Dietmar Eggemann,
Steven Rostedt, Ben Segall, Mel Gorman, Valentin Schneider,
K Prateek Nayak, Anna-Maria Behnsen, Frederic Weisbecker,
Thomas Gleixner
Cc: cgroups, linux-doc, linux-kernel, linux-kselftest, Guopeng Zhang,
Mathieu Desnoyers, Waiman Long
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@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH-next 1/3] tick/sched: Make tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask consistent
2026-11-21 3:13 ` [PATCH-next 1/3] tick/sched: Make tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask consistent Waiman Long
@ 2026-11-21 10:01 ` kernel test robot
0 siblings, 0 replies; 5+ messages in thread
From: kernel test robot @ 2026-11-21 10:01 UTC (permalink / raw)
To: Waiman Long, Tejun Heo, Johannes Weiner, Michal Koutný,
Jonathan Corbet, Shuah Khan, Randy Dunlap, Ridong Chen,
Ingo Molnar, Peter Zijlstra, Juri Lelli, Vincent Guittot,
Dietmar Eggemann, Steven Rostedt, Ben Segall, Mel Gorman,
Valentin Schneider, K Prateek Nayak, Anna-Maria Behnsen,
Frederic Weisbecker, Thomas Gleixner
Cc: llvm, oe-kbuild-all, cgroups, linux-doc, linux-kernel,
linux-kselftest, Guopeng Zhang, Mathieu Desnoyers, Waiman Long
Hi Waiman,
kernel test robot noticed the following build warnings:
[auto build test WARNING on tj-cgroup/for-next]
[also build test WARNING on tip/sched/core tip/timers/nohz linus/master v7.4-rc3 next-20261119]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Waiman-Long/tick-sched-Make-tick_nohz_full_mask-and-HK_TYPE_KERNEL_NOISE-cpumask-consistent/20261120-221327
base: https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-next
patch link: https://lore.kernel.org/r/20261121031329.240177-2-longman%40redhat.com
patch subject: [PATCH-next 1/3] tick/sched: Make tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask consistent
config: powerpc-akebono_defconfig (https://download.01.org/0day-ci/archive/20261121/202611211717.qIDq0wIX-lkp@intel.com/config)
compiler: clang version 24.0.0git (https://github.com/llvm/llvm-project 3b14d7c370558b46e5f0c6494a05c492e59bf32c)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20261121/202611211717.qIDq0wIX-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202611211717.qIDq0wIX-lkp@intel.com/
All warnings (new ones prefixed by >>, old ones prefixed by <<):
>> WARNING: modpost: vmlinux: EXPORT_SYMBOL used for init symbol 'housekeeping_set_cpu'. Remove __init or EXPORT_SYMBOL.
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH-next 2/3] sched/isolation: Forbid the boot CPU from being isolated
2026-11-21 3:13 [PATCH-next 0/3] Skip boot CPU or don't allow it from being used in isolcpus and isolated partitions Waiman Long
2026-11-21 3:13 ` [PATCH-next 1/3] tick/sched: Make tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask consistent Waiman Long
@ 2026-11-21 3:13 ` Waiman Long
2026-11-21 3:13 ` [PATCH-next 3/3] cgroup/cpuset: Disallow CPU 0 from being used in isolated partition Waiman Long
2 siblings, 0 replies; 5+ messages in thread
From: Waiman Long @ 2026-11-21 3:13 UTC (permalink / raw)
To: Tejun Heo, Johannes Weiner, Michal Koutný, Jonathan Corbet,
Shuah Khan, Randy Dunlap, Ridong Chen, Ingo Molnar,
Peter Zijlstra, Juri Lelli, Vincent Guittot, Dietmar Eggemann,
Steven Rostedt, Ben Segall, Mel Gorman, Valentin Schneider,
K Prateek Nayak, Anna-Maria Behnsen, Frederic Weisbecker,
Thomas Gleixner
Cc: cgroups, linux-doc, linux-kernel, linux-kselftest, Guopeng Zhang,
Mathieu Desnoyers, Waiman Long
It is reported that with CONFIG_CPUSETS=n, a kernel booted with
isolcpus=domain,0 hits the BUG() in select_fallback_rq() during boot
[1]. At boot time, cpu 0 is the only CPU online and an unbound kworker
cannot be run on a domain isolated CPU causing kernel panic.
Sashiko also reports that domain isolating the boot CPU can break system
suspend and trigger a BUG_ON() [2]. So it is problematic if the boot CPU
is domain isolated.
There may be other kernel subsystems that have problem if the boot CPU
is domain isolated as most of them won't take into account the fact
that boot CPU is currently allowed to be domain isolated. The current
housekeeping code enforces the rule that if both isolcpus and nohz_full
boot parameters are set, they should match each other. Given the fact
that the boot CPU is likely to be disallowed from the nohz_full list,
it makes sense that we should not allow the boot CPU from being set
in the isolcpus boot parameter as well. This will also avoid the above
problems due to boot CPU being domain isolated.
Do that by clearing the boot CPU from the isolcpus range when it is
specified in the boot command line. A warning will also be printed when
that happens.
This is indeed a change in behavior which is customer visible. So the
kernel-paremeters.txt is updated to mention the fact that boot CPU
cannot be isolated.
[1] https://lore.kernel.org/lkml/20261117144817.265109-1-mathieu.desnoyers@efficios.com
[2] https://sashiko.dev/#/patchset/20261108180849.1268263-1-longman%40redhat.com
Signed-off-by: Waiman Long <longman@redhat.com>
---
Documentation/admin-guide/kernel-parameters.txt | 7 ++++---
kernel/sched/isolation.c | 16 ++++++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 930cee4de79a..1c8bf3583b0b 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2954,11 +2954,12 @@ Kernel parameters
You can move a process onto or off an "isolated" CPU via
the CPU affinity syscalls or cpuset.
- <cpu number> begins at 0 and the maximum value is
- "number of CPUs in system - 1".
+ <cpu number> begins at 0 and the maximum value
+ is "number of CPUs in system - 1". However boot
+ CPU (cpu 0) cannot be domain isolated as it
+ may cause problem with some kernel subsystems.
managed_irq
-
Isolate from being targeted by managed interrupts
which have an interrupt mask containing isolated
CPUs. The affinity of managed interrupts is
diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c
index 18b50c0d807a..ef4aa5126dc5 100644
--- a/kernel/sched/isolation.c
+++ b/kernel/sched/isolation.c
@@ -232,6 +232,7 @@ static int __init housekeeping_setup(char *str, unsigned long flags)
{
cpumask_var_t non_housekeeping_mask, housekeeping_staging;
unsigned int first_cpu;
+ int boot_cpu = smp_processor_id();
int err = 0;
if ((flags & HK_FLAG_KERNEL_NOISE) && !(housekeeping.flags & HK_FLAG_KERNEL_NOISE)) {
@@ -254,14 +255,21 @@ static int __init housekeeping_setup(char *str, unsigned long flags)
first_cpu = cpumask_first_and(cpu_present_mask, housekeeping_staging);
if (first_cpu >= nr_cpu_ids || first_cpu >= setup_max_cpus) {
- __cpumask_set_cpu(smp_processor_id(), housekeeping_staging);
- __cpumask_clear_cpu(smp_processor_id(), non_housekeeping_mask);
+ __cpumask_set_cpu(boot_cpu, housekeeping_staging);
+ __cpumask_clear_cpu(boot_cpu, non_housekeeping_mask);
if (!housekeeping.flags) {
- pr_warn("Housekeeping: must include one present CPU, "
- "using boot CPU:%d\n", smp_processor_id());
+ pr_warn("Housekeeping: must include one present CPU, using boot CPU:%d\n",
+ boot_cpu);
}
}
+ if ((flags & HK_FLAG_DOMAIN) && cpumask_test_cpu(boot_cpu, non_housekeeping_mask)) {
+ pr_warn("Housekeeping: Boot CPU must not be isolated, clearing %d from isolcpus range\n",
+ boot_cpu);
+ __cpumask_set_cpu(boot_cpu, housekeeping_staging);
+ __cpumask_clear_cpu(boot_cpu, non_housekeeping_mask);
+ }
+
if (cpumask_empty(non_housekeeping_mask))
goto free_housekeeping_staging;
--
2.56.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH-next 3/3] cgroup/cpuset: Disallow CPU 0 from being used in isolated partition
2026-11-21 3:13 [PATCH-next 0/3] Skip boot CPU or don't allow it from being used in isolcpus and isolated partitions Waiman Long
2026-11-21 3:13 ` [PATCH-next 1/3] tick/sched: Make tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask consistent Waiman Long
2026-11-21 3:13 ` [PATCH-next 2/3] sched/isolation: Forbid the boot CPU from being isolated Waiman Long
@ 2026-11-21 3:13 ` Waiman Long
2 siblings, 0 replies; 5+ messages in thread
From: Waiman Long @ 2026-11-21 3:13 UTC (permalink / raw)
To: Tejun Heo, Johannes Weiner, Michal Koutný, Jonathan Corbet,
Shuah Khan, Randy Dunlap, Ridong Chen, Ingo Molnar,
Peter Zijlstra, Juri Lelli, Vincent Guittot, Dietmar Eggemann,
Steven Rostedt, Ben Segall, Mel Gorman, Valentin Schneider,
K Prateek Nayak, Anna-Maria Behnsen, Frederic Weisbecker,
Thomas Gleixner
Cc: cgroups, linux-doc, linux-kernel, linux-kselftest, Guopeng Zhang,
Mathieu Desnoyers, Waiman Long
Domain isolating CPU 0 can be problematic and may even cause panic in
some cases. So it is better to disable its use in an isolated partition.
Add a new partition error code to indicate to the users that CPU 0
cannot be used in an isolated partition.
Some existing test cases in test_cpuset_prs.sh are modified to remove
the use of CPU 0 in isolated partition setup and explicit new test cases
are added to test that. The NOHZ_FULL test cases also modified to run if
the "nohz_full" parameters includes all the CPUs except CPU 1-7 instead
of 0-7. Though it is not recommended to put CPU 0 in the nohz_full boot
parameter, it is the only way we can test that the cpuset code is able to
correctly disallow isolating the last nohz_full/domain housekeeping CPU.
With CPU 0 likely not allowed in the nohz_full list and with CPU 0 also
disallowed from being domain isolated and offline, we will likely have CPU
0 being an always present online housekeeping CPU for most kernels. For
those kernels, we will not be able to trigger partition invalidation due
to using up the last nohz_full/domain housekeeping CPU in an isolated
partition and the NOHZ_FULL test cases in test_cpuset_prs.sh will not
be run.
The cgroup-v2.rst documentation file is also modified to indicate that
CPU 0 cannot be used in an isolated partition.
Signed-off-by: Waiman Long <longman@redhat.com>
---
Documentation/admin-guide/cgroup-v2.rst | 1 +
kernel/cgroup/cpuset-internal.h | 1 +
kernel/cgroup/cpuset.c | 6 +++
.../selftests/cgroup/test_cpuset_prs.sh | 43 ++++++++++++-------
4 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/Documentation/admin-guide/cgroup-v2.rst b/Documentation/admin-guide/cgroup-v2.rst
index 9e3c67b02ae2..2f792ff29425 100644
--- a/Documentation/admin-guide/cgroup-v2.rst
+++ b/Documentation/admin-guide/cgroup-v2.rst
@@ -2771,6 +2771,7 @@ Cpuset Interface Files
and excluded from the unbound workqueues. Tasks placed in such
a partition with multiple CPUs should be carefully distributed
and bound to each of the individual CPUs for optimal performance.
+ The boot CPU (CPU 0) cannot be used in an isolated partition.
A partition root ("root" or "isolated") can be in one of the
two possible states - valid or invalid. An invalid partition
diff --git a/kernel/cgroup/cpuset-internal.h b/kernel/cgroup/cpuset-internal.h
index 1ba94ffaff9d..505682493d81 100644
--- a/kernel/cgroup/cpuset-internal.h
+++ b/kernel/cgroup/cpuset-internal.h
@@ -36,6 +36,7 @@ enum prs_errcode {
PERR_ACCESS,
PERR_REMOTE,
PERR_ISOPARENT,
+ PERR_ISOLCPU0,
};
/* bits in struct cpuset flags field */
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 30af9531acdd..68d104d0bdf5 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -61,6 +61,7 @@ static const char * const perr_strings[] = {
[PERR_ACCESS] = "Enable partition not permitted",
[PERR_REMOTE] = "Have remote partition underneath",
[PERR_ISOPARENT] = "Root partition is not allowed with isolated parent",
+ [PERR_ISOLCPU0] = "Boot CPU (cpu 0) cannot be isolated",
};
/*
@@ -1453,6 +1454,9 @@ static enum prs_errcode validate_partition(struct cpuset *cs,
if (tasks_nocpu_error(parent, cs, new_excpus))
return PERR_NOCPUS;
+ if ((new_prs == PRS_ISOLATED) && cpumask_test_cpu(0, new_excpus))
+ return PERR_ISOLCPU0;
+
return PERR_NONE;
}
@@ -3002,6 +3006,8 @@ static int update_prstate(struct cpuset *cs, int new_prs)
err = PERR_HKEEPING;
else if (parent_prs == PRS_ISOLATED)
err = PERR_ISOPARENT; /* old_prs should be isolated */
+ else if ((new_prs == PRS_ISOLATED) && cpumask_test_cpu(0, cs->effective_xcpus))
+ err = PERR_ISOLCPU0;
if (err) {
disable_partition = true;
diff --git a/tools/testing/selftests/cgroup/test_cpuset_prs.sh b/tools/testing/selftests/cgroup/test_cpuset_prs.sh
index 1397ec428c46..735d515ffc10 100755
--- a/tools/testing/selftests/cgroup/test_cpuset_prs.sh
+++ b/tools/testing/selftests/cgroup/test_cpuset_prs.sh
@@ -110,8 +110,8 @@ echo "" > test/cpuset.cpus
#
# If nohz_full CPUs have been reserved at boot time, they should not include
-# CPUs 0-7 as that may fail some of the test cases. On the other hand if the
-# set of nohz_full CPUs includes all the CPUs except 0-7 in a single range
+# CPUs 1-7 as that may fail some of the test cases. On the other hand if the
+# set of nohz_full CPUs includes all the CPUs except 1-7 in a single range
# <first>-<last>, we can run a special set of housekeeping CPUs exhaustion
# tests to see if the cpuset code will reject them.
#
@@ -123,14 +123,22 @@ NOHZ_FULL_CPUS=
NOHZ_FULL_CPUS=$(cat /sys/devices/system/cpu/nohz_full)
LAST_PRESENT_CPU=$(cat /sys/devices/system/cpu/present | sed -e "s/.*[,-]//")
[[ -n "$NOHZ_FULL_CPUS" ]] && {
- FIRST_NOHZ_FULL_CPU=$(echo $NOHZ_FULL_CPUS | sed -e "s/[,-].*//")
- LAST_NOHZ_FULL_CPU=$(echo $NOHZ_FULL_CPUS | sed -e "s/,.*//;s/.*[-]//")
+ if [[ $(expr $NOHZ_FULL_CPUS : "^0,") -gt 0 ]]
+ then
+ NOHZ_CPU0=1
+ NOHZ_CPUS=$(echo $NOHZ_FULL_CPUS | sed -e "s/^0,//")
+ else
+ NOHZ_CPUS=$NOHZ_FULL_CPUS
+ fi
+ FIRST_NOHZ_FULL_CPU=$(echo $NOHZ_CPUS | sed -e "s/[,-].*//")
+ LAST_NOHZ_FULL_CPU=$(echo $NOHZ_CPUS | sed -e "s/,.*//;s/.*[-]//")
echo "Boot nohz_full CPUs: $NOHZ_FULL_CPUS"
}
[[ -n "$FIRST_NOHZ_FULL_CPU" && "$FIRST_NOHZ_FULL_CPU" -le 7 ]] &&
skip_test "Boot NOHZ_FULL CPUs overlap CPUs to be tested!"
[[ -n "$FIRST_NOHZ_FULL_CPU" && "$FIRST_NOHZ_FULL_CPU" = 8 &&
+ -n "$NOHZ_CPU0" &&
"$LAST_NOHZ_FULL_CPU" = $LAST_PRESENT_CPU ]] && RUN_NOHZ_FULL_TESTS=1
#
@@ -394,8 +402,8 @@ TEST_MATRIX=(
# Invalid to valid local partition direct transition tests
" C1-3:P2 X4:P2 . . . . . . 0 A1:1-3|XA1:1-3|A2:1-3:XA2: A1:P2|A2:P-2 1-3"
" C1-3:P2 X4:P2 . . . X3:P2 . . 0 A1:1-2|XA1:1-3|A2:3:XA2:3 A1:P2|A2:P2 1-3"
- " C0-3:P2 . . C4-6 C0-4 . . . 0 A1:0-4|B1:5-6 A1:P2|B1:P0"
- " C0-3:P2 . . C4-6 C0-4:C0-3 . . . 0 A1:0-3|B1:4-6 A1:P2|B1:P0 0-3"
+ " C1-3:P2 . . C4-6 C1-4 . . . 0 A1:1-4|B1:5-6 A1:P2|B1:P0"
+ " C1-3:P2 . . C4-6 C1-4:C1-3 . . . 0 A1:1-3|B1:4-6 A1:P2|B1:P0 1-3"
# Local partition invalidation tests
" C0-3:X1-3:P2 C1-3:X2-3:P2 C2-3:X3:P2 \
@@ -506,6 +514,11 @@ TEST_MATRIX=(
" CX1-4 CX2-4:P2 . C5-6 . . . P1:C3-6 0 A1:1|A2:2-4|B1:5-6 \
A1:P0|A2:P2:B1:P-1 2-4"
+ # CPU 0 cannot be used in an isolated partition
+ " CX0-4 . . . P2 . . . 0 A1:0-4 A1:P-2"
+ " CX0-4 C0-2:P1 . . . P2 . . 0 A1:0-4:A2:0-2 A2:P-2"
+ " CX0-4 C3-4:P2 . . . C0-2 . . 0 A1:0-4:A2:0-2 A2:P-2"
+
# When multiple partitions with conflicting cpuset.cpus are created, the
# latter created ones will only get what are left of the available exclusive
# CPUs.
@@ -525,8 +538,8 @@ TEST_MATRIX=(
# A middle isolated parent shrunk below coverage: the released CPUs of
# an invalidated child stay isolated as a higher ancestor still covers them.
- " CX0-4:P2 CX2-4:P2 CX3-4:P2 . . X2 . . 0 A1:0-1,3-4|A2:2|A3:2 \
- A1:P2|A2:P2|A3:P-2 0-4"
+ " CX1-4:P2 CX2-4:P2 CX3-4:P2 . . X2 . . 0 A1:1,3-4|A2:2|A3:2 \
+ A1:P2|A2:P2|A3:P-2 1-4"
# When an isolated partition child with root partition parent is invalidated,
# its effective xcpus will be removed from isolated_cpus.
@@ -618,20 +631,20 @@ ISOLCPUS_TEST_MATRIX=(
" CX1-2,I:X1,I:P1 . . . X1,2,I . . . 0 A1:1-2,I|XA1:1-2,I A1:P-1 ."
)
-# Test matrix to be run when boot time nohz_full CPUs cover all CPUs except CPUs 0-7
+# Test matrix to be run when boot time nohz_full CPUs cover all CPUs except CPUs 1-7
# This also means that CPU 8 is available and is a nohz_full CPU.
NOHZ_FULL_TEST_MATRIX=(
# old-A1 old-A2 old-A3 old-B1 new-A1 new-A2 new-A3 new-B1 fail ECPUs Pstate ISOLCPUS
# ------ ------ ------ ------ ------ ------ ------ ------ ---- ----- ------ --------
# Using all the nohz_full HK CPUs 0-7 in isolated partition is not allowed
- " C0-7 . . . P2 . . . 0 A1:0-7 A1:P-2 ."
- " C2-7:P2 . . . C0-4 . . . 0 A1:0-4 A1:P2 0-4"
- " C1-7:P2 C5-7:P2 . . . . . C0:P2 0 A1:1-4|A2:5-7|B1:0
- A1:P2|A2:P2|B1:P-2 1-7"
+ " C1-7 . . . P2 . . . 0 A1:1-7 A1:P-2 ."
+ " C2-7:P2 . . . C1-4 . . . 0 A1:1-4 A1:P2 1-4"
+ " C2-7:P2 C5-7:P2 . . . . . C1:P2 0 A1:2-4|A2:5-7|B1:1
+ A1:P2|A2:P2|B1:P-2 2-7"
# An isolated child partition cannot grow to take over the last
# housekeeping CPU when its parent expands the exclusive CPUs.
- " C0-8:X1-8:P1 CX0-8:P2 . . X0-7 . . . 0 A1:0-7|A2:0-7 A1:P1|A2:P-2 ."
- " C0-8:X0-6:P1 CX0-8:P2 . . X2-8 . . . 0 A1:|A2:2-8 A1:P1|A2:P2 2-8"
+ " C1-8:X1-8:P1 CX1-8:P2 . . X1-7 . . . 0 A1:0-7|A2:0-7 A1:P1|A2:P-2 ."
+ " C1-8:X0-6:P1 CX1-8:P2 . . X2-8 . . . 0 A1:|A2:2-8 A1:P1|A2:P2 2-8"
)
#
--
2.56.1
^ permalink raw reply related [flat|nested] 5+ messages in thread