[PATCH v2 0/2] isolation: Exclude dynamically isolated CPUs from housekeeping cpumasks

[PATCH v2 0/2] isolation: Exclude dynamically isolated CPUs from housekeeping cpumasks

[Waiman Long]

 v2:
  - Add a TODO comment on overriding boot time housekeeping masks setting
    in the future when dynamic CPU isolation is good enough to deprecate
    isolcpus and nohz_full boot command line parameters.
  - Only save one copy of the boot time housekeeping mask as the CPU
    list used in isolcpus and nohz_full must be the same.
  - Include more housekeeping masks to be updated by cpuset.

 [v1] https://lore.kernel.org/lkml/20240229021414.508972-1-longman@redhat.com/

The housekeeping CPU masks, set up by the "isolcpus" and "nohz_full"
boot command line options, are used at boot time to exclude selected
CPUs from running some kernel housekeeping processes to minimize
disturbance to latency sensitive userspace applications. However, some
of housekeeping CPU masks are also checked at run time to avoid using
those isolated CPUs.

The purpose of this patch series is to exclude dynamically isolated
CPUs from some housekeeping masks so that subsystems that check the
housekeeping masks at run time will not see those isolated CPUs. It does
not migrate the housekeeping processes that have been running on those
newly isolated CPUs since bootup to other CPUs. That will hopefully be
done in the near future.

This patch series updates all the housekeeping cpumasks except the
HK_TYPE_TICK and HK_TYPE_MANAGED_IRQ which needs further investigation.

Waiman Long (2):
  sched/isolation: Exclude dynamically isolated CPUs from housekeeping
    masks
  cgroup/cpuset: Exclude isolated CPUs from housekeeping CPU masks

 include/linux/sched/isolation.h |   8 +++
 kernel/cgroup/cpuset.c          |  34 ++++++++--
 kernel/sched/isolation.c        | 112 +++++++++++++++++++++++++++++++-
 3 files changed, 146 insertions(+), 8 deletions(-)

-- 
2.43.5

[PATCH v2 1/2] sched/isolation: Exclude dynamically isolated CPUs from housekeeping masks

[Waiman Long]

The housekeeping CPU masks, set up by the "isolcpus" and "nohz_full"
boot command line options, are used at boot time to exclude selected CPUs
from running some kernel background processes to minimize disturbance
to latency sensitive userspace applications. Some of housekeeping CPU
masks are also checked at run time to avoid using those isolated CPUs.

The cpuset subsystem is now able to dynamically create a set of isolated
CPUs to be used in isolated cpuset partitions. The long term goal is
to make the degree of isolation as close as possible to what can be
done statically using those boot command line options.

This patch is a step in that direction by making the housekeeping CPU
mask APIs exclude the dynamically isolated CPUs when they are called
at run time. The housekeeping CPU masks will fall back to the bootup
default when all the dynamically isolated CPUs are released.

A new housekeeping_exlude_isolcpus() function is added which is to be
called by the cpuset subsystem to provide a list of isolated CPUs to
be excluded.

Signed-off-by: Waiman Long <longman@redhat.com>
---
 include/linux/sched/isolation.h |   8 +++
 kernel/sched/isolation.c        | 112 +++++++++++++++++++++++++++++++-
 2 files changed, 119 insertions(+), 1 deletion(-)

diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h
index 2b461129d1fa..d64fa4e60138 100644
--- a/include/linux/sched/isolation.h
+++ b/include/linux/sched/isolation.h
@@ -27,6 +27,8 @@ 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 void __init housekeeping_init(void);
+extern int housekeeping_exlude_isolcpus(const struct cpumask *isolcpus,
+					unsigned long flags);
 
 #else
 
@@ -54,6 +56,12 @@ static inline bool housekeeping_test_cpu(int cpu, enum hk_type type)
 }
 
 static inline void housekeeping_init(void) { }
+
+static inline int housekeeping_exlude_isolcpus(struct cpumask *isolcpus,
+					       unsigned long flags)
+{
+	return -EOPNOTSUPP;
+}
 #endif /* CONFIG_CPU_ISOLATION */
 
 static inline bool housekeeping_cpu(int cpu, enum hk_type type)
diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c
index 5891e715f00d..3018ba81eb65 100644
--- a/kernel/sched/isolation.c
+++ b/kernel/sched/isolation.c
@@ -28,7 +28,16 @@ struct housekeeping {
 	unsigned long flags;
 };
 
-static struct housekeeping housekeeping;
+static struct housekeeping housekeeping __read_mostly;
+
+/*
+ * Boot time housekeeping cpumask and flags
+ *
+ * If more than one of nohz_full or isolcpus are specified, the cpumask must
+ * be the same or the setup will fail.
+ */
+static cpumask_var_t boot_hk_cpumask;
+static unsigned long  boot_hk_flags;
 
 bool housekeeping_enabled(enum hk_type type)
 {
@@ -253,3 +262,104 @@ static int __init housekeeping_isolcpus_setup(char *str)
 	return housekeeping_setup(str, flags);
 }
 __setup("isolcpus=", housekeeping_isolcpus_setup);
+
+/*
+ * Save bootup housekeeping cpumask and flags
+ */
+static int housekeeping_save(void)
+{
+	enum hk_type type;
+
+	boot_hk_flags = housekeeping.flags;
+	for_each_set_bit(type, &housekeeping.flags, HK_TYPE_MAX) {
+		if (!alloc_cpumask_var(&boot_hk_cpumask, GFP_KERNEL))
+			return -ENOMEM;
+		cpumask_copy(boot_hk_cpumask, housekeeping.cpumasks[type]);
+		break;
+	}
+	return 0;
+}
+
+/*
+ * Exclude the given dynamically isolated CPUs from the housekeeping CPUs
+ * External synchronization is required to make sure that concurrent call to
+ * this function will not happen.
+ *
+ * [TODO] The housekeeping cpumasks and flags at bootup time are currently
+ * preserved as cpuset dynamic CPU isolation isn't as good as boot time CPU
+ * isolation yet. Once dynamic CPU isolation is close to boot time isolation,
+ * we will not need to save the bootup values and will allow them to be
+ * overridden.
+ *
+ * Return: 0 if successful, an error code if not
+ */
+int housekeeping_exlude_isolcpus(const struct cpumask *isolcpus, unsigned long flags)
+{
+	static unsigned long alloc_flags;
+	static cpumask_var_t tmp_mask;
+	static bool excluded;	/* @true if some CPUs have been excluded */
+	static bool inited;	/* @true if called before */
+
+	bool isolate_none = !isolcpus || cpumask_empty(isolcpus);
+	enum hk_type type;
+
+	lockdep_assert_cpus_held();
+
+	if (isolate_none && (!inited || !excluded))
+		return 0;
+
+	if (unlikely(!inited)) {
+		if (!alloc_cpumask_var(&tmp_mask, GFP_KERNEL))
+			return -ENOMEM;
+		if (housekeeping.flags) {
+			int err = housekeeping_save();
+
+			if (err)
+				return err;
+		}
+		alloc_flags = housekeeping.flags;
+		inited = true;
+	}
+
+	if (isolate_none) {
+		excluded = false;
+
+		/*
+		 * Reset housekeeping to bootup default
+		 */
+		for_each_set_bit(type, &boot_hk_flags, HK_TYPE_MAX)
+			cpumask_copy(housekeeping.cpumasks[type], boot_hk_cpumask);
+
+		WRITE_ONCE(housekeeping.flags, boot_hk_flags);
+		if (!boot_hk_flags && static_key_enabled(&housekeeping_overridden))
+			static_key_disable_cpuslocked(&housekeeping_overridden.key);
+		return 0;
+	}
+
+	/*
+	 * Setting up the new housekeeping cpumasks
+	 */
+	for_each_set_bit(type, &flags, HK_TYPE_MAX) {
+		const struct cpumask *src_mask;
+
+		if (!(BIT(type) & alloc_flags)) {
+			if (!alloc_cpumask_var(&housekeeping.cpumasks[type], GFP_KERNEL))
+				return -ENOMEM;
+			alloc_flags |= BIT(type);
+		}
+		src_mask = (BIT(type) & boot_hk_flags)
+			 ? boot_hk_cpumask : cpu_possible_mask;
+		/*
+		 * Make sure there is at least one online housekeeping CPU
+		 */
+		cpumask_andnot(tmp_mask, src_mask, isolcpus);
+		if (!cpumask_intersects(tmp_mask, cpu_online_mask))
+			return -EINVAL;	/* Invalid isolated CPUs */
+		cpumask_copy(housekeeping.cpumasks[type], tmp_mask);
+	}
+	WRITE_ONCE(housekeeping.flags, boot_hk_flags | flags);
+	excluded = true;
+	if (!static_key_enabled(&housekeeping_overridden))
+		static_key_enable_cpuslocked(&housekeeping_overridden.key);
+	return 0;
+}
-- 
2.43.5

Re: [PATCH v2 1/2] sched/isolation: Exclude dynamically isolated CPUs from housekeeping masks

[Waiman Long]

On 8/21/24 10:23, Waiman Long wrote:
> The housekeeping CPU masks, set up by the "isolcpus" and "nohz_full"
> boot command line options, are used at boot time to exclude selected CPUs
> from running some kernel background processes to minimize disturbance
> to latency sensitive userspace applications. Some of housekeeping CPU
> masks are also checked at run time to avoid using those isolated CPUs.
>
> The cpuset subsystem is now able to dynamically create a set of isolated
> CPUs to be used in isolated cpuset partitions. The long term goal is
> to make the degree of isolation as close as possible to what can be
> done statically using those boot command line options.
>
> This patch is a step in that direction by making the housekeeping CPU
> mask APIs exclude the dynamically isolated CPUs when they are called
> at run time. The housekeeping CPU masks will fall back to the bootup
> default when all the dynamically isolated CPUs are released.
>
> A new housekeeping_exlude_isolcpus() function is added which is to be
> called by the cpuset subsystem to provide a list of isolated CPUs to
> be excluded.
>
> Signed-off-by: Waiman Long <longman@redhat.com>
> ---
>   include/linux/sched/isolation.h |   8 +++
>   kernel/sched/isolation.c        | 112 +++++++++++++++++++++++++++++++-
>   2 files changed, 119 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h
> index 2b461129d1fa..d64fa4e60138 100644
> --- a/include/linux/sched/isolation.h
> +++ b/include/linux/sched/isolation.h
> @@ -27,6 +27,8 @@ 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 void __init housekeeping_init(void);
> +extern int housekeeping_exlude_isolcpus(const struct cpumask *isolcpus,
> +					unsigned long flags);
>   
>   #else
>   
> @@ -54,6 +56,12 @@ static inline bool housekeeping_test_cpu(int cpu, enum hk_type type)
>   }
>   
>   static inline void housekeeping_init(void) { }
> +
> +static inline int housekeeping_exlude_isolcpus(struct cpumask *isolcpus,
> +					       unsigned long flags)
> +{
> +	return -EOPNOTSUPP;
> +}
>   #endif /* CONFIG_CPU_ISOLATION */
>   
>   static inline bool housekeeping_cpu(int cpu, enum hk_type type)
> diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c
> index 5891e715f00d..3018ba81eb65 100644
> --- a/kernel/sched/isolation.c
> +++ b/kernel/sched/isolation.c
> @@ -28,7 +28,16 @@ struct housekeeping {
>   	unsigned long flags;
>   };
>   
> -static struct housekeeping housekeeping;
> +static struct housekeeping housekeeping __read_mostly;
> +
> +/*
> + * Boot time housekeeping cpumask and flags
> + *
> + * If more than one of nohz_full or isolcpus are specified, the cpumask must
> + * be the same or the setup will fail.
> + */
> +static cpumask_var_t boot_hk_cpumask;
> +static unsigned long  boot_hk_flags;
>   
>   bool housekeeping_enabled(enum hk_type type)
>   {
> @@ -253,3 +262,104 @@ static int __init housekeeping_isolcpus_setup(char *str)
>   	return housekeeping_setup(str, flags);
>   }
>   __setup("isolcpus=", housekeeping_isolcpus_setup);
> +
> +/*
> + * Save bootup housekeeping cpumask and flags
> + */
> +static int housekeeping_save(void)
> +{
> +	enum hk_type type;
> +
> +	boot_hk_flags = housekeeping.flags;
> +	for_each_set_bit(type, &housekeeping.flags, HK_TYPE_MAX) {
> +		if (!alloc_cpumask_var(&boot_hk_cpumask, GFP_KERNEL))
> +			return -ENOMEM;
> +		cpumask_copy(boot_hk_cpumask, housekeeping.cpumasks[type]);
> +		break;
> +	}
> +	return 0;
> +}
> +
> +/*
> + * Exclude the given dynamically isolated CPUs from the housekeeping CPUs
> + * External synchronization is required to make sure that concurrent call to
> + * this function will not happen.
> + *
> + * [TODO] The housekeeping cpumasks and flags at bootup time are currently
> + * preserved as cpuset dynamic CPU isolation isn't as good as boot time CPU
> + * isolation yet. Once dynamic CPU isolation is close to boot time isolation,
> + * we will not need to save the bootup values and will allow them to be
> + * overridden.
> + *
> + * Return: 0 if successful, an error code if not
> + */
> +int housekeeping_exlude_isolcpus(const struct cpumask *isolcpus, unsigned long flags)
> +{
> +	static unsigned long alloc_flags;
> +	static cpumask_var_t tmp_mask;
> +	static bool excluded;	/* @true if some CPUs have been excluded */
> +	static bool inited;	/* @true if called before */
> +
> +	bool isolate_none = !isolcpus || cpumask_empty(isolcpus);
> +	enum hk_type type;
> +
> +	lockdep_assert_cpus_held();
> +
> +	if (isolate_none && (!inited || !excluded))
> +		return 0;
> +
> +	if (unlikely(!inited)) {
> +		if (!alloc_cpumask_var(&tmp_mask, GFP_KERNEL))
> +			return -ENOMEM;
> +		if (housekeeping.flags) {
> +			int err = housekeeping_save();
> +
> +			if (err)
> +				return err;
> +		}
> +		alloc_flags = housekeeping.flags;
> +		inited = true;
> +	}
> +
> +	if (isolate_none) {
> +		excluded = false;
> +
> +		/*
> +		 * Reset housekeeping to bootup default
> +		 */
> +		for_each_set_bit(type, &boot_hk_flags, HK_TYPE_MAX)
> +			cpumask_copy(housekeeping.cpumasks[type], boot_hk_cpumask);
> +
> +		WRITE_ONCE(housekeeping.flags, boot_hk_flags);
> +		if (!boot_hk_flags && static_key_enabled(&housekeeping_overridden))
> +			static_key_disable_cpuslocked(&housekeeping_overridden.key);
> +		return 0;
> +	}
> +
> +	/*
> +	 * Setting up the new housekeeping cpumasks
> +	 */
> +	for_each_set_bit(type, &flags, HK_TYPE_MAX) {
> +		const struct cpumask *src_mask;
> +
> +		if (!(BIT(type) & alloc_flags)) {
> +			if (!alloc_cpumask_var(&housekeeping.cpumasks[type], GFP_KERNEL))
> +				return -ENOMEM;
> +			alloc_flags |= BIT(type);
> +		}
> +		src_mask = (BIT(type) & boot_hk_flags)
> +			 ? boot_hk_cpumask : cpu_possible_mask;
> +		/*
> +		 * Make sure there is at least one online housekeeping CPU
> +		 */
> +		cpumask_andnot(tmp_mask, src_mask, isolcpus);
> +		if (!cpumask_intersects(tmp_mask, cpu_online_mask))
> +			return -EINVAL;	/* Invalid isolated CPUs */
> +		cpumask_copy(housekeeping.cpumasks[type], tmp_mask);
> +	}
> +	WRITE_ONCE(housekeeping.flags, boot_hk_flags | flags);
> +	excluded = true;
> +	if (!static_key_enabled(&housekeeping_overridden))
> +		static_key_enable_cpuslocked(&housekeeping_overridden.key);
> +	return 0;
> +}

Any comment or suggestion about this patch?

Thanks,
Longman

Re: [PATCH v2 1/2] sched/isolation: Exclude dynamically isolated CPUs from housekeeping masks

[Michal Koutný]

[-- Attachment #1: Type: text/plain, Size: 1503 bytes --]

Hello.

I recently liked the idea of considering isolated CPUs a static (boot
time) resource and only use cpusets to place (or remove) sensitive
workload from those selected CPUs depending on current needs. (Yes, this
may not efficiently utilize the isolated CPUs when reserve them based on
maximum needs of a node.)


On Wed, Aug 21, 2024 at 10:23:11AM GMT, Waiman Long <longman@redhat.com> wrote:
> This patch is a step in that direction by making the housekeeping CPU
> mask APIs exclude the dynamically isolated CPUs when they are called
> at run time. The housekeeping CPU masks will fall back to the bootup
> default when all the dynamically isolated CPUs are released.

But when I look at it with the dynamism in mind, I would expect that
some API like housekeeping_setup_type(), i.e. modify the set of isolated
CPUs are requested and leave it up to the isolation implementation to
propagate any changes to respective subsystems. And return an error of
type contains a flag for which dynamism isn't implemented yet or not
possible.

The boot time value would only be the initial default, but the value
would be mutated by this API. There's IMO no need to revert to that.

(Also someone mentioned that this could share lots of code with CPU
offlining/onlining.)

> A new housekeeping_exlude_isolcpus() function is added which is to be
                     exclude

> called by the cpuset subsystem to provide a list of isolated CPUs to
> be excluded.


HTH,
Michal

(-Cc: lizefan.x@bytedance.com)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v2 1/2] sched/isolation: Exclude dynamically isolated CPUs from housekeeping masks

[Waiman Long]

On 11/15/24 10:45 AM, Michal Koutný wrote:
> Hello.
>
> I recently liked the idea of considering isolated CPUs a static (boot
> time) resource and only use cpusets to place (or remove) sensitive
> workload from those selected CPUs depending on current needs. (Yes, this
> may not efficiently utilize the isolated CPUs when reserve them based on
> maximum needs of a node.)

Thanks for taking a look at this.

Yes, I am moving in this direction too. Boot time statically isolated 
CPUs have better isolation than is currently possible if we do it 
dynamically at run time, though we are trying to close the gap.

>
>
> On Wed, Aug 21, 2024 at 10:23:11AM GMT, Waiman Long <longman@redhat.com> wrote:
>> This patch is a step in that direction by making the housekeeping CPU
>> mask APIs exclude the dynamically isolated CPUs when they are called
>> at run time. The housekeeping CPU masks will fall back to the bootup
>> default when all the dynamically isolated CPUs are released.
> But when I look at it with the dynamism in mind, I would expect that
> some API like housekeeping_setup_type(), i.e. modify the set of isolated
> CPUs are requested and leave it up to the isolation implementation to
> propagate any changes to respective subsystems. And return an error of
> type contains a flag for which dynamism isn't implemented yet or not
> possible.

There are currently 9 different hk_type's defined in 
include/linux/sched/isolation.h. We are now trying to reduce their 
number as some of them cannot be set independently. See [1]. I am 
thinking about doing dynamism in the best effort basis. Of course, we 
could expose some information about what aspect of dynamic isolation can 
be enabled at the moment, if necessary.

Cheers,
Longman

Re: [PATCH v2 1/2] sched/isolation: Exclude dynamically isolated CPUs from housekeeping masks

[Waiman Long]

On 11/15/24 2:32 PM, Waiman Long wrote:
> On 11/15/24 10:45 AM, Michal Koutný wrote:
>> Hello.
>>
>> I recently liked the idea of considering isolated CPUs a static (boot
>> time) resource and only use cpusets to place (or remove) sensitive
>> workload from those selected CPUs depending on current needs. (Yes, this
>> may not efficiently utilize the isolated CPUs when reserve them based on
>> maximum needs of a node.)
>
> Thanks for taking a look at this.
>
> Yes, I am moving in this direction too. Boot time statically isolated 
> CPUs have better isolation than is currently possible if we do it 
> dynamically at run time, though we are trying to close the gap.
>
>>
>>
>> On Wed, Aug 21, 2024 at 10:23:11AM GMT, Waiman Long 
>> <longman@redhat.com> wrote:
>>> This patch is a step in that direction by making the housekeeping CPU
>>> mask APIs exclude the dynamically isolated CPUs when they are called
>>> at run time. The housekeeping CPU masks will fall back to the bootup
>>> default when all the dynamically isolated CPUs are released.
>> But when I look at it with the dynamism in mind, I would expect that
>> some API like housekeeping_setup_type(), i.e. modify the set of isolated
>> CPUs are requested and leave it up to the isolation implementation to
>> propagate any changes to respective subsystems. And return an error of
>> type contains a flag for which dynamism isn't implemented yet or not
>> possible.
>
> There are currently 9 different hk_type's defined in 
> include/linux/sched/isolation.h. We are now trying to reduce their 
> number as some of them cannot be set independently. See [1]. I am 
> thinking about doing dynamism in the best effort basis. Of course, we 
> could expose some information about what aspect of dynamic isolation 
> can be enabled at the moment, if necessary.

Forgot to put the link.

[1] https://lore.kernel.org/lkml/20240921190720.106195-1-longman@redhat.com/

>
> Cheers,
> Longman
>

Re: [PATCH v2 1/2] sched/isolation: Exclude dynamically isolated CPUs from housekeeping masks

[Waiman Long]

On 11/15/24 10:45 AM, Michal Koutný wrote:
> (Also someone mentioned that this could share lots of code with CPU
> offlining/onlining.)

Yes, that is true. The simplest way to do that is to offline the CPUs to 
be isolated, change the housekeeping masks and then online those CPUs 
again. That is good for managing a single isolated partition. However, 
Daniel had told me that CPU hotplug code could cause latency spike in 
existing isolated CPUs. That could be a problem if we have more than one 
isolated partitions to manage. So more investigation will be needed in this.

This is still the direction we are going initially, but first we need to 
enable dynamic changes to the housekeeping masks first.

Cheers,
Longman

Re: [PATCH v2 1/2] sched/isolation: Exclude dynamically isolated CPUs from housekeeping masks

[Frederic Weisbecker]

Le Wed, Aug 21, 2024 at 10:23:11AM -0400, Waiman Long a écrit :
> The housekeeping CPU masks, set up by the "isolcpus" and "nohz_full"
> boot command line options, are used at boot time to exclude selected CPUs
> from running some kernel background processes to minimize disturbance
> to latency sensitive userspace applications. Some of housekeeping CPU
> masks are also checked at run time to avoid using those isolated CPUs.
> 
> The cpuset subsystem is now able to dynamically create a set of isolated
> CPUs to be used in isolated cpuset partitions. The long term goal is
> to make the degree of isolation as close as possible to what can be
> done statically using those boot command line options.
> 
> This patch is a step in that direction by making the housekeeping CPU
> mask APIs exclude the dynamically isolated CPUs when they are called
> at run time. The housekeeping CPU masks will fall back to the bootup
> default when all the dynamically isolated CPUs are released.
> 
> A new housekeeping_exlude_isolcpus() function is added which is to be
> called by the cpuset subsystem to provide a list of isolated CPUs to
> be excluded.
> 
> Signed-off-by: Waiman Long <longman@redhat.com>

It's a bit hard to review this for several reasons:

* first, because I'm doing it three months late, sorry about that

* We need to get the HK_TYPE_KERNEL_NOISE patchset in because the
  gazillions types don't help. Let's ping again scheduler people
  once -rc1 is released. I'm setting an alarm!

* It's hard to forecast what kind of synchronization will be needed
  against housekeeping cpumask updates. I need to audit all the users.
  But since all target CPUs are offline, there are just a few things left
  to consider. One of them is kthreads affinity and that should be at
  least partially solved by the kthread affinity patchset
  (https://lore.kernel.org/lkml/20241112142248.20503-1-frederic@kernel.org/)
  Hopefully I'll manage to get that in for the upcoming merge window.
  
Some more thoughts:

> ---
>  include/linux/sched/isolation.h |   8 +++
>  kernel/sched/isolation.c        | 112 +++++++++++++++++++++++++++++++-
>  2 files changed, 119 insertions(+), 1 deletion(-)
> 
> diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h
> index 2b461129d1fa..d64fa4e60138 100644
> --- a/include/linux/sched/isolation.h
> +++ b/include/linux/sched/isolation.h
> @@ -27,6 +27,8 @@ 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 void __init housekeeping_init(void);
> +extern int housekeeping_exlude_isolcpus(const struct cpumask *isolcpus,
> +					unsigned long flags);
>  
>  #else
>  
> @@ -54,6 +56,12 @@ static inline bool housekeeping_test_cpu(int cpu, enum hk_type type)
>  }
>  
>  static inline void housekeeping_init(void) { }
> +
> +static inline int housekeeping_exlude_isolcpus(struct cpumask *isolcpus,
> +					       unsigned long flags)
> +{
> +	return -EOPNOTSUPP;
> +}
>  #endif /* CONFIG_CPU_ISOLATION */
>  
>  static inline bool housekeeping_cpu(int cpu, enum hk_type type)
> diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c
> index 5891e715f00d..3018ba81eb65 100644
> --- a/kernel/sched/isolation.c
> +++ b/kernel/sched/isolation.c
> @@ -28,7 +28,16 @@ struct housekeeping {
>  	unsigned long flags;
>  };
>  
> -static struct housekeeping housekeeping;
> +static struct housekeeping housekeeping __read_mostly;
> +
> +/*
> + * Boot time housekeeping cpumask and flags
> + *
> + * If more than one of nohz_full or isolcpus are specified, the cpumask must
> + * be the same or the setup will fail.
> + */
> +static cpumask_var_t boot_hk_cpumask;
> +static unsigned long  boot_hk_flags;
>  
>  bool housekeeping_enabled(enum hk_type type)
>  {
> @@ -253,3 +262,104 @@ static int __init housekeeping_isolcpus_setup(char *str)
>  	return housekeeping_setup(str, flags);
>  }
>  __setup("isolcpus=", housekeeping_isolcpus_setup);
> +
> +/*
> + * Save bootup housekeeping cpumask and flags
> + */
> +static int housekeeping_save(void)
> +{
> +	enum hk_type type;
> +
> +	boot_hk_flags = housekeeping.flags;
> +	for_each_set_bit(type, &housekeeping.flags, HK_TYPE_MAX) {
> +		if (!alloc_cpumask_var(&boot_hk_cpumask, GFP_KERNEL))
> +			return -ENOMEM;

So this leaks and overwrites the mask for each flags?
Also only HK_TYPE_KERNEL_NOISE will be interesting.

> +		cpumask_copy(boot_hk_cpumask, housekeeping.cpumasks[type]);
> +		break;
> +	}
> +	return 0;
> +}

Should it be done on boot when housekeeping is allocated?

Thanks.

[PATCH v2 2/2] cgroup/cpuset: Exclude isolated CPUs from housekeeping CPU masks

[Waiman Long]

Call the newly introduced housekeeping_exlude_isolcpus() function to
exclude isolated CPUs from the selected housekeeping CPU masks. This
is in addition to the exclusion of isolated CPUs from the workqueue
unbound CPU mask.

Almost all the existing housekeeping cpumasks can be referenced at run
time. Right now all of them except HK_TYPE_TICK and HK_TYPE_MANAGED_IRQ
will be updated in the creation, deletion and modification of isolated
partitions. More investigation will be done on the other two types.

Signed-off-by: Waiman Long <longman@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
---
 kernel/cgroup/cpuset.c | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 8b40df89c3c1..d3cf4b2e44c7 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -233,6 +233,15 @@ static bool		have_boot_isolcpus;
 /* List of remote partition root children */
 static struct list_head remote_children;
 
+/*
+ * The following sets of housekeeping cpumasks can be referenced at run time
+ * and hence should be updated for CPU isolation.
+ */
+#define HOUSEKEEPING_FLAGS	(BIT(HK_TYPE_TIMER)  | BIT(HK_TYPE_RCU)  |\
+				 BIT(HK_TYPE_SCHED)  | BIT(HK_TYPE_MISC) |\
+				 BIT(HK_TYPE_DOMAIN) | BIT(HK_TYPE_WQ)   |\
+				 BIT(HK_TYPE_KTHREAD))
+
 /*
  * A flag to force sched domain rebuild at the end of an operation while
  * inhibiting it in the intermediate stages when set. Currently it is only
@@ -1588,7 +1597,15 @@ static bool partition_xcpus_del(int old_prs, struct cpuset *parent,
 	return isolcpus_updated;
 }
 
-static void update_unbound_workqueue_cpumask(bool isolcpus_updated)
+/**
+ * update_isolation_cpumasks - Update external isolation CPU masks
+ * @isolcpus_updated - @true if isolation CPU masks update needed
+ *
+ * The following external CPU masks will be updated if necessary:
+ * - workqueue unbound cpumask
+ * - housekeeping cpumasks
+ */
+static void update_isolation_cpumasks(bool isolcpus_updated)
 {
 	int ret;
 
@@ -1598,7 +1615,10 @@ static void update_unbound_workqueue_cpumask(bool isolcpus_updated)
 		return;
 
 	ret = workqueue_unbound_exclude_cpumask(isolated_cpus);
-	WARN_ON_ONCE(ret < 0);
+	if (WARN_ON_ONCE(ret < 0))
+		return;
+	ret = housekeeping_exlude_isolcpus(isolated_cpus, HOUSEKEEPING_FLAGS);
+	WARN_ON_ONCE((ret < 0) && (ret != -EOPNOTSUPP));
 }
 
 /**
@@ -1681,7 +1701,7 @@ static int remote_partition_enable(struct cpuset *cs, int new_prs,
 	isolcpus_updated = partition_xcpus_add(new_prs, NULL, tmp->new_cpus);
 	list_add(&cs->remote_sibling, &remote_children);
 	spin_unlock_irq(&callback_lock);
-	update_unbound_workqueue_cpumask(isolcpus_updated);
+	update_isolation_cpumasks(isolcpus_updated);
 
 	/*
 	 * Proprogate changes in top_cpuset's effective_cpus down the hierarchy.
@@ -1717,7 +1737,7 @@ static void remote_partition_disable(struct cpuset *cs, struct tmpmasks *tmp)
 		cs->prs_err = PERR_INVCPUS;
 	reset_partition_data(cs);
 	spin_unlock_irq(&callback_lock);
-	update_unbound_workqueue_cpumask(isolcpus_updated);
+	update_isolation_cpumasks(isolcpus_updated);
 
 	/*
 	 * Proprogate changes in top_cpuset's effective_cpus down the hierarchy.
@@ -1769,7 +1789,7 @@ static void remote_cpus_update(struct cpuset *cs, struct cpumask *newmask,
 	if (deleting)
 		isolcpus_updated += partition_xcpus_del(prs, NULL, tmp->delmask);
 	spin_unlock_irq(&callback_lock);
-	update_unbound_workqueue_cpumask(isolcpus_updated);
+	update_isolation_cpumasks(isolcpus_updated);
 
 	/*
 	 * Proprogate changes in top_cpuset's effective_cpus down the hierarchy.
@@ -2140,7 +2160,7 @@ static int update_parent_effective_cpumask(struct cpuset *cs, int cmd,
 		WARN_ON_ONCE(parent->nr_subparts < 0);
 	}
 	spin_unlock_irq(&callback_lock);
-	update_unbound_workqueue_cpumask(isolcpus_updated);
+	update_isolation_cpumasks(isolcpus_updated);
 
 	if ((old_prs != new_prs) && (cmd == partcmd_update))
 		update_partition_exclusive(cs, new_prs);
@@ -3193,7 +3213,7 @@ static int update_prstate(struct cpuset *cs, int new_prs)
 	else if (new_xcpus_state)
 		partition_xcpus_newstate(old_prs, new_prs, cs->effective_xcpus);
 	spin_unlock_irq(&callback_lock);
-	update_unbound_workqueue_cpumask(new_xcpus_state);
+	update_isolation_cpumasks(new_xcpus_state);
 
 	/* Force update if switching back to member */
 	update_cpumasks_hier(cs, &tmpmask, !new_prs ? HIER_CHECKALL : 0);
-- 
2.43.5