cpuset/isolation: Honour kthreads preferred affinity
Subsystems (17)
Frederic Weisbecker
maintainerv6 cover cpuset/isolation: Honour kthreads preferred affinity
Hi,
The kthread code was enhanced lately to provide an infrastructure which manages the preferred affinity of unbound kthreads (node or custom cpumask) against housekeeping constraints and CPU hotplug events.
One crucial missing piece is cpuset: when an isolated partition is created, deleted, or its CPUs updated, all the unbound kthreads in the top cpuset are affine to _all_ the non-isolated CPUs, possibly breaking their preferred affinity along the way
Solve this with performing the kthreads affinity update from cpuset to the kthreads consolidated relevant code instead so that preferred affinities are honoured.
The dispatch of the new cpumasks to workqueues and kthreads is performed by housekeeping, as per the nice Tejun's suggestion.
As a welcome side effect, HK_TYPE_DOMAIN then integrates both the set from isolcpus= and cpuset isolated partitions. Housekeeping cpumasks are now modifyable with specific synchronization. A big step toward making nohz_full= also mutable through cpuset in the future.
Changes since v5:
* Add more tags
* Fix leaked destroy_work_on_stack() (Zhang Qiao, Waiman Long)
* Comment schedule_drain_work() synchronization requirement (Tejun)
* s/Revert of/Inverse of (Waiman Long)
* Remove housekeeping_update() needless (for now) parameter (Chen Ridong)
* Don't propagate housekeeping_update() failures beyond allocations (Waiman Long)
* Whitespace cleanup (Waiman Long)
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
kthread/core-v6
HEAD: 811e87ca8a0a1e54eb5f23e71896cb97436cccdc
Happy new year,
Frederic
---
Frederic Weisbecker (33):
PCI: Prepare to protect against concurrent isolated cpuset change
cpu: Revert "cpu/hotplug: Prevent self deadlock on CPU hot-unplug"
memcg: Prepare to protect against concurrent isolated cpuset change
mm: vmstat: Prepare to protect against concurrent isolated cpuset change sched/isolation: Save boot defined domain flags
cpuset: Convert boot_hk_cpus to use HK_TYPE_DOMAIN_BOOT
driver core: cpu: Convert /sys/devices/system/cpu/isolated to use HK_TYPE_DOMAIN_BOOT
net: Keep ignoring isolated cpuset change
block: Protect against concurrent isolated cpuset change timers/migration: Prevent from lockdep false positive warning
cpu: Provide lockdep check for CPU hotplug lock write-held
cpuset: Provide lockdep check for cpuset lock held
sched/isolation: Convert housekeeping cpumasks to rcu pointers
cpuset: Update HK_TYPE_DOMAIN cpumask from cpuset
sched/isolation: Flush memcg workqueues on cpuset isolated partition change sched/isolation: Flush vmstat workqueues on cpuset isolated partition change
PCI: Flush PCI probe workqueue on cpuset isolated partition change
cpuset: Propagate cpuset isolation update to workqueue through housekeeping
cpuset: Propagate cpuset isolation update to timers through housekeeping timers/migration: Remove superfluous cpuset isolation test
cpuset: Remove cpuset_cpu_is_isolated()
sched/isolation: Remove HK_TYPE_TICK test from cpu_is_isolated()
PCI: Remove superfluous HK_TYPE_WQ check
kthread: Refine naming of affinity related fields
kthread: Include unbound kthreads in the managed affinity list
kthread: Include kthreadd to the managed affinity list
kthread: Rely on HK_TYPE_DOMAIN for preferred affinity management
sched: Switch the fallback task allowed cpumask to HK_TYPE_DOMAIN sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
kthread: Honour kthreads preferred affinity after cpuset changes
kthread: Comment on the purpose and placement of kthread_affine_node() call
kthread: Document kthread_affine_preferred()
doc: Add housekeeping documentation
Documentation/core-api/housekeeping.rst | 111 ++++++++++++++++++++++ Documentation/core-api/index.rst | 1 + arch/arm64/kernel/cpufeature.c | 18 +++- block/blk-mq.c | 6 +- drivers/base/cpu.c | 2 +- drivers/pci/pci-driver.c | 71 ++++++++++---- include/linux/cpu.h | 4 + include/linux/cpuhplock.h | 1 + include/linux/cpuset.h | 8 +- include/linux/kthread.h | 1 + include/linux/memcontrol.h | 4 + include/linux/mmu_context.h | 2 +- include/linux/pci.h | 3 + include/linux/percpu-rwsem.h | 1 + include/linux/sched/isolation.h | 16 +++- include/linux/vmstat.h | 2 + include/linux/workqueue.h | 2 +- init/Kconfig | 1 + kernel/cgroup/cpuset.c | 68 +++++++------- kernel/cpu.c | 42 ++++----- kernel/kthread.c | 160 +++++++++++++++++++++----------- kernel/sched/isolation.c | 141 +++++++++++++++++++++++----- kernel/sched/sched.h | 4 + kernel/time/timer_migration.c | 25 +++-- kernel/workqueue.c | 17 ++-- mm/memcontrol.c | 31 ++++++- mm/vmstat.c | 15 ++- net/core/net-sysfs.c | 2 +- 28 files changed, 557 insertions(+), 202 deletions(-)
Frederic Weisbecker
maintainerPATCH v6 1/33 PCI: Prepare to protect against concurrent isolated cpuset change
HK_TYPE_DOMAIN will soon integrate cpuset isolated partitions and therefore be made modifiable at runtime. Synchronize against the cpumask update using RCU.
The RCU locked section includes both the housekeeping CPU target election for the PCI probe work and the work enqueue.
This way the housekeeping update side will simply need to flush the pending related works after updating the housekeeping mask in order to make sure that no PCI work ever executes on an isolated CPU. This part will be handled in a subsequent patch.
--- drivers/pci/pci-driver.c | 47 ++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 9 deletions(-)
drivers/pci/pci-driver.c +38 -9
@@ -302,9 +302,8 @@ struct drv_dev_and_id {const struct pci_device_id *id; }; -static long local_pci_probe (void *_ddi) +static int local_pci_probe (struct drv_dev_and_id *ddi) { -struct drv_dev_and_id *ddi = _ddi;struct pci_dev *pci_dev = ddi->dev;struct pci_driver *pci_drv = ddi->drv;struct device *dev = &pci_dev->dev;
@@ -338,6 +337,19 @@ static long local_pci_probe(void *_ddi)return 0 ; } +struct pci_probe_arg { +struct drv_dev_and_id *ddi; +struct work_struct work; +int ret; +}; + +static void local_pci_probe_callback (struct work_struct *work) +{ + struct pci_probe_arg *arg = container_of(work, struct pci_probe_arg, work); + + arg->ret =local_pci_probe (arg->ddi); +} +static bool pci_physfn_is_probed (struct pci_dev *dev) {#ifdef CONFIG_PCI_IOV
@@ -362,34 +374,51 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, dev->is_probed =1 ;cpu_hotplug_disable (); -/* * Prevent nesting work_on_cpu() for the case where a Virtual Function * device is probed from work_on_cpu() of the Physical device. */ if (node <0 || node >=MAX_NUMNODES || !node_online (node) ||pci_physfn_is_probed (dev)) { - cpu = nr_cpu_ids; + error =local_pci_probe (&ddi); }else {cpumask_var_t wq_domain_mask; +struct pci_probe_arg arg = { .ddi = &ddi };if (!zalloc_cpumask_var (&wq_domain_mask,GFP_KERNEL )) { error = -ENOMEM ; goto out; } + +INIT_WORK_ONSTACK (&arg.work, local_pci_probe_callback); + +/* +* The target election and the enqueue of the work must be within +* the same RCU read side section so that when the workqueue pool +* is flushed after a housekeeping cpumask update, further readers +* are guaranteed to queue the probing work to the appropriate +* targets. +*/ +rcu_read_lock ();cpumask_and (wq_domain_mask,housekeeping_cpumask (HK_TYPE_WQ ),housekeeping_cpumask (HK_TYPE_DOMAIN )); cpu =cpumask_any_and (cpumask_of_node (node), wq_domain_mask); +if (cpu < nr_cpu_ids) { +schedule_work_on (cpu, &arg.work); +rcu_read_unlock (); +flush_work (&arg.work); + error = arg.ret; + }else { +rcu_read_unlock (); + error =local_pci_probe (&ddi); + } +free_cpumask_var (wq_domain_mask); +destroy_work_on_stack (&arg.work); } - -if (cpu < nr_cpu_ids) - error =work_on_cpu (cpu, local_pci_probe, &ddi); -else - error =local_pci_probe (&ddi); out: dev->is_probed =0 ;cpu_hotplug_enable ();
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 2/33 cpu: Revert "cpu/hotplug: Prevent self deadlock on CPU hot-unplug"
In reply to Frederic Weisbecker1) The commit:
2b8272ff4a70 ("cpu/hotplug: Prevent self deadlock on CPU hot-unplug")
was added to fix an issue where the hotplug control task (BP) was throttled between CPUHP_AP_IDLE_DEAD and CPUHP_HRTIMERS_PREPARE waiting in the hrtimer blindspot for the bandwidth callback queued in the dead CPU.
2) Later on, the commit:
38685e2a0476 ("cpu/hotplug: Don't offline the last non-isolated CPU")plugged on the target selection for the workqueue offloaded CPU down process to prevent from destroying the last CPU domain.
3) Finally:
5c0930ccaad5 ("hrtimers: Push pending hrtimers away from outgoing CPU earlier")
removed entirely the conditions for the race exposed and partially fixed in 1). The offloading of the CPU down process to a workqueue on another CPU then becomes unnecessary. But the last CPU belonging to scheduler domains must still remain online.
Therefore revert the now obsolete commit 2b8272ff4a70b866106ae13c36be7ecbef5d5da2 and move the housekeeping check under the cpu_hotplug_lock write held. Since HK_TYPE_DOMAIN will include both isolcpus and cpuset isolated partition, the hotplug lock will synchronize against concurrent cpuset partition updates.
--- kernel/cpu.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-)
kernel/cpu.c +11 -26
@@ -1410,6 +1410,16 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,cpus_write_lock (); +/* +* Keep at least one housekeeping cpu onlined to avoid generating +* an empty sched_domain span. +*/ +if (cpumask_any_and (cpu_online_mask, +housekeeping_cpumask (HK_TYPE_DOMAIN )) >= nr_cpu_ids) { + ret = -EBUSY ; + goto out; + } + cpuhp_tasks_frozen = tasks_frozen; prev_state =cpuhp_set_state (cpu, st, target);
@@ -1456,22 +1466,8 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,return ret; } -struct cpu_down_work { -unsigned int cpu; -enum cpuhp_state target; -}; - -static long __cpu_down_maps_locked (void *arg) -{ -struct cpu_down_work *work = arg; - -return _cpu_down (work->cpu,0 , work->target); -} -static int cpu_down_maps_locked (unsigned int cpu,enum cpuhp_state target) { -struct cpu_down_work work = { .cpu = cpu, .target = target, }; -/* * If the platform does not support hotplug, report it explicitly to * differentiate it from a transient offlining failure.
@@ -1480,18 +1476,7 @@ static int cpu_down_maps_locked(unsigned int cpu, enum cpuhp_state target)return -EOPNOTSUPP ;if (cpu_hotplug_disabled)return -EBUSY ; - -/* -* Ensure that the control task does not run on the to be offlined -* CPU to prevent a deadlock against cfs_b->period_timer. -* Also keep at least one housekeeping cpu onlined to avoid generating -* an empty sched_domain span. -*/ -for_each_cpu_and (cpu, cpu_online_mask,housekeeping_cpumask (HK_TYPE_DOMAIN )) { -if (cpu != work.cpu) -return work_on_cpu (cpu, __cpu_down_maps_locked, &work); - } -return -EBUSY ; +return _cpu_down (cpu,0 , target); }static int cpu_down (unsigned int cpu,enum cpuhp_state target)
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 3/33 memcg: Prepare to protect against concurrent isolated cpuset change
In reply to Frederic WeisbeckerThe HK_TYPE_DOMAIN housekeeping cpumask will soon be made modifiable at runtime. In order to synchronize against memcg workqueue to make sure that no asynchronous draining is pending or executing on a newly made isolated CPU, target and queue a drain work under the same RCU critical section.
Whenever housekeeping will update the HK_TYPE_DOMAIN cpumask, a memcg workqueue flush will also be issued in a further change to make sure that no work remains pending after a CPU has been made isolated.
--- mm/memcontrol.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
mm/memcontrol.c +17 -4
@@ -2003,6 +2003,19 @@ static bool is_memcg_drain_needed(struct memcg_stock_pcp *stock,return flush; } +static void schedule_drain_work (int cpu,struct work_struct *work) +{ +/* +* Protect housekeeping cpumask read and work enqueue together +* in the same RCU critical section so that later cpuset isolated +* partition update only need to wait for an RCU GP and flush the +* pending work on newly isolated CPUs. +*/ +guard (rcu)(); +if (!cpu_is_isolated (cpu)) +schedule_work_on (cpu, work); +} +/* * Drains all per-CPU charge caches for given root_memcg resp. subtree * of the hierarchy under it.
@@ -2032,8 +2045,8 @@ void drain_all_stock(struct mem_cgroup *root_memcg) &memcg_st->flags)) {if (cpu == curcpu)drain_local_memcg_stock (&memcg_st->work); -else if (!cpu_is_isolated (cpu)) -schedule_work_on (cpu, &memcg_st->work); +else +schedule_drain_work (cpu, &memcg_st->work); } if (!test_bit(FLUSHING_CACHED_CHARGE, &obj_st->flags) &&
@@ -2042,8 +2055,8 @@ void drain_all_stock(struct mem_cgroup *root_memcg) &obj_st->flags)) {if (cpu == curcpu)drain_local_obj_stock (&obj_st->work); -else if (!cpu_is_isolated (cpu)) -schedule_work_on (cpu, &obj_st->work); +else +schedule_drain_work (cpu, &obj_st->work); } }migrate_enable ();
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 4/33 mm: vmstat: Prepare to protect against concurrent isolated cpuset change
In reply to Frederic WeisbeckerThe HK_TYPE_DOMAIN housekeeping cpumask will soon be made modifiable at runtime. In order to synchronize against vmstat workqueue to make sure that no asynchronous vmstat work is pending or executing on a newly made isolated CPU, target and queue a vmstat work under the same RCU read side critical section.
Whenever housekeeping will update the HK_TYPE_DOMAIN cpumask, a vmstat workqueue flush will also be issued in a further change to make sure that no work remains pending after a CPU has been made isolated.
--- mm/vmstat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
mm/vmstat.c +6 -4
@@ -2144,11 +2144,13 @@ static void vmstat_shepherd(struct work_struct *w)* infrastructure ever noticing. Skip regular flushing from vmstat_shepherd * for all isolated CPUs to avoid interference with the isolated workload. */ -if (cpu_is_isolated (cpu)) -continue ; +scoped_guard (rcu) { +if (cpu_is_isolated (cpu)) +continue ; -if (!delayed_work_pending (dw) &&need_update (cpu)) -queue_delayed_work_on (cpu, mm_percpu_wq, dw,0 ); +if (!delayed_work_pending (dw) &&need_update (cpu)) +queue_delayed_work_on (cpu, mm_percpu_wq, dw,0 ); + }cond_resched (); }
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 5/33 sched/isolation: Save boot defined domain flags
In reply to Frederic WeisbeckerHK_TYPE_DOMAIN will soon integrate not only boot defined isolcpus= CPUs but also cpuset isolated partitions.
Housekeeping still needs a way to record what was initially passed to isolcpus= in order to keep these CPUs isolated after a cpuset isolated partition is modified or destroyed while containing some of them.
Create a new HK_TYPE_DOMAIN_BOOT to keep track of those.
--- include/linux/sched/isolation.h | 4 ++++ kernel/sched/isolation.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)
include/linux/sched/isolation.h +4 -0
@@ -7,8 +7,12 @@#include <linux/tick.h> enum hk_type { +/* Inverse of boot-time isolcpus= argument */ +HK_TYPE_DOMAIN_BOOT ,HK_TYPE_DOMAIN , +/* Inverse of boot-time isolcpus=managed_irq argument */ HK_TYPE_MANAGED_IRQ , +/* Inverse of boot-time nohz_full= or isolcpus=nohz arguments */ HK_TYPE_KERNEL_NOISE ,HK_TYPE_MAX ,
kernel/sched/isolation.c +3 -2
@@ -11,6 +11,7 @@#include "sched.h" enum hk_flags { +HK_FLAG_DOMAIN_BOOT =BIT (HK_TYPE_DOMAIN_BOOT ),HK_FLAG_DOMAIN =BIT (HK_TYPE_DOMAIN ),HK_FLAG_MANAGED_IRQ =BIT (HK_TYPE_MANAGED_IRQ ),HK_FLAG_KERNEL_NOISE =BIT (HK_TYPE_KERNEL_NOISE ),
@@ -239,7 +240,7 @@ static int __init housekeeping_isolcpus_setup(char *str)if (!strncmp (str,"domain," ,7 )) { str +=7 ; - flags |=HK_FLAG_DOMAIN ; + flags |=HK_FLAG_DOMAIN |HK_FLAG_DOMAIN_BOOT ;continue ; }
@@ -269,7 +270,7 @@ static int __init housekeeping_isolcpus_setup(char *str)/* Default behaviour for isolcpus without flags */ if (!flags) - flags |=HK_FLAG_DOMAIN ; + flags |=HK_FLAG_DOMAIN |HK_FLAG_DOMAIN_BOOT ;return housekeeping_setup (str, flags); }
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 6/33 cpuset: Convert boot_hk_cpus to use HK_TYPE_DOMAIN_BOOT
In reply to Frederic Weisbeckerboot_hk_cpus is an ad-hoc copy of HK_TYPE_DOMAIN_BOOT. Remove it and use the official version.
--- kernel/cgroup/cpuset.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-)
kernel/cgroup/cpuset.c +7 -15
@@ -88,12 +88,6 @@ static cpumask_var_t isolated_cpus;*/ static bool isolated_cpus_updating; -/* -* Housekeeping (HK_TYPE_DOMAIN) CPUs at boot -*/ -static cpumask_var_t boot_hk_cpus; -static bool have_boot_isolcpus; -/* * A flag to force sched domain rebuild at the end of an operation. * It can be set in
@@ -1453,15 +1447,16 @@ static bool isolated_cpus_can_update(struct cpumask *add_cpus,* @new_cpus: cpu mask * Return: true if there is conflict, false otherwise * -* CPUs outside of boot_hk_cpus, if defined, can only be used in an +* CPUs outside of HK_TYPE_DOMAIN_BOOT, if defined, can only be used in an * isolated partition. */ static bool prstate_housekeeping_conflict (int prstate,struct cpumask *new_cpus) { -if (!have_boot_isolcpus) +if (!housekeeping_enabled (HK_TYPE_DOMAIN_BOOT ))return false; -if ((prstate !=PRS_ISOLATED ) && !cpumask_subset (new_cpus, boot_hk_cpus)) +if ((prstate !=PRS_ISOLATED ) && + !cpumask_subset (new_cpus,housekeeping_cpumask (HK_TYPE_DOMAIN_BOOT )))return true;return false;
@@ -3892,12 +3887,9 @@ int __init cpuset_init(void)BUG_ON (!alloc_cpumask_var (&cpus_attach,GFP_KERNEL )); - have_boot_isolcpus =housekeeping_enabled (HK_TYPE_DOMAIN ); -if (have_boot_isolcpus) { -BUG_ON (!alloc_cpumask_var (&boot_hk_cpus,GFP_KERNEL )); -cpumask_copy (boot_hk_cpus,housekeeping_cpumask (HK_TYPE_DOMAIN )); -cpumask_andnot (isolated_cpus, cpu_possible_mask, boot_hk_cpus); - } +if (housekeeping_enabled (HK_TYPE_DOMAIN_BOOT )) +cpumask_andnot (isolated_cpus, cpu_possible_mask, +housekeeping_cpumask (HK_TYPE_DOMAIN_BOOT ));return 0 ; }
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 7/33 driver core: cpu: Convert /sys/devices/system/cpu/isolated to use HK_TYPE_DOMAIN_BOOT
In reply to Frederic WeisbeckerMake sure /sys/devices/system/cpu/isolated only prints what was passed through the isolcpus= parameter before HK_TYPE_DOMAIN will also integrate cpuset isolated partitions.
--- drivers/base/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/base/cpu.c +1 -1
@@ -291,7 +291,7 @@ static ssize_t print_cpus_isolated(struct device *dev,return -ENOMEM ;cpumask_andnot (isolated, cpu_possible_mask, -housekeeping_cpumask (HK_TYPE_DOMAIN )); +housekeeping_cpumask (HK_TYPE_DOMAIN_BOOT )); len =sysfs_emit (buf,"%*pbl\n" ,cpumask_pr_args (isolated));free_cpumask_var (isolated);
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 8/33 net: Keep ignoring isolated cpuset change
In reply to Frederic WeisbeckerRPS cpumask can be overriden through sysfs/syctl. The boot defined isolated CPUs are then excluded from that cpumask.
However HK_TYPE_DOMAIN will soon integrate cpuset isolated CPUs updates and the RPS infrastructure needs more thoughts to be able to propagate such changes and synchronize against them.
Keep handling only what was passed through "isolcpus=" for now.
--- net/core/net-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/net-sysfs.c +1 -1
@@ -1022,7 +1022,7 @@ static int netdev_rx_queue_set_rps_mask(struct netdev_rx_queue *queue,int rps_cpumask_housekeeping (struct cpumask *mask) {if (!cpumask_empty (mask)) { -cpumask_and (mask, mask,housekeeping_cpumask (HK_TYPE_DOMAIN )); +cpumask_and (mask, mask,housekeeping_cpumask (HK_TYPE_DOMAIN_BOOT ));cpumask_and (mask, mask,housekeeping_cpumask (HK_TYPE_WQ ));if (cpumask_empty (mask))return -EINVAL ;
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 9/33 block: Protect against concurrent isolated cpuset change
In reply to Frederic WeisbeckerThe block subsystem prevents running the workqueue to isolated CPUs, including those defined by cpuset isolated partitions. Since HK_TYPE_DOMAIN will soon contain both and be subject to runtime modifications, synchronize against housekeeping using the relevant lock.
For full support of cpuset changes, the block subsystem may need to propagate changes to isolated cpumask through the workqueue in the future.
--- block/blk-mq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
block/blk-mq.c +5 -1
@@ -4257,12 +4257,16 @@ static void blk_mq_map_swqueue(struct request_queue *q)/* * Rule out isolated CPUs from hctx->cpumask to avoid -* running block kworker on isolated CPUs +* running block kworker on isolated CPUs. +* FIXME: cpuset should propagate further changes to isolated CPUs +* here. */ +rcu_read_lock ();for_each_cpu (cpu, hctx->cpumask) {if (cpu_is_isolated (cpu))cpumask_clear_cpu (cpu, hctx->cpumask); } +rcu_read_unlock ();/* * Initialize batch roundrobin counts
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 10/33 timers/migration: Prevent from lockdep false positive warning
In reply to Frederic WeisbeckerTesting housekeeping_cpu() will soon require that either the RCU "lock" is held or the cpuset mutex.
When CPUs get isolated through cpuset, the change is propagated to timer migration such that isolation is also performed from the migration tree. However that propagation is done using workqueue which tests if the target is actually isolated before proceeding.
Lockdep doesn't know that the workqueue caller holds cpuset mutex and that it waits for the work, making the housekeeping cpumask read safe.
Shut down the future warning by removing this test. It is unecessary beyond hotplug, the workqueue is already targeted towards isolated CPUs.
--- kernel/time/timer_migration.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-)
kernel/time/timer_migration.c +15 -5
@@ -1497,7 +1497,7 @@ static int tmigr_clear_cpu_available(unsigned int cpu)return 0 ; } -static int tmigr_set_cpu_available (unsigned int cpu) +static int __tmigr_set_cpu_available (unsigned int cpu) {struct tmigr_cpu *tmc =this_cpu_ptr (&tmigr_cpu);
@@ -1505,9 +1505,6 @@ 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);
@@ -1523,6 +1520,14 @@ static int tmigr_set_cpu_available(unsigned int cpu)return 0 ; } +static int tmigr_set_cpu_available (unsigned int cpu) +{ +if (tmigr_is_isolated (cpu)) +return 0 ; + +return __tmigr_set_cpu_available (cpu); +} +static void tmigr_cpu_isolate (struct work_struct *ignored) {tmigr_clear_cpu_available (smp_processor_id ());
@@ -1530,7 +1535,12 @@ static void tmigr_cpu_isolate(struct work_struct *ignored)static void tmigr_cpu_unisolate (struct work_struct *ignored) { -tmigr_set_cpu_available (smp_processor_id ()); +/* +* Don't call tmigr_is_isolated() ->housekeeping_cpu() directly because +* the cpuset mutex is correctly held by the workqueue caller but lockdep +* doesn't know that. +*/ +__tmigr_set_cpu_available (smp_processor_id ()); }/**
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 11/33 cpu: Provide lockdep check for CPU hotplug lock write-held
In reply to Frederic Weisbeckercpuset modifies partitions, including isolated, while holding the cpu hotplug lock read-held.
This means that write-holding the CPU hotplug lock is safe to synchronize against housekeeping cpumask changes.
Provide a lockdep check to validate that.
--- include/linux/cpuhplock.h | 1 + include/linux/percpu-rwsem.h | 1 + kernel/cpu.c | 5 +++++ 3 files changed, 7 insertions(+)
include/linux/cpuhplock.h +1 -0
@@ -13,6 +13,7 @@struct device ;extern int lockdep_is_cpus_held (void ); +extern int lockdep_is_cpus_write_held (void );#ifdef CONFIG_HOTPLUG_CPU void cpus_write_lock (void );
include/linux/percpu-rwsem.h +1 -0
@@ -161,6 +161,7 @@ extern void percpu_free_rwsem(struct percpu_rw_semaphore *); __percpu_init_rwsem(sem, #sem, &rwsem_key); \ }) +#define percpu_rwsem_is_write_held (sem) lockdep_is_held_type(sem, 0)#define percpu_rwsem_is_held (sem) lockdep_is_held(sem)#define percpu_rwsem_assert_held (sem) lockdep_assert_held(sem)
kernel/cpu.c +5 -0
@@ -534,6 +534,11 @@ int lockdep_is_cpus_held(void) {return percpu_rwsem_is_held (&cpu_hotplug_lock); } + +int lockdep_is_cpus_write_held (void ) +{ +return percpu_rwsem_is_write_held (&cpu_hotplug_lock); +}#endif static void lockdep_acquire_cpus_lock (void )
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 12/33 cpuset: Provide lockdep check for cpuset lock held
In reply to Frederic Weisbeckercpuset modifies partitions, including isolated, while holding the cpuset mutex.
This means that holding the cpuset mutex is safe to synchronize against housekeeping cpumask changes.
Provide a lockdep check to validate that.
--- include/linux/cpuset.h | 2 ++ kernel/cgroup/cpuset.c | 7 +++++++ 2 files changed, 9 insertions(+)
include/linux/cpuset.h +2 -0
@@ -18,6 +18,8 @@#include <linux/mmu_context.h> #include <linux/jump_label.h> +extern bool lockdep_is_cpuset_held (void ); +#ifdef CONFIG_CPUSETS /*
kernel/cgroup/cpuset.c +7 -0
@@ -283,6 +283,13 @@ void cpuset_full_unlock(void)cpus_read_unlock (); } +#ifdef CONFIG_LOCKDEP +bool lockdep_is_cpuset_held (void ) +{ +return lockdep_is_held (&cpuset_mutex); +} +#endif +static DEFINE_SPINLOCK (callback_lock);void cpuset_callback_lock_irq (void )
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 13/33 sched/isolation: Convert housekeeping cpumasks to rcu pointers
In reply to Frederic WeisbeckerHK_TYPE_DOMAIN's cpumask will soon be made modifiable by cpuset. A synchronization mechanism is then needed to synchronize the updates with the housekeeping cpumask readers.
Turn the housekeeping cpumasks into RCU pointers. Once a housekeeping cpumask will be modified, the update side will wait for an RCU grace period and propagate the change to interested subsystem when deemed necessary.
--- kernel/sched/isolation.c | 58 +++++++++++++++++++++++++--------------- kernel/sched/sched.h | 1 + 2 files changed, 37 insertions(+), 22 deletions(-)
kernel/sched/isolation.c +36 -22
@@ -21,7 +21,7 @@ DEFINE_STATIC_KEY_FALSE(housekeeping_overridden);EXPORT_SYMBOL_GPL (housekeeping_overridden);struct housekeeping { -cpumask_var_t cpumasks[HK_TYPE_MAX ]; +struct cpumask __rcu *cpumasks[HK_TYPE_MAX ];unsigned long flags; };
@@ -33,17 +33,28 @@ bool housekeeping_enabled(enum hk_type type) }EXPORT_SYMBOL_GPL (housekeeping_enabled); +const struct cpumask *housekeeping_cpumask (enum hk_type type) +{ +if (static_branch_unlikely (&housekeeping_overridden)) { +if (housekeeping.flags &BIT (type)) { +return rcu_dereference_check (housekeeping.cpumasks[type],1 ); + } + } +return cpu_possible_mask; +} +EXPORT_SYMBOL_GPL (housekeeping_cpumask); +int housekeeping_any_cpu (enum hk_type type) {int cpu;if (static_branch_unlikely (&housekeeping_overridden)) {if (housekeeping.flags &BIT (type)) { - cpu =sched_numa_find_closest (housekeeping.cpumasks[type],smp_processor_id ()); + cpu =sched_numa_find_closest (housekeeping_cpumask (type),smp_processor_id ());if (cpu < nr_cpu_ids)return cpu; - cpu =cpumask_any_and_distribute (housekeeping.cpumasks[type], cpu_online_mask); + cpu =cpumask_any_and_distribute (housekeeping_cpumask (type), cpu_online_mask);if (likely (cpu < nr_cpu_ids))return cpu;/*
@@ -59,28 +70,18 @@ int housekeeping_any_cpu(enum hk_type type) }EXPORT_SYMBOL_GPL (housekeeping_any_cpu); -const struct cpumask *housekeeping_cpumask (enum hk_type type) -{ -if (static_branch_unlikely (&housekeeping_overridden)) -if (housekeeping.flags &BIT (type)) -return housekeeping.cpumasks[type]; -return cpu_possible_mask; -} -EXPORT_SYMBOL_GPL (housekeeping_cpumask); -void housekeeping_affine (struct task_struct *t,enum hk_type type) {if (static_branch_unlikely (&housekeeping_overridden))if (housekeeping.flags &BIT (type)) -set_cpus_allowed_ptr (t, housekeeping.cpumasks[type]); +set_cpus_allowed_ptr (t,housekeeping_cpumask (type)); }EXPORT_SYMBOL_GPL (housekeeping_affine);bool housekeeping_test_cpu (int cpu,enum hk_type type) { -if (static_branch_unlikely (&housekeeping_overridden)) -if (housekeeping.flags &BIT (type)) -return cpumask_test_cpu (cpu, housekeeping.cpumasks[type]); +if (static_branch_unlikely (&housekeeping_overridden) && housekeeping.flags &BIT (type)) +return cpumask_test_cpu (cpu,housekeeping_cpumask (type));return true; }EXPORT_SYMBOL_GPL (housekeeping_test_cpu);
@@ -96,20 +97,33 @@ void __init housekeeping_init(void)if (housekeeping.flags &HK_FLAG_KERNEL_NOISE )sched_tick_offload_init (); - +/* +* Realloc with a proper allocator so that any cpumask update +* can indifferently free the old version with kfree(). +*/ for_each_set_bit (type, &housekeeping.flags,HK_TYPE_MAX ) { +struct cpumask *omask, *nmask =kmalloc (cpumask_size (),GFP_KERNEL ); + +if (WARN_ON_ONCE (!nmask)) +return ; + + omask =rcu_dereference (housekeeping.cpumasks[type]); +/* We need at least one CPU to handle housekeeping work */ -WARN_ON_ONCE (cpumask_empty (housekeeping.cpumasks[type])); +WARN_ON_ONCE (cpumask_empty (omask)); +cpumask_copy (nmask, omask); +RCU_INIT_POINTER (housekeeping.cpumasks[type], nmask); +memblock_free (omask,cpumask_size ()); } }static void __init housekeeping_setup_type (enum hk_type type,cpumask_var_t housekeeping_staging) { +struct cpumask *mask =memblock_alloc_or_panic (cpumask_size (),SMP_CACHE_BYTES ); -alloc_bootmem_cpumask_var (&housekeeping.cpumasks[type]); -cpumask_copy (housekeeping.cpumasks[type], - housekeeping_staging); +cpumask_copy (mask, housekeeping_staging); +RCU_INIT_POINTER (housekeeping.cpumasks[type], mask); }static int __init housekeeping_setup (char *str,unsigned long flags)
@@ -162,7 +176,7 @@ static int __init housekeeping_setup(char *str, unsigned long flags)for_each_set_bit (type, &iter_flags,HK_TYPE_MAX ) {if (!cpumask_equal (housekeeping_staging, - housekeeping.cpumasks[type])) { +housekeeping_cpumask (type))) {pr_warn ("Housekeeping: nohz_full= must match isolcpus=\n" ); goto free_housekeeping_staging; }
kernel/sched/sched.h +1 -0
@@ -42,6 +42,7 @@#include <linux/ktime_api.h> #include <linux/lockdep_api.h> #include <linux/lockdep.h> +#include <linux/memblock.h> #include <linux/minmax.h> #include <linux/mm.h> #include <linux/module.h>
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 14/33 cpuset: Update HK_TYPE_DOMAIN cpumask from cpuset
In reply to Frederic WeisbeckerUntil now, HK_TYPE_DOMAIN used to only include boot defined isolated CPUs passed through isolcpus= boot option. Users interested in also knowing the runtime defined isolated CPUs through cpuset must use different APIs: cpuset_cpu_is_isolated(), cpu_is_isolated(), etc...
There are many drawbacks to that approach:
1) Most interested subsystems want to know about all isolated CPUs, not just those defined on boot time.
2) cpuset_cpu_is_isolated() / cpu_is_isolated() are not synchronized with concurrent cpuset changes.
3) Further cpuset modifications are not propagated to subsystems
Solve 1) and 2) and centralize all isolated CPUs within the HK_TYPE_DOMAIN housekeeping cpumask.
Subsystems can rely on RCU to synchronize against concurrent changes.
The propagation mentioned in 3) will be handled in further patches.
--- include/linux/sched/isolation.h | 7 ++++ kernel/cgroup/cpuset.c | 3 ++ kernel/sched/isolation.c | 73 ++++++++++++++++++++++++++++++--- kernel/sched/sched.h | 1 + 4 files changed, 78 insertions(+), 6 deletions(-)
include/linux/sched/isolation.h +7 -0
@@ -9,6 +9,11 @@enum hk_type {/* Inverse of boot-time isolcpus= argument */ HK_TYPE_DOMAIN_BOOT , +/* +* Same as HK_TYPE_DOMAIN_BOOT but also includes the +* inverse of cpuset isolated partitions. As such it +* is always a subset of HK_TYPE_DOMAIN_BOOT. +*/ HK_TYPE_DOMAIN ,/* Inverse of boot-time isolcpus=managed_irq argument */ HK_TYPE_MANAGED_IRQ ,
@@ -35,6 +40,7 @@ extern const struct cpumask *housekeeping_cpumask(enum hk_type type);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_init (void );#else
@@ -62,6 +68,7 @@ static inline bool housekeeping_test_cpu(int cpu, enum hk_type type) return true; } +static inline int housekeeping_update (struct cpumask *isol_mask) {return 0 ; }static inline void housekeeping_init (void ) { }#endif /* CONFIG_CPU_ISOLATION */
kernel/cgroup/cpuset.c +3 -0
@@ -1490,6 +1490,9 @@ static void update_isolation_cpumasks(void) ret =tmigr_isolated_exclude_cpumask (isolated_cpus);WARN_ON_ONCE (ret <0 ); + ret =housekeeping_update (isolated_cpus); +WARN_ON_ONCE (ret <0 ); + isolated_cpus_updating = false; }
kernel/sched/isolation.c +67 -6
97 lines not on this page · raw message
kernel/sched/sched.h +1 -0
@@ -30,6 +30,7 @@#include <linux/context_tracking.h> #include <linux/cpufreq.h> #include <linux/cpumask_api.h> +#include <linux/cpuset.h> #include <linux/ctype.h> #include <linux/file.h> #include <linux/fs_api.h>
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 15/33 sched/isolation: Flush memcg workqueues on cpuset isolated partition change
In reply to Frederic WeisbeckerThe HK_TYPE_DOMAIN housekeeping cpumask is now modifiable at runtime. In order to synchronize against memcg workqueue to make sure that no asynchronous draining is still pending or executing on a newly made isolated CPU, the housekeeping susbsystem must flush the memcg workqueues.
However the memcg workqueues can't be flushed easily since they are queued to the main per-CPU workqueue pool.
Solve this with creating a memcg specific pool and provide and use the appropriate flushing API.
--- include/linux/memcontrol.h | 4 ++++ kernel/sched/isolation.c | 2 ++ kernel/sched/sched.h | 1 + mm/memcontrol.c | 12 +++++++++++- 4 files changed, 18 insertions(+), 1 deletion(-)
include/linux/memcontrol.h +4 -0
@@ -1037,6 +1037,8 @@ static inline u64 cgroup_id_from_mm(struct mm_struct *mm) return id; } +void mem_cgroup_flush_workqueue (void ); +extern int mem_cgroup_init (void );#else /* CONFIG_MEMCG */
@@ -1436,6 +1438,8 @@ static inline u64 cgroup_id_from_mm(struct mm_struct *mm) return 0; } +static inline void mem_cgroup_flush_workqueue (void ) { } +static inline int mem_cgroup_init (void ) {return 0 ; }#endif /* CONFIG_MEMCG */
kernel/sched/isolation.c +2 -0
@@ -142,6 +142,8 @@ int housekeeping_update(struct cpumask *isol_mask)synchronize_rcu (); +mem_cgroup_flush_workqueue (); +kfree (old);return 0 ;
kernel/sched/sched.h +1 -0
@@ -44,6 +44,7 @@#include <linux/lockdep_api.h> #include <linux/lockdep.h> #include <linux/memblock.h> +#include <linux/memcontrol.h> #include <linux/minmax.h> #include <linux/mm.h> #include <linux/module.h>
mm/memcontrol.c +11 -1
@@ -96,6 +96,8 @@ static bool cgroup_memory_nokmem __ro_after_init;/* BPF memory accounting disabled? */ static bool cgroup_memory_nobpf__ro_after_init ; +static struct workqueue_struct *memcg_wq__ro_after_init ; +static struct kmem_cache *memcg_cachep;static struct kmem_cache *memcg_pn_cachep;
@@ -2013,7 +2015,7 @@ static void schedule_drain_work(int cpu, struct work_struct *work)*/ guard (rcu)();if (!cpu_is_isolated (cpu)) -schedule_work_on (cpu, work); +queue_work_on (cpu, memcg_wq, work); }/*
@@ -5125,6 +5127,11 @@ void mem_cgroup_sk_uncharge(const struct sock *sk, unsigned int nr_pages)refill_stock (memcg, nr_pages); } +void mem_cgroup_flush_workqueue (void ) +{ +flush_workqueue (memcg_wq); +} +static int __init cgroup_memory (char *s) {char *token;
@@ -5167,6 +5174,9 @@ int __init mem_cgroup_init(void)cpuhp_setup_state_nocalls (CPUHP_MM_MEMCQ_DEAD ,"mm/memctrl:dead" ,NULL , memcg_hotplug_cpu_dead); + memcg_wq =alloc_workqueue ("memcg" ,WQ_PERCPU ,0 ); +WARN_ON (!memcg_wq); +for_each_possible_cpu (cpu) {INIT_WORK (&per_cpu_ptr (&memcg_stock, cpu)->work, drain_local_memcg_stock);
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 16/33 sched/isolation: Flush vmstat workqueues on cpuset isolated partition change
In reply to Frederic WeisbeckerThe HK_TYPE_DOMAIN housekeeping cpumask is now modifiable at runtime. In order to synchronize against vmstat workqueue to make sure that no asynchronous vmstat work is still pending or executing on a newly made isolated CPU, the housekeeping susbsystem must flush the vmstat workqueues.
This involves flushing the whole mm_percpu_wq workqueue, shared with LRU drain, introducing here a welcome side effect.
--- include/linux/vmstat.h | 2 ++ kernel/sched/isolation.c | 1 + kernel/sched/sched.h | 1 + mm/vmstat.c | 5 +++++ 4 files changed, 9 insertions(+)
include/linux/vmstat.h +2 -0
@@ -303,6 +303,7 @@ int calculate_pressure_threshold(struct zone *zone);int calculate_normal_threshold (struct zone *zone);void set_pgdat_percpu_threshold (pg_data_t *pgdat,int (*calculate_pressure)(struct zone *)); +void vmstat_flush_workqueue (void );#else /* CONFIG_SMP */ /*
@@ -403,6 +404,7 @@ static inline void __dec_node_page_state(struct page *page,static inline void refresh_zone_stat_thresholds (void ) { }static inline void cpu_vm_stats_fold (int cpu) { }static inline void quiet_vmstat (void ) { } +static inline void vmstat_flush_workqueue (void ) { }static inline void drain_zonestat (struct zone *zone,struct per_cpu_zonestat *pzstats) { }
kernel/sched/isolation.c +1 -0
@@ -143,6 +143,7 @@ int housekeeping_update(struct cpumask *isol_mask)synchronize_rcu ();mem_cgroup_flush_workqueue (); +vmstat_flush_workqueue ();kfree (old);
kernel/sched/sched.h +1 -0
@@ -68,6 +68,7 @@#include <linux/types.h> #include <linux/u64_stats_sync_api.h> #include <linux/uaccess.h> +#include <linux/vmstat.h> #include <linux/wait_api.h> #include <linux/wait_bit.h> #include <linux/workqueue_api.h>
mm/vmstat.c +5 -0
@@ -2124,6 +2124,11 @@ static void vmstat_shepherd(struct work_struct *w); static DECLARE_DEFERRABLE_WORK(shepherd, vmstat_shepherd); +void vmstat_flush_workqueue (void ) +{ +flush_workqueue (mm_percpu_wq); +} +static void vmstat_shepherd (struct work_struct *w) {int cpu;
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 17/33 PCI: Flush PCI probe workqueue on cpuset isolated partition change
In reply to Frederic WeisbeckerThe HK_TYPE_DOMAIN housekeeping cpumask is now modifiable at runtime. In order to synchronize against PCI probe works and make sure that no asynchronous probing is still pending or executing on a newly isolated CPU, the housekeeping subsystem must flush the PCI probe works.
However the PCI probe works can't be flushed easily since they are queued to the main per-CPU workqueue pool.
Solve this with creating a PCI probe-specific pool and provide and use the appropriate flushing API.
--- drivers/pci/pci-driver.c | 17 ++++++++++++++++- include/linux/pci.h | 3 +++ kernel/sched/isolation.c | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-)
drivers/pci/pci-driver.c +16 -1
@@ -337,6 +337,8 @@ static int local_pci_probe(struct drv_dev_and_id *ddi)return 0 ; } +static struct workqueue_struct *pci_probe_wq; +struct pci_probe_arg {struct drv_dev_and_id *ddi;struct work_struct work;
@@ -407,7 +409,11 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, cpu =cpumask_any_and (cpumask_of_node (node), wq_domain_mask);if (cpu < nr_cpu_ids) { -schedule_work_on (cpu, &arg.work); +struct workqueue_struct *wq = pci_probe_wq; + +if (WARN_ON_ONCE (!wq)) + wq = system_percpu_wq; +queue_work_on (cpu, wq, &arg.work);rcu_read_unlock ();flush_work (&arg.work); error = arg.ret;
@@ -425,6 +431,11 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,return error; } +void pci_probe_flush_workqueue (void ) +{ +flush_workqueue (pci_probe_wq); +} +/** * __pci_device_probe - check if a driver wants to claim a specific PCI device * @drv: driver to call to check if it wants the PCI device
@@ -1762,6 +1773,10 @@ static int __init pci_driver_init(void) {int ret; + pci_probe_wq =alloc_workqueue ("sync_wq" ,WQ_PERCPU ,0 ); +if (!pci_probe_wq) +return -ENOMEM ; + ret =bus_register (&pci_bus_type);if (ret)return ret;
include/linux/pci.h +3 -0
@@ -1206,6 +1206,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources);int pci_host_probe (struct pci_host_bridge *bridge); +void pci_probe_flush_workqueue (void );int pci_bus_insert_busn_res (struct pci_bus *b,int bus,int busmax);int pci_bus_update_busn_res_end (struct pci_bus *b,int busmax);void pci_bus_release_busn_res (struct pci_bus *b);
@@ -2079,6 +2080,8 @@ static inline int pci_has_flag(int flag) { return 0; } _PCI_NOP_ALL(read, *) _PCI_NOP_ALL(write,) +static inline void pci_probe_flush_workqueue(void) { } + static inline struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from)
kernel/sched/isolation.c +2 -0
@@ -8,6 +8,7 @@* */ #include <linux/sched/isolation.h> +#include <linux/pci.h> #include "sched.h" enum hk_flags {
@@ -142,6 +143,7 @@ int housekeeping_update(struct cpumask *isol_mask)synchronize_rcu (); +pci_probe_flush_workqueue ();mem_cgroup_flush_workqueue ();vmstat_flush_workqueue ();
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 18/33 cpuset: Propagate cpuset isolation update to workqueue through housekeeping
In reply to Frederic WeisbeckerUntil now, cpuset would propagate isolated partition changes to workqueues so that unbound workers get properly reaffined.
Since housekeeping now centralizes, synchronize and propagates isolation cpumask changes, perform the work from that subsystem for consolidation and consistency purposes.
For simplification purpose, the target function is adapted to take the new housekeeping mask instead of the isolated mask.
--- include/linux/workqueue.h | 2 +- init/Kconfig | 1 + kernel/cgroup/cpuset.c | 9 +++------ kernel/sched/isolation.c | 3 +++ kernel/workqueue.c | 17 ++++++++++------- 5 files changed, 18 insertions(+), 14 deletions(-)
include/linux/workqueue.h +1 -1
@@ -588,7 +588,7 @@ struct workqueue_attrs *alloc_workqueue_attrs_noprof(void);void free_workqueue_attrs (struct workqueue_attrs *attrs);int apply_workqueue_attrs (struct workqueue_struct *wq,const struct workqueue_attrs *attrs); -extern int workqueue_unbound_exclude_cpumask (cpumask_var_t cpumask); +extern int workqueue_unbound_housekeeping_update (const struct cpumask *hk);extern bool queue_work_on (int cpu,struct workqueue_struct *wq,struct work_struct *work);
init/Kconfig +1 -0
@@ -1254,6 +1254,7 @@ config CPUSETS bool "Cpuset controller" depends on SMP select UNION_FIND + select CPU_ISOLATION help This option will let you create and manage CPUSETs which allow dynamically partitioning a system into sets of CPUs and
kernel/cgroup/cpuset.c +3 -6
@@ -1484,15 +1484,12 @@ static void update_isolation_cpumasks(void)lockdep_assert_cpus_held (); - ret =workqueue_unbound_exclude_cpumask (isolated_cpus); -WARN_ON_ONCE (ret <0 ); - - ret =tmigr_isolated_exclude_cpumask (isolated_cpus); -WARN_ON_ONCE (ret <0 ); - ret =housekeeping_update (isolated_cpus);WARN_ON_ONCE (ret <0 ); + ret =tmigr_isolated_exclude_cpumask (isolated_cpus); +WARN_ON_ONCE (ret <0 ); + isolated_cpus_updating = false; }
kernel/sched/isolation.c +3 -0
@@ -121,6 +121,7 @@ EXPORT_SYMBOL_GPL(housekeeping_test_cpu);int housekeeping_update (struct cpumask *isol_mask) {struct cpumask *trial, *old =NULL ; +int err; trial =kmalloc (cpumask_size (),GFP_KERNEL );if (!trial)
@@ -146,6 +147,8 @@ int housekeeping_update(struct cpumask *isol_mask)pci_probe_flush_workqueue ();mem_cgroup_flush_workqueue ();vmstat_flush_workqueue (); + err =workqueue_unbound_housekeeping_update (housekeeping_cpumask (HK_TYPE_DOMAIN )); +WARN_ON_ONCE (err <0 );kfree (old);
kernel/workqueue.c +10 -7
@@ -6959,13 +6959,16 @@ static int workqueue_apply_unbound_cpumask(const cpumask_var_t unbound_cpumask) }/** -* workqueue_unbound_exclude_cpumask - Exclude given CPUs from unbound cpumask -* @exclude_cpumask: the cpumask to be excluded from wq_unbound_cpumask +* workqueue_unbound_housekeeping_update - Propagate housekeeping cpumask update +* @hk: the new housekeeping cpumask * -* This function can be called from cpuset code to provide a set of isolated -* CPUs that should be excluded from wq_unbound_cpumask. +* Update the unbound workqueue cpumask on top of the new housekeeping cpumask such +* that the effective unbound affinity is the intersection of the new housekeeping +* with the requested affinity set via nohz_full=/isolcpus= or sysfs. +* +* Return: 0 on success and -errno on failure. */ -int workqueue_unbound_exclude_cpumask (cpumask_var_t exclude_cpumask) +int workqueue_unbound_housekeeping_update (const struct cpumask *hk) {cpumask_var_t cpumask;int ret =0 ;
@@ -6981,14 +6984,14 @@ int workqueue_unbound_exclude_cpumask(cpumask_var_t exclude_cpumask)* (HK_TYPE_WQ ∩ HK_TYPE_DOMAIN) house keeping mask and rewritten * by any subsequent write to workqueue/cpumask sysfs file. */ -if (!cpumask_andnot (cpumask, wq_requested_unbound_cpumask, exclude_cpumask)) +if (!cpumask_and (cpumask, wq_requested_unbound_cpumask, hk))cpumask_copy (cpumask, wq_requested_unbound_cpumask);if (!cpumask_equal (cpumask, wq_unbound_cpumask)) ret =workqueue_apply_unbound_cpumask (cpumask);/* Save the current isolated cpumask & export it via sysfs */ if (!ret) -cpumask_copy (wq_isolated_cpumask, exclude_cpumask); +cpumask_andnot (wq_isolated_cpumask, cpu_possible_mask, hk);mutex_unlock (&wq_pool_mutex);free_cpumask_var (cpumask);
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 19/33 cpuset: Propagate cpuset isolation update to timers through housekeeping
In reply to Frederic WeisbeckerUntil now, cpuset would propagate isolated partition changes to timer migration so that unbound timers don't get migrated to isolated CPUs.
Since housekeeping now centralizes, synchronize and propagates isolation cpumask changes, perform the work from that subsystem for consolidation and consistency purposes.
--- kernel/cgroup/cpuset.c | 3 --- kernel/sched/isolation.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-)
kernel/cgroup/cpuset.c +0 -3
@@ -1487,9 +1487,6 @@ static void update_isolation_cpumasks(void) ret =housekeeping_update (isolated_cpus);WARN_ON_ONCE (ret <0 ); - ret =tmigr_isolated_exclude_cpumask (isolated_cpus); -WARN_ON_ONCE (ret <0 ); - isolated_cpus_updating = false; }
kernel/sched/isolation.c +4 -0
@@ -147,9 +147,13 @@ int housekeeping_update(struct cpumask *isol_mask)pci_probe_flush_workqueue ();mem_cgroup_flush_workqueue ();vmstat_flush_workqueue (); + err =workqueue_unbound_housekeeping_update (housekeeping_cpumask (HK_TYPE_DOMAIN ));WARN_ON_ONCE (err <0 ); + err =tmigr_isolated_exclude_cpumask (isol_mask); +WARN_ON_ONCE (err <0 ); +kfree (old);return 0 ;
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 20/33 timers/migration: Remove superfluous cpuset isolation test
In reply to Frederic WeisbeckerCpuset isolated partitions are now included in HK_TYPE_DOMAIN. Testing if a CPU is part of an isolated partition alone is now useless.
Remove the superflous test.
--- kernel/time/timer_migration.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
kernel/time/timer_migration.c +2 -3
@@ -466,9 +466,8 @@ 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 ); +return (!housekeeping_cpu (cpu,HK_TYPE_DOMAIN ) && +housekeeping_cpu (cpu,HK_TYPE_KERNEL_NOISE )); }/*
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 21/33 cpuset: Remove cpuset_cpu_is_isolated()
In reply to Frederic WeisbeckerThe set of cpuset isolated CPUs is now included in HK_TYPE_DOMAIN housekeeping cpumask. There is no usecase left interested in just checking what is isolated by cpuset and not by the isolcpus= kernel boot parameter.
--- include/linux/cpuset.h | 6 ------ include/linux/sched/isolation.h | 4 +--- kernel/cgroup/cpuset.c | 12 ------------ 3 files changed, 1 insertion(+), 21 deletions(-)
include/linux/cpuset.h +0 -6
@@ -79,7 +79,6 @@ extern void cpuset_unlock(void);extern void cpuset_cpus_allowed_locked (struct task_struct *p,struct cpumask *mask);extern void cpuset_cpus_allowed (struct task_struct *p,struct cpumask *mask);extern bool cpuset_cpus_allowed_fallback (struct task_struct *p); -extern bool cpuset_cpu_is_isolated (int cpu);extern nodemask_t cpuset_mems_allowed (struct task_struct *p);#define cpuset_current_mems_allowed (current->mems_allowed)void cpuset_init_current_mems_allowed (void );
@@ -215,11 +214,6 @@ static inline bool cpuset_cpus_allowed_fallback(struct task_struct *p)return false; } -static inline bool cpuset_cpu_is_isolated (int cpu) -{ -return false; -} -static inline nodemask_t cpuset_mems_allowed (struct task_struct *p) {return node_possible_map;
include/linux/sched/isolation.h +1 -3
@@ -2,7 +2,6 @@#define _LINUX_SCHED_ISOLATION_H#include <linux/cpumask.h> -#include <linux/cpuset.h> #include <linux/init.h> #include <linux/tick.h>
@@ -84,8 +83,7 @@ static inline bool housekeeping_cpu(int cpu, enum hk_type type)static inline bool cpu_is_isolated (int cpu) {return !housekeeping_test_cpu (cpu,HK_TYPE_DOMAIN ) || - !housekeeping_test_cpu (cpu,HK_TYPE_TICK ) || -cpuset_cpu_is_isolated (cpu); + !housekeeping_test_cpu (cpu,HK_TYPE_TICK ); }#endif /* _LINUX_SCHED_ISOLATION_H */
kernel/cgroup/cpuset.c +0 -12
@@ -29,7 +29,6 @@#include <linux/mempolicy.h> #include <linux/mm.h> #include <linux/memory.h> -#include <linux/export.h> #include <linux/rcupdate.h> #include <linux/sched.h> #include <linux/sched/deadline.h>
@@ -1490,17 +1489,6 @@ static void update_isolation_cpumasks(void) isolated_cpus_updating = false; } -/** -* cpuset_cpu_is_isolated - Check if the given CPU is isolated -* @cpu: the CPU number to be checked -* Return: true if CPU is used in an isolated partition, false otherwise -*/ -bool cpuset_cpu_is_isolated (int cpu) -{ -return cpumask_test_cpu (cpu, isolated_cpus); -} -EXPORT_SYMBOL_GPL (cpuset_cpu_is_isolated); -/** * rm_siblings_excl_cpus - Remove exclusive CPUs that are used by sibling cpusets * @parent: Parent cpuset containing all siblings
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 22/33 sched/isolation: Remove HK_TYPE_TICK test from cpu_is_isolated()
In reply to Frederic WeisbeckerIt doesn't make sense to use nohz_full without also isolating the related CPUs from the domain topology, either through the use of isolcpus= or cpuset isolated partitions.
And now HK_TYPE_DOMAIN includes all kinds of domain isolated CPUs.
This means that HK_TYPE_KERNEL_NOISE (of which HK_TYPE_TICK is only an alias) should always be a subset of HK_TYPE_DOMAIN.
Therefore if a CPU is not HK_TYPE_DOMAIN, it shouldn't be HK_TYPE_KERNEL_NOISE either. Testing the former is then enough.
Simplify cpu_is_isolated() accordingly.
--- include/linux/sched/isolation.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/sched/isolation.h +1 -2
@@ -82,8 +82,7 @@ static inline bool housekeeping_cpu(int cpu, enum hk_type type)static inline bool cpu_is_isolated (int cpu) { -return !housekeeping_test_cpu (cpu,HK_TYPE_DOMAIN ) || - !housekeeping_test_cpu (cpu,HK_TYPE_TICK ); +return !housekeeping_test_cpu (cpu,HK_TYPE_DOMAIN ); }#endif /* _LINUX_SCHED_ISOLATION_H */
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 23/33 PCI: Remove superfluous HK_TYPE_WQ check
In reply to Frederic WeisbeckerIt doesn't make sense to use nohz_full without also isolating the related CPUs from the domain topology, either through the use of isolcpus= or cpuset isolated partitions.
And now HK_TYPE_DOMAIN includes all kinds of domain isolated CPUs.
This means that HK_TYPE_KERNEL_NOISE (of which HK_TYPE_WQ is only an alias) should always be a subset of HK_TYPE_DOMAIN.
Therefore sane configurations verify:
HK_TYPE_KERNEL_NOISE | HK_TYPE_DOMAIN == HK_TYPE_DOMAIN
Simplify the PCI probe target election accordingly.
--- drivers/pci/pci-driver.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/pci/pci-driver.c +3 -14
@@ -384,16 +384,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, pci_physfn_is_probed(dev)) { error = local_pci_probe(&ddi); } else { -cpumask_var_t wq_domain_mask;struct pci_probe_arg arg = { .ddi = &ddi }; -if (!zalloc_cpumask_var (&wq_domain_mask,GFP_KERNEL )) { - error = -ENOMEM ; - goto out; - } -INIT_WORK_ONSTACK (&arg.work, local_pci_probe_callback); -/* * The target election and the enqueue of the work must be within * the same RCU read side section so that when the workqueue pool
@@ -402,12 +395,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,* targets. */ rcu_read_lock (); -cpumask_and (wq_domain_mask, -housekeeping_cpumask (HK_TYPE_WQ ), -housekeeping_cpumask (HK_TYPE_DOMAIN )); - cpu =cpumask_any_and (cpumask_of_node (node), - wq_domain_mask); +housekeeping_cpumask (HK_TYPE_DOMAIN )); +if (cpu < nr_cpu_ids) {struct workqueue_struct *wq = pci_probe_wq;
@@ -422,10 +412,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, error =local_pci_probe (&ddi); } -free_cpumask_var (wq_domain_mask);destroy_work_on_stack (&arg.work); } -out: + dev->is_probed =0 ;cpu_hotplug_enable ();return error;
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 24/33 kthread: Refine naming of affinity related fields
In reply to Frederic WeisbeckerThe kthreads preferred affinity related fields use "hotplug" as the base of their naming because the affinity management was initially deemed to deal with CPU hotplug.
The scope of this role is going to broaden now and also deal with cpuset isolated partition updates.
Switch the naming accordingly.
--- kernel/kthread.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)
kernel/kthread.c +19 -19
@@ -35,8 +35,8 @@ static DEFINE_SPINLOCK(kthread_create_lock);static LIST_HEAD (kthread_create_list);struct task_struct *kthreadd_task; -static LIST_HEAD (kthreads_hotplug); -static DEFINE_MUTEX (kthreads_hotplug_lock); +static LIST_HEAD (kthread_affinity_list); +static DEFINE_MUTEX (kthread_affinity_lock);struct kthread_create_info {
@@ -69,7 +69,7 @@ struct kthread {/* To store the full name if task comm is truncated. */ char *full_name;struct task_struct *task; -struct list_head hotplug_node; +struct list_head affinity_node;struct cpumask *preferred_affinity; };
@@ -128,7 +128,7 @@ bool set_kthread_struct(struct task_struct *p)init_completion (&kthread->exited);init_completion (&kthread->parked); -INIT_LIST_HEAD (&kthread->hotplug_node); +INIT_LIST_HEAD (&kthread->affinity_node); p->vfork_done = &kthread->exited; kthread->task = p;
@@ -323,10 +323,10 @@ void __noreturn kthread_exit(long result) {struct kthread *kthread =to_kthread (current); kthread->result = result; -if (!list_empty (&kthread->hotplug_node)) { -mutex_lock (&kthreads_hotplug_lock); -list_del (&kthread->hotplug_node); -mutex_unlock (&kthreads_hotplug_lock); +if (!list_empty (&kthread->affinity_node)) { +mutex_lock (&kthread_affinity_lock); +list_del (&kthread->affinity_node); +mutex_unlock (&kthread_affinity_lock);if (kthread->preferred_affinity) {kfree (kthread->preferred_affinity);
@@ -390,9 +390,9 @@ static void kthread_affine_node(void)return ; } -mutex_lock (&kthreads_hotplug_lock); -WARN_ON_ONCE (!list_empty (&kthread->hotplug_node)); -list_add_tail (&kthread->hotplug_node, &kthreads_hotplug); +mutex_lock (&kthread_affinity_lock); +WARN_ON_ONCE (!list_empty (&kthread->affinity_node)); +list_add_tail (&kthread->affinity_node, &kthread_affinity_list);/* * The node cpumask is racy when read from kthread() but: * - a racing CPU going down will either fail on the subsequent
@@ -402,7 +402,7 @@ static void kthread_affine_node(void)*/ kthread_fetch_affinity (kthread, affinity);set_cpus_allowed_ptr (current, affinity); -mutex_unlock (&kthreads_hotplug_lock); +mutex_unlock (&kthread_affinity_lock);free_cpumask_var (affinity); }
@@ -873,16 +873,16 @@ int kthread_affine_preferred(struct task_struct *p, const struct cpumask *mask) goto out; } -mutex_lock (&kthreads_hotplug_lock); +mutex_lock (&kthread_affinity_lock);cpumask_copy (kthread->preferred_affinity, mask); -WARN_ON_ONCE (!list_empty (&kthread->hotplug_node)); -list_add_tail (&kthread->hotplug_node, &kthreads_hotplug); +WARN_ON_ONCE (!list_empty (&kthread->affinity_node)); +list_add_tail (&kthread->affinity_node, &kthread_affinity_list);kthread_fetch_affinity (kthread, affinity); scoped_guard (raw_spinlock_irqsave, &p->pi_lock)set_cpus_allowed_force (p, affinity); -mutex_unlock (&kthreads_hotplug_lock); +mutex_unlock (&kthread_affinity_lock); out:free_cpumask_var (affinity);
@@ -903,9 +903,9 @@ static int kthreads_online_cpu(unsigned int cpu)struct kthread *k;int ret; -guard (mutex)(&kthreads_hotplug_lock); +guard (mutex)(&kthread_affinity_lock); -if (list_empty (&kthreads_hotplug)) +if (list_empty (&kthread_affinity_list))return 0 ;if (!zalloc_cpumask_var (&affinity,GFP_KERNEL ))
@@ -913,7 +913,7 @@ static int kthreads_online_cpu(unsigned int cpu) ret =0 ; -list_for_each_entry (k, &kthreads_hotplug, hotplug_node) { +list_for_each_entry (k, &kthread_affinity_list, affinity_node) {if (WARN_ON_ONCE ((k->task->flags &PF_NO_SETAFFINITY ) ||kthread_is_per_cpu (k->task))) { ret = -EINVAL ;
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 25/33 kthread: Include unbound kthreads in the managed affinity list
In reply to Frederic WeisbeckerThe managed affinity list currently contains only unbound kthreads that have affinity preferences. Unbound kthreads globally affine by default are outside of the list because their affinity is automatically managed by the scheduler (through the fallback housekeeping mask) and by cpuset.
However in order to preserve the preferred affinity of kthreads, cpuset will delegate the isolated partition update propagation to the housekeeping and kthread code.
Prepare for that with including all unbound kthreads in the managed affinity list.
--- kernel/kthread.c | 70 ++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 29 deletions(-)
kernel/kthread.c +41 -29
@@ -365,9 +365,10 @@ static void kthread_fetch_affinity(struct kthread *kthread, struct cpumask *cpumif (kthread->preferred_affinity) { pref = kthread->preferred_affinity; }else { -if (WARN_ON_ONCE (kthread->node ==NUMA_NO_NODE )) -return ; - pref =cpumask_of_node (kthread->node); +if (kthread->node ==NUMA_NO_NODE ) + pref =housekeeping_cpumask (HK_TYPE_KTHREAD ); +else + pref =cpumask_of_node (kthread->node); }cpumask_and (cpumask, pref,housekeeping_cpumask (HK_TYPE_KTHREAD ));
@@ -380,32 +381,29 @@ static void kthread_affine_node(void)struct kthread *kthread =to_kthread (current);cpumask_var_t affinity; -WARN_ON_ONCE (kthread_is_per_cpu (current)); +if (WARN_ON_ONCE (kthread_is_per_cpu (current))) +return ; -if (kthread->node ==NUMA_NO_NODE ) { -housekeeping_affine (current,HK_TYPE_KTHREAD ); - }else { -if (!zalloc_cpumask_var (&affinity,GFP_KERNEL )) { -WARN_ON_ONCE (1 ); -return ; - } - -mutex_lock (&kthread_affinity_lock); -WARN_ON_ONCE (!list_empty (&kthread->affinity_node)); -list_add_tail (&kthread->affinity_node, &kthread_affinity_list); -/* -* The node cpumask is racy when read from kthread() but: -* - a racing CPU going down will either fail on the subsequent -* call to set_cpus_allowed_ptr() or be migrated to housekeepers -* afterwards by the scheduler. -* - a racing CPU going up will be handled by kthreads_online_cpu() -*/ -kthread_fetch_affinity (kthread, affinity); -set_cpus_allowed_ptr (current, affinity); -mutex_unlock (&kthread_affinity_lock); - -free_cpumask_var (affinity); +if (!zalloc_cpumask_var (&affinity,GFP_KERNEL )) { +WARN_ON_ONCE (1 ); +return ; } + +mutex_lock (&kthread_affinity_lock); +WARN_ON_ONCE (!list_empty (&kthread->affinity_node)); +list_add_tail (&kthread->affinity_node, &kthread_affinity_list); +/* +* The node cpumask is racy when read from kthread() but: +* - a racing CPU going down will either fail on the subsequent +* call to set_cpus_allowed_ptr() or be migrated to housekeepers +* afterwards by the scheduler. +* - a racing CPU going up will be handled by kthreads_online_cpu() +*/ +kthread_fetch_affinity (kthread, affinity); +set_cpus_allowed_ptr (current, affinity); +mutex_unlock (&kthread_affinity_lock); + +free_cpumask_var (affinity); }static int kthread (void *_create)
@@ -919,8 +917,22 @@ static int kthreads_online_cpu(unsigned int cpu) ret = -EINVAL ;continue ; } -kthread_fetch_affinity (k, affinity); -set_cpus_allowed_ptr (k->task, affinity); + +/* +* Unbound kthreads without preferred affinity are already affine +* to housekeeping, whether those CPUs are online or not. So no need +* to handle newly online CPUs for them. +* +* But kthreads with a preferred affinity or node are different: +* if none of their preferred CPUs are online and part of +* housekeeping at the same time, they must be affine to housekeeping. +* But as soon as one of their preferred CPU becomes online, they must +* be affine to them. +*/ +if (k->preferred_affinity || k->node !=NUMA_NO_NODE ) { +kthread_fetch_affinity (k, affinity); +set_cpus_allowed_ptr (k->task, affinity); + } }free_cpumask_var (affinity);
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 26/33 kthread: Include kthreadd to the managed affinity list
In reply to Frederic WeisbeckerThe unbound kthreads affinity management performed by cpuset is going to be imported to the kthread core code for consolidation purposes.
Treat kthreadd just like any other kthread.
--- kernel/kthread.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/kthread.c +2 -1
@@ -818,12 +818,13 @@ int kthreadd(void *unused)/* Setup a clean context for our children to inherit. */ set_task_comm (tsk, comm);ignore_signals (tsk); -set_cpus_allowed_ptr (tsk,housekeeping_cpumask (HK_TYPE_KTHREAD ));set_mems_allowed (node_states[N_MEMORY ]); current->flags |=PF_NOFREEZE ;cgroup_init_kthreadd (); +kthread_affine_node (); +for (;;) {set_current_state (TASK_INTERRUPTIBLE );if (list_empty (&kthread_create_list))
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 27/33 kthread: Rely on HK_TYPE_DOMAIN for preferred affinity management
In reply to Frederic WeisbeckerUnbound kthreads want to run neither on nohz_full CPUs nor on domain isolated CPUs. And since nohz_full implies domain isolation, checking the latter is enough to verify both.
Therefore exclude kthreads from domain isolation.
--- kernel/kthread.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
kernel/kthread.c +5 -3
@@ -362,18 +362,20 @@ static void kthread_fetch_affinity(struct kthread *kthread, struct cpumask *cpum {const struct cpumask *pref; +guard (rcu)(); +if (kthread->preferred_affinity) { pref = kthread->preferred_affinity; }else {if (kthread->node ==NUMA_NO_NODE ) - pref =housekeeping_cpumask (HK_TYPE_KTHREAD ); + pref =housekeeping_cpumask (HK_TYPE_DOMAIN );else pref =cpumask_of_node (kthread->node); } -cpumask_and (cpumask, pref,housekeeping_cpumask (HK_TYPE_KTHREAD )); +cpumask_and (cpumask, pref,housekeeping_cpumask (HK_TYPE_DOMAIN ));if (cpumask_empty (cpumask)) -cpumask_copy (cpumask,housekeeping_cpumask (HK_TYPE_KTHREAD )); +cpumask_copy (cpumask,housekeeping_cpumask (HK_TYPE_DOMAIN )); }static void kthread_affine_node (void )
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 28/33 sched: Switch the fallback task allowed cpumask to HK_TYPE_DOMAIN
In reply to Frederic WeisbeckerTasks that have all their allowed CPUs offline don't want their affinity to fallback on either nohz_full CPUs or on domain isolated CPUs. And since nohz_full implies domain isolation, checking the latter is enough to verify both.
Therefore exclude domain isolation from fallback task affinity.
--- include/linux/mmu_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mmu_context.h +1 -1
@@ -24,7 +24,7 @@ static inline void leave_mm(void) { }#ifndef task_cpu_possible_mask# define task_cpu_possible_mask (p) cpu_possible_mask# define task_cpu_possible (cpu, p) true -# define task_cpu_fallback_mask (p) housekeeping_cpumask(HK_TYPE_TICK) +# define task_cpu_fallback_mask (p) housekeeping_cpumask(HK_TYPE_DOMAIN)#else # define task_cpu_possible (cpu, p) cpumask_test_cpu((cpu), task_cpu_possible_mask(p))#endif
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 29/33 sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
In reply to Frederic WeisbeckerWhen none of the allowed CPUs of a task are online, it gets migrated to the fallback cpumask which is all the non nohz_full CPUs.
However just like nohz_full CPUs, domain isolated CPUs don't want to be disturbed by tasks that have lost their CPU affinities.
And since nohz_full rely on domain isolation to work correctly, the housekeeping mask of domain isolated CPUs should always be a superset of the housekeeping mask of nohz_full CPUs (there can be CPUs that are domain isolated but not nohz_full, OTOH there shouldn't be nohz_full CPUs that are not domain isolated):
HK_TYPE_DOMAIN | HK_TYPE_KERNEL_NOISE == HK_TYPE_DOMAIN
Therefore use HK_TYPE_DOMAIN as the appropriate fallback target for tasks and since this cpumask can be modified at runtime, make sure that 32 bits support CPUs on ARM64 mismatched systems are not isolated by cpusets.
--- arch/arm64/kernel/cpufeature.c | 18 +++++++++++++++--- include/linux/cpu.h | 4 ++++ kernel/cgroup/cpuset.c | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-)
arch/arm64/kernel/cpufeature.c +15 -3
@@ -1656,6 +1656,18 @@ has_cpuid_feature(const struct arm64_cpu_capabilities *entry, int scope)return feature_matches (val, entry); } +/* +* 32 bits support CPUs can't be isolated because tasks may be +* arbitrarily affine to them, defeating the purpose of isolation. +*/ +bool arch_isolated_cpus_can_update (struct cpumask *new_cpus) +{ +if (static_branch_unlikely (&arm64_mismatched_32bit_el0)) +return !cpumask_intersects (cpu_32bit_el0_mask, new_cpus); +else +return true; +} +const struct cpumask *system_32bit_el0_cpumask (void ) {if (!system_supports_32bit_el0 ())
@@ -1669,7 +1681,7 @@ const struct cpumask *system_32bit_el0_cpumask(void)const struct cpumask *task_cpu_fallback_mask (struct task_struct *p) { -return __task_cpu_possible_mask (p,housekeeping_cpumask (HK_TYPE_TICK )); +return __task_cpu_possible_mask (p,housekeeping_cpumask (HK_TYPE_DOMAIN )); }static int __init parse_32bit_el0_param (char *str)
@@ -3987,8 +3999,8 @@ static int enable_mismatched_32bit_el0(unsigned int cpu)bool cpu_32bit = false;if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0)) { -if (!housekeeping_cpu (cpu,HK_TYPE_TICK )) -pr_info ("Treating adaptive-ticks CPU %u as 64-bit only\n" , cpu); +if (!housekeeping_cpu (cpu,HK_TYPE_DOMAIN )) +pr_info ("Treating domain isolated CPU %u as 64-bit only\n" , cpu);else cpu_32bit = true; }
include/linux/cpu.h +4 -0
@@ -229,4 +229,8 @@ static inline bool cpu_attack_vector_mitigated(enum cpu_attack_vectors v)#define smt_mitigations SMT_MITIGATIONS_OFF#endif +struct cpumask ; + +bool arch_isolated_cpus_can_update (struct cpumask *new_cpus); +#endif /* _LINUX_CPU_H_ */
kernel/cgroup/cpuset.c +14 -3
@@ -1408,14 +1408,22 @@ static void partition_xcpus_del(int old_prs, struct cpuset *parent,cpumask_or (parent->effective_cpus, parent->effective_cpus, xcpus); } +bool __weak arch_isolated_cpus_can_update (struct cpumask *new_cpus) +{ +return true; +} +/* -* isolated_cpus_can_update - check for isolated & nohz_full conflicts +* isolated_cpus_can_update - check for conflicts against housekeeping and +* CPUs capabilities. * @add_cpus: cpu mask for cpus that are going to be isolated * @del_cpus: cpu mask for cpus that are no longer isolated, can be NULL * Return: false if there is conflict, true otherwise * -* If nohz_full is enabled and we have isolated CPUs, their combination must -* still leave housekeeping CPUs. +* Check for conflicts: +* - If nohz_full is enabled and there are isolated CPUs, their combination must +* still leave housekeeping CPUs. +* - Architecture has CPU capabilities incompatible with being isolated * * TBD: Should consider merging this function into * prstate_housekeeping_conflict().
@@ -1426,6 +1434,9 @@ static bool isolated_cpus_can_update(struct cpumask *add_cpus,cpumask_var_t full_hk_cpus;int res = true; +if (!arch_isolated_cpus_can_update (add_cpus)) +return false; +if (!housekeeping_enabled (HK_TYPE_KERNEL_NOISE ))return true;
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 30/33 kthread: Honour kthreads preferred affinity after cpuset changes
In reply to Frederic WeisbeckerWhen cpuset isolated partitions get updated, unbound kthreads get indifferently affine to all non isolated CPUs, regardless of their individual affinity preferences.
For example kswapd is a per-node kthread that prefers to be affine to the node it refers to. Whenever an isolated partition is created, updated or deleted, kswapd's node affinity is going to be broken if any CPU in the related node is not isolated because kswapd will be affine globally.
Fix this with letting the consolidated kthread managed affinity code do the affinity update on behalf of cpuset.
--- include/linux/kthread.h | 1 + kernel/cgroup/cpuset.c | 5 ++--- kernel/kthread.c | 41 ++++++++++++++++++++++++++++++---------- kernel/sched/isolation.c | 3 +++ 4 files changed, 37 insertions(+), 13 deletions(-)
include/linux/kthread.h +1 -0
@@ -100,6 +100,7 @@ void kthread_unpark(struct task_struct *k);void kthread_parkme (void );void kthread_exit (long result)__noreturn ;void kthread_complete_and_exit (struct completion *,long )__noreturn ; +int kthreads_update_housekeeping (void );int kthreadd (void *unused);extern struct task_struct *kthreadd_task;
kernel/cgroup/cpuset.c +2 -3
@@ -1208,11 +1208,10 @@ void cpuset_update_tasks_cpumask(struct cpuset *cs, struct cpumask *new_cpus)if (top_cs) {/* +* PF_KTHREAD tasks are handled by housekeeping. * PF_NO_SETAFFINITY tasks are ignored. -* All per cpu kthreads should have PF_NO_SETAFFINITY -* flag set, see kthread_set_per_cpu(). */ -if (task->flags &PF_NO_SETAFFINITY ) +if (task->flags & (PF_KTHREAD |PF_NO_SETAFFINITY ))continue ;cpumask_andnot (new_cpus, possible_mask, subpartitions_cpus); }else {
kernel/kthread.c +31 -10
65 lines not on this page · raw message
kernel/sched/isolation.c +3 -0
@@ -154,6 +154,9 @@ int housekeeping_update(struct cpumask *isol_mask) err =tmigr_isolated_exclude_cpumask (isol_mask);WARN_ON_ONCE (err <0 ); + err =kthreads_update_housekeeping (); +WARN_ON_ONCE (err <0 ); +kfree (old);return 0 ;
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 31/33 kthread: Comment on the purpose and placement of kthread_affine_node() call
In reply to Frederic WeisbeckerIt may not appear obvious why kthread_affine_node() is not called before the kthread creation completion instead of after the first wake-up.
The reason is that kthread_affine_node() applies a default affinity behaviour that only takes place if no affinity preference have already been passed by the kthread creation call site.
Add a comment to clarify that.
--- kernel/kthread.c | 4 ++++ 1 file changed, 4 insertions(+)
kernel/kthread.c +4 -0
@@ -453,6 +453,10 @@ static int kthread(void *_create) self->started =1 ; +/* +* Apply default node affinity if no call to kthread_bind[_mask]() nor +* kthread_affine_preferred() was issued before the first wake-up. +*/ if (!(current->flags &PF_NO_SETAFFINITY ) && !self->preferred_affinity)kthread_affine_node ();
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 32/33 kthread: Document kthread_affine_preferred()
In reply to Frederic WeisbeckerThe documentation of this new API has been overlooked during its introduction. Fill the gap.
--- kernel/kthread.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
kernel/kthread.c +12 -0
@@ -856,6 +856,18 @@ int kthreadd(void *unused)return 0 ; } +/** +* kthread_affine_preferred - Define a kthread's preferred affinity +* @p: thread created by kthread_create(). +* @mask: preferred mask of CPUs (might not be online, must be possible) for @p +* to run on. +* +* Similar to kthread_bind_mask() except that the affinity is not a requirement +* but rather a preference that can be constrained by CPU isolation or CPU hotplug. +* Must be called before the first wakeup of the kthread. +* +* Returns 0 if the affinity has been applied. +*/ int kthread_affine_preferred (struct task_struct *p,const struct cpumask *mask) {struct kthread *kthread =to_kthread (p);
Signature · 1 line
2.51.1
Frederic Weisbecker
maintainerPATCH v6 33/33 doc: Add housekeeping documentation
In reply to Frederic Weisbecker--- Documentation/core-api/housekeeping.rst | 111 ++++++++++++++++++++++++ Documentation/core-api/index.rst | 1 + 2 files changed, 112 insertions(+) create mode 100644 Documentation/core-api/housekeeping.rst
Documentation/core-api/housekeeping.rst new file +111 -0
@@ -0,0 +1,111 @@ +====================================== +Housekeeping +====================================== + + +CPU Isolation moves away kernel work that may otherwise run on any CPU. +The purpose of its related features is to reduce the OS jitter that some +extreme workloads can't stand, such as in some DPDK usecases. + +The kernel work moved away by CPU isolation is commonly described as +"housekeeping" because it includes ground work that performs cleanups, +statistics maintainance and actions relying on them, memory release, +various deferrals etc... + +Sometimes housekeeping is just some unbound work (unbound workqueues, +unbound timers, ...) that gets easily assigned to non-isolated CPUs. +But sometimes housekeeping is tied to a specific CPU and requires +elaborated tricks to be offloaded to non-isolated CPUs (RCU_NOCB, remote +scheduler tick, etc...). + +Thus, a housekeeping CPU can be considered as the reverse of an isolated +CPU. It is simply a CPU that can execute housekeeping work. There must +always be at least one online housekeeping CPU at any time. The CPUs that +are not isolated are automatically assigned as housekeeping. + +Housekeeping is currently divided in four features described +by the ``enum hk_type type``: + +1. HK_TYPE_DOMAIN matches the work moved away by scheduler domain + isolation performed through ``isolcpus=domain`` boot parameter or + isolated cpuset partitions in cgroup v2. This includes scheduler + load balancing, unbound workqueues and timers. + +2. HK_TYPE_KERNEL_NOISE matches the work moved away by tick isolation + performed through ``nohz_full=`` or ``isolcpus=nohz`` boot + parameters. This includes remote scheduler tick, vmstat and lockup + watchdog. + +3. HK_TYPE_MANAGED_IRQ matches the IRQ handlers moved away by managed + IRQ isolation performed through ``isolcpus=managed_irq``. + +4. HK_TYPE_DOMAIN_BOOT matches the work moved away by scheduler domain + isolation performed through ``isolcpus=domain`` only. It is similar + to HK_TYPE_DOMAIN except it ignores the isolation performed by + cpusets. + + +Housekeeping cpumasks +================================= + +Housekeeping cpumasks include the CPUs that can execute the work moved +away by the matching isolation feature. These cpumasks are returned by +the following function:: + + const struct cpumask *housekeeping_cpumask(enum hk_type type) + +By default, if neither ``nohz_full=``, nor ``isolcpus``, nor cpuset's +isolated partitions are used, which covers most usecases, this function +returns the cpu_possible_mask. + +Otherwise the function returns the cpumask complement of the isolation +feature. For example: + +With isolcpus=domain,7 the following will return a mask with all possible +CPUs except 7:: + + housekeeping_cpumask(HK_TYPE_DOMAIN) + +Similarly with nohz_full=5,6 the following will return a mask with all +possible CPUs except 5,6:: + + housekeeping_cpumask(HK_TYPE_KERNEL_NOISE) + + +Synchronization against cpusets +================================= + +Cpuset can modify the HK_TYPE_DOMAIN housekeeping cpumask while creating, +modifying or deleting an isolated partition. + +The users of HK_TYPE_DOMAIN cpumask must then make sure to synchronize +properly against cpuset in order to make sure that: + +1. The cpumask snapshot stays coherent. + +2. No housekeeping work is queued on a newly made isolated CPU. + +3. Pending housekeeping work that was queued to a non isolated + CPU which just turned isolated through cpuset must be flushed + before the related created/modified isolated partition is made + available to userspace. + +This synchronization is maintained by an RCU based scheme. The cpuset update +side waits for an RCU grace period after updating the HK_TYPE_DOMAIN +cpumask and before flushing pending works. On the read side, care must be +taken to gather the housekeeping target election and the work enqueue within +the same RCU read side critical section. + +A typical layout example would look like this on the update side +(``housekeeping_update()``):: + + rcu_assign_pointer(housekeeping_cpumasks[type], trial); + synchronize_rcu(); + flush_workqueue(example_workqueue); + +And then on the read side:: + + rcu_read_lock(); + cpu = housekeeping_any_cpu(HK_TYPE_DOMAIN); + queue_work_on(cpu, example_workqueue, work); + rcu_read_unlock();
Documentation/core-api/index.rst +1 -0
@@ -25,6 +25,7 @@ it. symbol-namespaces asm-annotations real-time/index + housekeeping.rst Data structures and low-level utilities =======================================
Signature · 1 line
2.51.1
Simon Horman
reviewerRe: [PATCH 13/33] sched/isolation: Convert housekeeping cpumasks to rcu pointers
In reply to Frederic WeisbeckerQuoted 33 lines · Frederic Weisbecker
HK_TYPE_DOMAIN's cpumask will soon be made modifiable by cpuset. A synchronization mechanism is then needed to synchronize the updates with the housekeeping cpumask readers.
Turn the housekeeping cpumasks into RCU pointers. Once a housekeeping cpumask will be modified, the update side will wait for an RCU grace period and propagate the change to interested subsystem when deemed necessary.
Signed-off-by Frederic Weisbecker <[email protected]>--- kernel/sched/isolation.c | 58 +++++++++++++++++++++++++--------------- kernel/sched/sched.h | 1 + 2 files changed, 37 insertions(+), 22 deletions(-)kernel/sched/isolation.c +2
-1@@ -21,7 +21,7 @@ DEFINE_STATIC_KEY_FALSE(housekeeping_overridden);EXPORT_SYMBOL_GPL (housekeeping_overridden);struct housekeeping { -cpumask_var_t cpumasks[HK_TYPE_MAX ]; +struct cpumask __rcu *cpumasks[HK_TYPE_MAX ];unsigned long flags; };@@ -33,17 +33,28 @@ bool housekeeping_enabled(enum hk_type type) }EXPORT_SYMBOL_GPL (housekeeping_enabled); +const struct cpumask *housekeeping_cpumask (enum hk_type type)
kernel/sched/isolation.c bool housekeeping_enabled(enum hk_type type) · line 46
Quoted 10 lines
kernel/sched/isolation.c +10
-0+{ +if (static_branch_unlikely (&housekeeping_overridden)) { +if (housekeeping.flags &BIT (type)) { +return rcu_dereference_check (housekeeping.cpumasks[type],1 ); + } + } +return cpu_possible_mask; +} +EXPORT_SYMBOL_GPL (housekeeping_cpumask); +
Hi Frederic,
I think this patch should also update the access to housekeeping.cpumasks in housekeeping_setup(), on line 200, to use housekeeping_cpumask().
As is, sparse flags __rcu a annotation miss match there.
kernel/sched/isolation.c:200:80: warning: incorrect type in argument 3 (different address spaces)
kernel/sched/isolation.c:200:80: expected struct cpumask const *srcp3
kernel/sched/isolation.c:200:80: got struct cpumask [noderef] __rcu *
...
Re: [PATCH 01/33] PCI: Prepare to protect against concurrent isolated cpuset change
In reply to Frederic Weisbecker[+cc Jinhui]
Quoted 7 lines · Frederic Weisbecker
HK_TYPE_DOMAINwill soon integrate cpuset isolated partitions and therefore be made modifiable at runtime. Synchronize against the cpumask update using RCU.The RCU locked section includes both the housekeeping CPU target election for the PCI probe work and the work enqueue.
Quoted 6 lines
This way the housekeeping update side will simply need to flush the pending related works after updating the housekeeping mask in order to make sure that no PCI work ever executes on an isolated CPU. This part will be handled in a subsequent patch.
Signed-off-by Frederic Weisbecker <[email protected]>
Just FYI, Jinhui posted a series that touches this same code and might need some coordination:
https://lore.kernel.org/r/[email protected]
IIUC, Jinhui's series adds some more NUMA smarts in the driver core sync probing path and removes corresponding NUMA code from the PCI core probe path.
Bjorn
Frederic Weisbecker
maintainerRe: [PATCH 01/33] PCI: Prepare to protect against concurrent isolated cpuset change
Quoted 17 lines · Bjorn Helgaas
[+cc Jinhui]
Quoted 7 lines · Frederic Weisbecker
HK_TYPE_DOMAINwill soon integrate cpuset isolated partitions and therefore be made modifiable at runtime. Synchronize against the cpumask update using RCU.The RCU locked section includes both the housekeeping CPU target election for the PCI probe work and the work enqueue.
Quoted 6 lines
This way the housekeeping update side will simply need to flush the pending related works after updating the housekeeping mask in order to make sure that no PCI work ever executes on an isolated CPU. This part will be handled in a subsequent patch.
Signed-off-by Frederic Weisbecker <[email protected]>
Quoted 8 lines
Just FYI, Jinhui posted a series that touches this same code and might need some coordination:
https://lore.kernel.org/r/[email protected]
IIUC, Jinhui's series adds some more NUMA smarts in the driver core sync probing path and removes corresponding NUMA code from the PCI core probe path.
I see. I can't drop my change, otherwise my series alone could crash dereferencing garbage. But Jinhui's series removes the need for my changes.
So an unpleasant conflict will happen in -next (and if everything goes well, further in next merge window) and it should be resolved with simply ignoring my changes and only apply those of Jinhui.
Should we inform Linux Next people ahead?
Thanks for making me notice!
Signature · 2 lines
Frederic Weisbecker SUSE Labs
Re: [PATCH 01/33] PCI: Prepare to protect against concurrent isolated cpuset change
Quoted 25 lines · Frederic Weisbecker
Quoted 15 lines · Bjorn Helgaas
Quoted 7 lines · Frederic Weisbecker
HK_TYPE_DOMAINwill soon integrate cpuset isolated partitions and therefore be made modifiable at runtime. Synchronize against the cpumask update using RCU.The RCU locked section includes both the housekeeping CPU target election for the PCI probe work and the work enqueue.
Quoted 6 lines
This way the housekeeping update side will simply need to flush the pending related works after updating the housekeeping mask in order to make sure that no PCI work ever executes on an isolated CPU. This part will be handled in a subsequent patch.
Signed-off-by Frederic Weisbecker <[email protected]>Quoted 8 lines
Just FYI, Jinhui posted a series that touches this same code and might need some coordination:
https://lore.kernel.org/r/[email protected]
IIUC, Jinhui's series adds some more NUMA smarts in the driver core sync probing path and removes corresponding NUMA code from the PCI core probe path.
Quoted 7 lines
I see. I can't drop my change, otherwise my series alone could crash dereferencing garbage. But Jinhui's series removes the need for my changes.
So an unpleasant conflict will happen in -next (and if everything goes well, further in next merge window) and it should be resolved with simply ignoring my changes and only apply those of Jinhui.
I don't want to derail your series, and I don't think you need to change anything right now. Jinhui's series is early and might not be ready to merge until after yours, which should be fine.
Bjorn
Re: [PATCH 01/33] PCI: Prepare to protect against concurrent isolated cpuset change
In reply to Bjorn HelgaasOn Wed Jan 7, 2026 at 13:05:34 -0600, Bjorn Helgaas worte:
Quoted 17 lines
[+cc Jinhui]
Quoted 7 lines · Frederic Weisbecker
HK_TYPE_DOMAINwill soon integrate cpuset isolated partitions and therefore be made modifiable at runtime. Synchronize against the cpumask update using RCU.The RCU locked section includes both the housekeeping CPU target election for the PCI probe work and the work enqueue.
Quoted 6 lines
This way the housekeeping update side will simply need to flush the pending related works after updating the housekeeping mask in order to make sure that no PCI work ever executes on an isolated CPU. This part will be handled in a subsequent patch.
Signed-off-by Frederic Weisbecker <[email protected]>
Quoted 8 lines
Just FYI, Jinhui posted a series that touches this same code and might need some coordination:
https://lore.kernel.org/r/[email protected]
IIUC, Jinhui's series adds some more NUMA smarts in the driver core sync probing path and removes corresponding NUMA code from the PCI core probe path.
Hi Bjorn,
Thanks for pointing out the series.
I’ll resolve the conflicts and send a new patchset once this one is merged.
Best Regards,
Jinhui
Re: [PATCH 12/33] cpuset: Provide lockdep check for cpuset lock held
In reply to Frederic WeisbeckerQuoted 35 lines · Frederic Weisbecker
cpuset modifies partitions, including isolated, while holding the cpuset mutex.
This means that holding the cpuset mutex is safe to synchronize against housekeeping cpumask changes.
Provide a lockdep check to validate that.
Signed-off-by Frederic Weisbecker <[email protected]>--- include/linux/cpuset.h | 2 ++ kernel/cgroup/cpuset.c | 7 +++++++ 2 files changed, 9 insertions(+)include/linux/cpuset.h +2
-0@@ -18,6 +18,8 @@#include <linux/mmu_context.h> #include <linux/jump_label.h> +extern bool lockdep_is_cpuset_held (void ); +#ifdef CONFIG_CPUSETS /* kernel/cgroup/cpuset.c +0
-0@@ -283,6 +283,13 @@ void cpuset_full_unlock(void)cpus_read_unlock (); }
kernel/cgroup/cpuset.c void cpuset_full_unlock(void) · line 295
Quoted 10 lines
kernel/cgroup/cpuset.c +7
-0+#ifdef CONFIG_LOCKDEP +bool lockdep_is_cpuset_held (void ) +{ +return lockdep_is_held (&cpuset_mutex); +} +#endif +static DEFINE_SPINLOCK (callback_lock);void cpuset_callback_lock_irq (void )
The cgroup/for-next tree already have a similar lockdep_assert_cpuset_lock_held() defined. So you can drop this patch if this series won't land in the next merge window.
Cheers,
Longman
Re: [PATCH 13/33] sched/isolation: Convert housekeeping cpumasks to rcu pointers
In reply to Simon HormanQuoted 49 lines · Simon Horman
Quoted 33 lines · Frederic Weisbecker
HK_TYPE_DOMAIN's cpumask will soon be made modifiable by cpuset. A synchronization mechanism is then needed to synchronize the updates with the housekeeping cpumask readers.
Turn the housekeeping cpumasks into RCU pointers. Once a housekeeping cpumask will be modified, the update side will wait for an RCU grace period and propagate the change to interested subsystem when deemed necessary.
Signed-off-by Frederic Weisbecker <[email protected]>--- kernel/sched/isolation.c | 58 +++++++++++++++++++++++++--------------- kernel/sched/sched.h | 1 + 2 files changed, 37 insertions(+), 22 deletions(-)kernel/sched/isolation.c +2
-1@@ -21,7 +21,7 @@ DEFINE_STATIC_KEY_FALSE(housekeeping_overridden);EXPORT_SYMBOL_GPL (housekeeping_overridden);struct housekeeping { -cpumask_var_t cpumasks[HK_TYPE_MAX ]; +struct cpumask __rcu *cpumasks[HK_TYPE_MAX ];unsigned long flags; };@@ -33,17 +33,28 @@ bool housekeeping_enabled(enum hk_type type) }EXPORT_SYMBOL_GPL (housekeeping_enabled); +const struct cpumask *housekeeping_cpumask (enum hk_type type)kernel/sched/isolation.c bool housekeeping_enabled(enum hk_type type) · line 46
Quoted 10 lines
kernel/sched/isolation.c +10
-0+{ +if (static_branch_unlikely (&housekeeping_overridden)) { +if (housekeeping.flags &BIT (type)) { +return rcu_dereference_check (housekeeping.cpumasks[type],1 ); + } + } +return cpu_possible_mask; +} +EXPORT_SYMBOL_GPL (housekeeping_cpumask); +Hi Frederic,
I think this patch should also update the access to housekeeping.cpumasks in
housekeeping_setup(), on line 200, to usehousekeeping_cpumask().
Quoted 8 lines
As is, sparse flags
__rcua annotation miss match there.
kernel/sched/isolation.c:200:80: warning: incorrect type in argument 3 (different address spaces)
kernel/sched/isolation.c:200:80: expected struct cpumask const *srcp3
kernel/sched/isolation.c:200:80: got struct cpumask [noderef]__rcu*...
The direct housekeeping.cpumasks[type] reference is in the newly merged check after Federic's initial patch series.
iter_flags = housekeeping.flags & (HK_FLAG_KERNEL_NOISE | HK_FLAG_DOMAIN); type = find_first_bit(&iter_flags, HK_TYPE_MAX);
/*
* Pass the check if none of these flags were previously set or
* are not in the current selection.
*/
iter_flags = flags & (HK_FLAG_KERNEL_NOISE | HK_FLAG_DOMAIN); first_cpu = (type == HK_TYPE_MAX || !iter_flags) ? 0 :
cpumask_first_and_and(cpu_present_mask,
housekeeping_staging, housekeeping.cpumasks[type]);
Maybe that is why it is missed.
Cheers,
Longman
Re: [PATCH 12/33] cpuset: Provide lockdep check for cpuset lock held
In reply to Waiman LongQuoted 36 lines · Waiman Long
Quoted 35 lines · Frederic Weisbecker
cpuset modifies partitions, including isolated, while holding the cpuset mutex.
This means that holding the cpuset mutex is safe to synchronize against housekeeping cpumask changes.
Provide a lockdep check to validate that.
Signed-off-by Frederic Weisbecker <[email protected]>---
include/linux/cpuset.h| 2 ++
kernel/cgroup/cpuset.c| 7 +++++++2 files changed, 9 insertions(+)include/linux/cpuset.h +1
-0@@ -18,6 +18,8 @@ #include <linux/mmu_context.h> #include <linux/jump_label.h> +extern bool lockdep_is_cpuset_held(void); + #ifdef CONFIG_CPUSETS /*kernel/cgroup/cpuset.c +0
-0@@ -283,6 +283,13 @@ void cpuset_full_unlock(void) cpus_read_unlock(); }+#ifdef
CONFIG_LOCKDEPkernel/cgroup/cpuset.c +2
-0+bool lockdep_is_cpuset_held (void ) +{
Quoted 8 lines
Quoted 6 lines
+ return
lockdep_is_held(&cpuset_mutex);kernel/cgroup/cpuset.c +3
-0+} +#endif +static
DEFINE_SPINLOCK(callback_lock);
voidcpuset_callback_lock_irq(void)The cgroup/for-next tree already have a similar
lockdep_assert_cpuset_lock_held()defined. So you can drop this patch if this series won't land in the next merge window.
Sorry, the other new lockdep API isn't exactly the same as what you propose here. So it is not a replacement for your use case. Sorry for the noise.
Cheers,
Longman
Re: [PATCH 05/33] sched/isolation: Save boot defined domain flags
In reply to Frederic WeisbeckerQuoted 56 lines · Frederic Weisbecker
HK_TYPE_DOMAINwill soon integrate not only boot defined isolcpus= CPUs but also cpuset isolated partitions.Housekeeping still needs a way to record what was initially passed to isolcpus= in order to keep these CPUs isolated after a cpuset isolated partition is modified or destroyed while containing some of them.
Create a new
HK_TYPE_DOMAIN_BOOTto keep track of those.Signed-off-by Frederic Weisbecker <[email protected]>Reviewed-by Phil Auld <[email protected]>--- include/linux/sched/isolation.h | 4 ++++ kernel/sched/isolation.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)include/linux/sched/isolation.h +4
-0@@ -7,8 +7,12 @@#include <linux/tick.h> enum hk_type { +/* Inverse of boot-time isolcpus= argument */ +HK_TYPE_DOMAIN_BOOT ,HK_TYPE_DOMAIN , +/* Inverse of boot-time isolcpus=managed_irq argument */ HK_TYPE_MANAGED_IRQ , +/* Inverse of boot-time nohz_full= or isolcpus=nohz arguments */ HK_TYPE_KERNEL_NOISE ,HK_TYPE_MAX ,kernel/sched/isolation.c +2
-1@@ -11,6 +11,7 @@#include "sched.h" enum hk_flags { +HK_FLAG_DOMAIN_BOOT =BIT (HK_TYPE_DOMAIN_BOOT ),HK_FLAG_DOMAIN =BIT (HK_TYPE_DOMAIN ),HK_FLAG_MANAGED_IRQ =BIT (HK_TYPE_MANAGED_IRQ ),HK_FLAG_KERNEL_NOISE =BIT (HK_TYPE_KERNEL_NOISE ),@@ -239,7 +240,7 @@ static int __init housekeeping_isolcpus_setup(char *str)if (!strncmp (str,"domain," ,7 )) { str +=7 ; - flags |=HK_FLAG_DOMAIN ; + flags |=HK_FLAG_DOMAIN |HK_FLAG_DOMAIN_BOOT ;continue ; }
kernel/sched/isolation.c static int __init housekeeping_isolcpus_setup(char *str) · line 276
Quoted 8 lines
kernel/sched/isolation.c +1
-1@@ -269,7 +270,7 @@ static int __init housekeeping_isolcpus_setup(char *str)/* Default behaviour for isolcpus without flags */ if (!flags) - flags |=HK_FLAG_DOMAIN ; + flags |=HK_FLAG_DOMAIN |HK_FLAG_DOMAIN_BOOT ;return housekeeping_setup (str, flags); }
Quoted 40 lines · Frederic Weisbecker
Hi,
The kthread code was enhanced lately to provide an infrastructure which manages the preferred affinity of unbound kthreads (node or custom cpumask) against housekeeping constraints and CPU hotplug events.
One crucial missing piece is cpuset: when an isolated partition is created, deleted, or its CPUs updated, all the unbound kthreads in the top cpuset are affine to _all_ the non-isolated CPUs, possibly breaking their preferred affinity along the way
Solve this with performing the kthreads affinity update from cpuset to the kthreads consolidated relevant code instead so that preferred affinities are honoured.
The dispatch of the new cpumasks to workqueues and kthreads is performed by housekeeping, as per the nice Tejun's suggestion.
As a welcome side effect,
HK_TYPE_DOMAINthen integrates both the set from isolcpus= and cpuset isolated partitions. Housekeeping cpumasks are now modifyable with specific synchronization. A big step toward making nohz_full= also mutable through cpuset in the future.Changes since v5:
* Add more tags
* Fix leaked
destroy_work_on_stack()(Zhang Qiao, Waiman Long)* Comment
schedule_drain_work()synchronization requirement (Tejun)* s/Revert of/Inverse of (Waiman Long)
* Remove
housekeeping_update()needless (for now) parameter (Chen Ridong)* Don't propagate
housekeeping_update()failures beyond allocations (Waiman Long)* Whitespace cleanup (Waiman Long)
Quoted 7 lines
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
kthread/core-v6HEAD:
811e87ca8a0a1e54eb5f23e71896cb97436cccdcHappy new year,
Frederic
I don't see any major issue with this v6 version. There may be some minor issues that can be cleaned up later. Now the issue is which tree should this series go to as it touches a number of different subsystems with different maintainers.
Cheers,
Longman
Frederic Weisbecker
maintainerRe: [PATCH 13/33] sched/isolation: Convert housekeeping cpumasks to rcu pointers
In reply to Waiman LongQuoted 73 lines · Waiman Long
Quoted 46 lines · Simon Horman
Quoted 30 lines · Frederic Weisbecker
HK_TYPE_DOMAIN's cpumask will soon be made modifiable by cpuset. A synchronization mechanism is then needed to synchronize the updates with the housekeeping cpumask readers.
Turn the housekeeping cpumasks into RCU pointers. Once a housekeeping cpumask will be modified, the update side will wait for an RCU grace period and propagate the change to interested subsystem when deemed necessary.
Signed-off-by Frederic Weisbecker <[email protected]>--- kernel/sched/isolation.c | 58 +++++++++++++++++++++++++--------------- kernel/sched/sched.h | 1 + 2 files changed, 37 insertions(+), 22 deletions(-)kernel/sched/isolation.c +2
-1@@ -21,7 +21,7 @@ DEFINE_STATIC_KEY_FALSE(housekeeping_overridden);EXPORT_SYMBOL_GPL (housekeeping_overridden);struct housekeeping { -cpumask_var_t cpumasks[HK_TYPE_MAX ]; +struct cpumask __rcu *cpumasks[HK_TYPE_MAX ];unsigned long flags; };@@ -33,17 +33,28 @@ bool housekeeping_enabled(enum hk_type type) }EXPORT_SYMBOL_GPL (housekeeping_enabled); +const struct cpumask *housekeeping_cpumask (enum hk_type type)kernel/sched/isolation.c bool housekeeping_enabled(enum hk_type type) · line 45
Quoted 10 lines
kernel/sched/isolation.c +10
-0+{ +if (static_branch_unlikely (&housekeeping_overridden)) { +if (housekeeping.flags &BIT (type)) { +return rcu_dereference_check (housekeeping.cpumasks[type],1 ); + } + } +return cpu_possible_mask; +} +EXPORT_SYMBOL_GPL (housekeeping_cpumask); +Hi Frederic,
I think this patch should also update the access to housekeeping.cpumasks in
housekeeping_setup(), on line 200, to usehousekeeping_cpumask().Quoted 8 lines
As is, sparse flags
__rcua annotation miss match there.
kernel/sched/isolation.c:200:80: warning: incorrect type in argument 3 (different address spaces)
kernel/sched/isolation.c:200:80: expected struct cpumask const *srcp3
kernel/sched/isolation.c:200:80: got struct cpumask [noderef]__rcu*...
The direct housekeeping.cpumasks[type] reference is in the newly merged check after Federic's initial patch series.
iter_flags= housekeeping.flags & (HK_FLAG_KERNEL_NOISE|HK_FLAG_DOMAIN);
type =find_first_bit(&iter_flags, HK_TYPE_MAX); /*
* Pass the check if none of these flags were previously set or
* are not in the current selection.
*/
iter_flags= flags & (HK_FLAG_KERNEL_NOISE|HK_FLAG_DOMAIN);
first_cpu= (type ==HK_TYPE_MAX|| !iter_flags) ? 0 :
cpumask_first_and_and(cpu_present_mask,
housekeeping_staging, housekeeping.cpumasks[type]);
Quoted 1 line
Maybe that is why it is missed.
Good catch guys! Fixing this.
Thanks.
Signature · 2 lines
Frederic Weisbecker SUSE Labs
Frederic Weisbecker
maintainerQuoted 46 lines · Waiman Long
Quoted 45 lines · Frederic Weisbecker
Hi,
The kthread code was enhanced lately to provide an infrastructure which manages the preferred affinity of unbound kthreads (node or custom cpumask) against housekeeping constraints and CPU hotplug events.
One crucial missing piece is cpuset: when an isolated partition is created, deleted, or its CPUs updated, all the unbound kthreads in the top cpuset are affine to _all_ the non-isolated CPUs, possibly breaking their preferred affinity along the way
Solve this with performing the kthreads affinity update from cpuset to the kthreads consolidated relevant code instead so that preferred affinities are honoured.
The dispatch of the new cpumasks to workqueues and kthreads is performed by housekeeping, as per the nice Tejun's suggestion.
As a welcome side effect,
HK_TYPE_DOMAINthen integrates both the set from isolcpus= and cpuset isolated partitions. Housekeeping cpumasks are now modifyable with specific synchronization. A big step toward making nohz_full= also mutable through cpuset in the future.Changes since v5:
* Add more tags
* Fix leaked
destroy_work_on_stack()(Zhang Qiao, Waiman Long)* Comment
schedule_drain_work()synchronization requirement (Tejun)* s/Revert of/Inverse of (Waiman Long)
* Remove
housekeeping_update()needless (for now) parameter (Chen Ridong)* Don't propagate
housekeeping_update()failures beyond allocations (Waiman Long)* Whitespace cleanup (Waiman Long)
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
kthread/core-v6HEAD:
811e87ca8a0a1e54eb5f23e71896cb97436cccdc
Quoted 7 lines
Quoted 2 lines
Happy new year,
FredericI don't see any major issue with this v6 version. There may be some minor issues that can be cleaned up later. Now the issue is which tree should this series go to as it touches a number of different subsystems with different maintainers.
It indeed crosses many subsystems. I would be fine if anybody takes it but nobody volunteered so far.
The main purpose is to fix kthreads affinity (HK_TYPE_DOMAIN handling cpuset is a bonus). And since I made the pull request myself to Linus when I introduced kthreads managed affinity, I guess I could reiterate with this patchset. I already pushed it to linux-next.
But if anybody wants to pull that to another tree, that's fine, just tell me so that we synchronize to avoid duplication on linux-next.
Thanks.
Signature · 2 lines
Frederic Weisbecker SUSE Labs
Quoted 61 lines · Frederic Weisbecker
Quoted 44 lines · Waiman Long
Quoted 43 lines · Frederic Weisbecker
Hi,
The kthread code was enhanced lately to provide an infrastructure which manages the preferred affinity of unbound kthreads (node or custom cpumask) against housekeeping constraints and CPU hotplug events.
One crucial missing piece is cpuset: when an isolated partition is created, deleted, or its CPUs updated, all the unbound kthreads in the top cpuset are affine to _all_ the non-isolated CPUs, possibly breaking their preferred affinity along the way
Solve this with performing the kthreads affinity update from cpuset to the kthreads consolidated relevant code instead so that preferred affinities are honoured.
The dispatch of the new cpumasks to workqueues and kthreads is performed by housekeeping, as per the nice Tejun's suggestion.
As a welcome side effect,
HK_TYPE_DOMAINthen integrates both the set from isolcpus= and cpuset isolated partitions. Housekeeping cpumasks are now modifyable with specific synchronization. A big step toward making nohz_full= also mutable through cpuset in the future.Changes since v5:
* Add more tags
* Fix leaked
destroy_work_on_stack()(Zhang Qiao, Waiman Long)* Comment
schedule_drain_work()synchronization requirement (Tejun)* s/Revert of/Inverse of (Waiman Long)
* Remove
housekeeping_update()needless (for now) parameter (Chen Ridong)* Don't propagate
housekeeping_update()failures beyond allocations (Waiman Long)* Whitespace cleanup (Waiman Long)
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git
kthread/core-v6Quoted 8 lines
Quoted 4 lines
HEAD:
811e87ca8a0a1e54eb5f23e71896cb97436cccdcHappy new year,
FredericI don't see any major issue with this v6 version. There may be some minor issues that can be cleaned up later. Now the issue is which tree should this series go to as it touches a number of different subsystems with different maintainers.
It indeed crosses many subsystems. I would be fine if anybody takes it but nobody volunteered so far.
The main purpose is to fix kthreads affinity (
HK_TYPE_DOMAINhandling cpuset is a bonus). And since I made the pull request myself to Linus when I introduced kthreads managed affinity, I guess I could reiterate with this patchset. I already pushed it to linux-next.
Quoted 4 lines
But if anybody wants to pull that to another tree, that's fine, just tell me so that we synchronize to avoid duplication on linux-next.
Thanks.
Good to know as I am wondering where it will go. So you are going to push that directly to Linus.
Cheers,
Longman
Will Deacon
maintainerRe: [PATCH 29/33] sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
In reply to Frederic WeisbeckerHi Frederic,
Quoted 19 lines · Frederic Weisbecker
When none of the allowed CPUs of a task are online, it gets migrated to the fallback cpumask which is all the non
nohz_fullCPUs.However just like
nohz_fullCPUs, domain isolated CPUs don't want to be disturbed by tasks that have lost their CPU affinities.And since
nohz_fullrely on domain isolation to work correctly, the housekeeping mask of domain isolated CPUs should always be a superset of the housekeeping mask ofnohz_fullCPUs (there can be CPUs that are domain isolated but notnohz_full, OTOH there shouldn't benohz_fullCPUs that are not domain isolated):HK_TYPE_DOMAIN | HK_TYPE_KERNEL_NOISE == HK_TYPE_DOMAINTherefore use
HK_TYPE_DOMAINas the appropriate fallback target for tasks and since this cpumask can be modified at runtime, make sure that 32 bits support CPUs on ARM64 mismatched systems are not isolated by cpusets.
Quoted 7 lines
Signed-off-by Frederic Weisbecker <[email protected]>Reviewed-by Waiman Long <[email protected]>--- arch/arm64/kernel/cpufeature.c | 18 +++++++++++++++--- include/linux/cpu.h | 4 ++++ kernel/cgroup/cpuset.c | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-)
tbh, I'd also be fine just saying that isolation isn't reliable on these systems and then you don't need to add the extra arch hook.
Whatever you prefer, but please can you update the text in Documentation/arch/arm64/asymmetric-32bit.rst to cover the interaction between the asymmetric stuff and cpu isolation?
Cheers,
Will
Frederic Weisbecker
maintainerRe: [PATCH 29/33] sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
Quoted 30 lines · Will Deacon
Hi Frederic,
Quoted 19 lines · Frederic Weisbecker
When none of the allowed CPUs of a task are online, it gets migrated to the fallback cpumask which is all the non
nohz_fullCPUs.However just like
nohz_fullCPUs, domain isolated CPUs don't want to be disturbed by tasks that have lost their CPU affinities.And since
nohz_fullrely on domain isolation to work correctly, the housekeeping mask of domain isolated CPUs should always be a superset of the housekeeping mask ofnohz_fullCPUs (there can be CPUs that are domain isolated but notnohz_full, OTOH there shouldn't benohz_fullCPUs that are not domain isolated):HK_TYPE_DOMAIN | HK_TYPE_KERNEL_NOISE == HK_TYPE_DOMAINTherefore use
HK_TYPE_DOMAINas the appropriate fallback target for tasks and since this cpumask can be modified at runtime, make sure that 32 bits support CPUs on ARM64 mismatched systems are not isolated by cpusets.Quoted 7 lines
Signed-off-by Frederic Weisbecker <[email protected]>Reviewed-by Waiman Long <[email protected]>--- arch/arm64/kernel/cpufeature.c | 18 +++++++++++++++--- include/linux/cpu.h | 4 ++++ kernel/cgroup/cpuset.c | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-)
Quoted 2 lines
tbh, I'd also be fine just saying that isolation isn't reliable on these systems and then you don't need to add the extra arch hook.
Hmm, I think I heard about nohz_full usage on arm64 but I'm not sure. And I usually expect isolcpus or cpuset isolated partitions to be even more broadly used, it's lighter isolation with less constraints.
Anyway you're probably right that we could remove isolation support here but I don't want to break any existing user.
Quoted 3 lines
Whatever you prefer, but please can you update the text in
Documentation/arch/arm64/asymmetric-32bit.rstto cover the interaction between the asymmetric stuff and cpu isolation?
I'll keep that path and update the documentation. I guess we can still consider removing that support afterward. If we do so anyway, it would deserve its own patchset and shouldn't be hidden in this pile.
Thanks.
Signature · 2 lines
Frederic Weisbecker SUSE Labs
Will Deacon
maintainerRe: [PATCH 29/33] sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
Quoted 34 lines · Frederic Weisbecker
Quoted 30 lines · Will Deacon
Hi Frederic,
Quoted 19 lines · Frederic Weisbecker
When none of the allowed CPUs of a task are online, it gets migrated to the fallback cpumask which is all the non
nohz_fullCPUs.However just like
nohz_fullCPUs, domain isolated CPUs don't want to be disturbed by tasks that have lost their CPU affinities.And since
nohz_fullrely on domain isolation to work correctly, the housekeeping mask of domain isolated CPUs should always be a superset of the housekeeping mask ofnohz_fullCPUs (there can be CPUs that are domain isolated but notnohz_full, OTOH there shouldn't benohz_fullCPUs that are not domain isolated):HK_TYPE_DOMAIN | HK_TYPE_KERNEL_NOISE == HK_TYPE_DOMAINTherefore use
HK_TYPE_DOMAINas the appropriate fallback target for tasks and since this cpumask can be modified at runtime, make sure that 32 bits support CPUs on ARM64 mismatched systems are not isolated by cpusets.Quoted 7 lines
Signed-off-by Frederic Weisbecker <[email protected]>Reviewed-by Waiman Long <[email protected]>--- arch/arm64/kernel/cpufeature.c | 18 +++++++++++++++--- include/linux/cpu.h | 4 ++++ kernel/cgroup/cpuset.c | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-)Quoted 2 lines
tbh, I'd also be fine just saying that isolation isn't reliable on these systems and then you don't need to add the extra arch hook.
Quoted 6 lines
Hmm, I think I heard about
nohz_fullusage on arm64 but I'm not sure. And I usually expect isolcpus or cpuset isolated partitions to be even more broadly used, it's lighter isolation with less constraints.Anyway you're probably right that we could remove isolation support here but I don't want to break any existing user.
fwiw, I think it's only some Android markets using the mismatched 32-bit support and we're definitely not using nohz_full there.
Will
Re: [PATCH 14/33] cpuset: Update HK_TYPE_DOMAIN cpumask from cpuset
In reply to Frederic WeisbeckerQuoted 155 lines · Frederic Weisbecker
Until now,
HK_TYPE_DOMAINused to only include boot defined isolated CPUs passed through isolcpus= boot option. Users interested in also knowing the runtime defined isolated CPUs through cpuset must use different APIs:cpuset_cpu_is_isolated(),cpu_is_isolated(), etc...There are many drawbacks to that approach:
1) Most interested subsystems want to know about all isolated CPUs, not just those defined on boot time.
2)
cpuset_cpu_is_isolated()/cpu_is_isolated()are not synchronized with concurrent cpuset changes.3) Further cpuset modifications are not propagated to subsystems
Solve 1) and 2) and centralize all isolated CPUs within the
HK_TYPE_DOMAINhousekeeping cpumask.Subsystems can rely on RCU to synchronize against concurrent changes.
The propagation mentioned in 3) will be handled in further patches.
Signed-off-by Frederic Weisbecker <[email protected]>Reviewed-by Waiman Long <[email protected]>Reviewed-by Chen Ridong <[email protected]>--- include/linux/sched/isolation.h | 7 ++++ kernel/cgroup/cpuset.c | 3 ++ kernel/sched/isolation.c | 73 ++++++++++++++++++++++++++++++--- kernel/sched/sched.h | 1 + 4 files changed, 78 insertions(+), 6 deletions(-)include/linux/sched/isolation.h +7
-0@@ -9,6 +9,11 @@enum hk_type {/* Inverse of boot-time isolcpus= argument */ HK_TYPE_DOMAIN_BOOT , +/* +* Same as HK_TYPE_DOMAIN_BOOT but also includes the +* inverse of cpuset isolated partitions. As such it +* is always a subset of HK_TYPE_DOMAIN_BOOT. +*/ HK_TYPE_DOMAIN ,/* Inverse of boot-time isolcpus=managed_irq argument */ HK_TYPE_MANAGED_IRQ ,@@ -35,6 +40,7 @@ extern const struct cpumask *housekeeping_cpumask(enum hk_type type);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_init (void );#else @@ -62,6 +68,7 @@ static inline bool housekeeping_test_cpu(int cpu, enum hk_type type) return true; } +static inline int housekeeping_update (struct cpumask *isol_mask) {return 0 ; }static inline void housekeeping_init (void ) { }#endif /* CONFIG_CPU_ISOLATION */ kernel/cgroup/cpuset.c +3
-0@@ -1490,6 +1490,9 @@ static void update_isolation_cpumasks(void) ret =tmigr_isolated_exclude_cpumask (isolated_cpus);WARN_ON_ONCE (ret <0 ); + ret =housekeeping_update (isolated_cpus); +WARN_ON_ONCE (ret <0 ); + isolated_cpus_updating = false; }kernel/sched/isolation.c +44
-6@@ -29,18 +29,48 @@ static struct housekeeping housekeeping;bool housekeeping_enabled (enum hk_type type) { -return !!(housekeeping.flags &BIT (type)); +return !!(READ_ONCE (housekeeping.flags) &BIT (type)); }EXPORT_SYMBOL_GPL (housekeeping_enabled); +static bool housekeeping_dereference_check (enum hk_type type) +{ +if (IS_ENABLED (CONFIG_LOCKDEP ) && type ==HK_TYPE_DOMAIN ) { +/* Cpuset isn't even writable yet? */ +if (system_state <=SYSTEM_SCHEDULING ) +return true; + +/* CPU hotplug write locked, so cpuset partition can't be overwritten */ +if (IS_ENABLED (CONFIG_HOTPLUG_CPU ) &&lockdep_is_cpus_write_held ()) +return true; + +/* Cpuset lock held, partitions not writable */ +if (IS_ENABLED (CONFIG_CPUSETS ) &&lockdep_is_cpuset_held ()) +return true; + +return false; + } + +return true; +} + +static inline struct cpumask *housekeeping_cpumask_dereference (enum hk_type type) +{ +return rcu_dereference_all_check (housekeeping.cpumasks[type], +housekeeping_dereference_check (type)); +} +const struct cpumask *housekeeping_cpumask (enum hk_type type) { +const struct cpumask *mask =NULL ; +if (static_branch_unlikely (&housekeeping_overridden)) { -if (housekeeping.flags &BIT (type)) { -return rcu_dereference_check (housekeeping.cpumasks[type],1 ); - } +if (READ_ONCE (housekeeping.flags) &BIT (type)) + mask =housekeeping_cpumask_dereference (type); } -return cpu_possible_mask; +if (!mask) + mask = cpu_possible_mask; +return mask; }EXPORT_SYMBOL_GPL (housekeeping_cpumask);@@ -80,12 +110,43 @@ EXPORT_SYMBOL_GPL(housekeeping_affine);bool housekeeping_test_cpu (int cpu,enum hk_type type) { -if (static_branch_unlikely (&housekeeping_overridden) && housekeeping.flags &BIT (type)) +if (static_branch_unlikely (&housekeeping_overridden) && +READ_ONCE (housekeeping.flags) &BIT (type))return cpumask_test_cpu (cpu,housekeeping_cpumask (type));return true; }EXPORT_SYMBOL_GPL (housekeeping_test_cpu); +int housekeeping_update (struct cpumask *isol_mask) +{ +struct cpumask *trial, *old =NULL ; + + trial =kmalloc (cpumask_size (),GFP_KERNEL ); +if (!trial) +return -ENOMEM ;
kernel/sched/isolation.c EXPORT_SYMBOL_GPL(housekeeping_affine); · line 136
Quoted 10 lines
kernel/sched/isolation.c +10
-0+ +cpumask_andnot (trial,housekeeping_cpumask (HK_TYPE_DOMAIN_BOOT ), isol_mask); +if (!cpumask_intersects (trial, cpu_online_mask)) { +kfree (trial); +return -EINVAL ; + } + +if (!housekeeping.flags) +static_branch_enable (&housekeeping_overridden); +
The cpu_read_lock is held outside, we should use static_branch_enable_cpuslocked here, since static_branch_enable acquires cpu_read_lock.
I have sent out a patch to fix this issue.
Quoted 28 lines
kernel/sched/isolation.c +13
-0+if (housekeeping.flags &HK_FLAG_DOMAIN ) + old =housekeeping_cpumask_dereference (HK_TYPE_DOMAIN ); +else +WRITE_ONCE (housekeeping.flags, housekeeping.flags |HK_FLAG_DOMAIN ); +rcu_assign_pointer (housekeeping.cpumasks[HK_TYPE_DOMAIN ], trial); + +synchronize_rcu (); + +kfree (old); + +return 0 ; +} +void __init housekeeping_init (void ) {enum hk_type type;kernel/sched/sched.h +1
-0@@ -30,6 +30,7 @@#include <linux/context_tracking.h> #include <linux/cpufreq.h> #include <linux/cpumask_api.h> +#include <linux/cpuset.h> #include <linux/ctype.h> #include <linux/file.h> #include <linux/fs_api.h>
Signature · 2 lines
Best regards, Ridong
Frederic Weisbecker
maintainerRe: [PATCH 29/33] sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
In reply to Will DeaconQuoted 39 lines · Will Deacon
Quoted 38 lines · Frederic Weisbecker
Quoted 30 lines · Will Deacon
Hi Frederic,
Quoted 19 lines · Frederic Weisbecker
When none of the allowed CPUs of a task are online, it gets migrated to the fallback cpumask which is all the non
nohz_fullCPUs.However just like
nohz_fullCPUs, domain isolated CPUs don't want to be disturbed by tasks that have lost their CPU affinities.And since
nohz_fullrely on domain isolation to work correctly, the housekeeping mask of domain isolated CPUs should always be a superset of the housekeeping mask ofnohz_fullCPUs (there can be CPUs that are domain isolated but notnohz_full, OTOH there shouldn't benohz_fullCPUs that are not domain isolated):HK_TYPE_DOMAIN | HK_TYPE_KERNEL_NOISE == HK_TYPE_DOMAINTherefore use
HK_TYPE_DOMAINas the appropriate fallback target for tasks and since this cpumask can be modified at runtime, make sure that 32 bits support CPUs on ARM64 mismatched systems are not isolated by cpusets.Quoted 7 lines
Signed-off-by Frederic Weisbecker <[email protected]>Reviewed-by Waiman Long <[email protected]>--- arch/arm64/kernel/cpufeature.c | 18 +++++++++++++++--- include/linux/cpu.h | 4 ++++ kernel/cgroup/cpuset.c | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-)Quoted 2 lines
tbh, I'd also be fine just saying that isolation isn't reliable on these systems and then you don't need to add the extra arch hook.
Hmm, I think I heard about
nohz_fullusage on arm64 but I'm not sure. And I usually expect isolcpus or cpuset isolated partitions to be even more broadly used, it's lighter isolation with less constraints.
Quoted 5 lines
Quoted 2 lines
Anyway you're probably right that we could remove isolation support here but I don't want to break any existing user.
fwiw, I think it's only some Android markets using the mismatched 32-bit support and we're definitely not using
nohz_fullthere.
Now that removal becomes appealing. And what about isolcpus= / isolated cpuset which only consist in scheduler domain isolation? Probably not used by android either.
Ok but is there a way to detect on early boot that the system has mismatched 32 bits support? Because I need to fail nohz_full= and isolcpus= boot parameters early on top of this information without waiting for secondary CPUs boot.
Thanks.
Signature · 2 lines
Frederic Weisbecker SUSE Labs
Will Deacon
maintainerRe: [PATCH 29/33] sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
Quoted 46 lines · Frederic Weisbecker
Quoted 39 lines · Will Deacon
Quoted 38 lines · Frederic Weisbecker
Quoted 30 lines · Will Deacon
Hi Frederic,
Quoted 19 lines · Frederic Weisbecker
When none of the allowed CPUs of a task are online, it gets migrated to the fallback cpumask which is all the non
nohz_fullCPUs.However just like
nohz_fullCPUs, domain isolated CPUs don't want to be disturbed by tasks that have lost their CPU affinities.And since
nohz_fullrely on domain isolation to work correctly, the housekeeping mask of domain isolated CPUs should always be a superset of the housekeeping mask ofnohz_fullCPUs (there can be CPUs that are domain isolated but notnohz_full, OTOH there shouldn't benohz_fullCPUs that are not domain isolated):HK_TYPE_DOMAIN | HK_TYPE_KERNEL_NOISE == HK_TYPE_DOMAINTherefore use
HK_TYPE_DOMAINas the appropriate fallback target for tasks and since this cpumask can be modified at runtime, make sure that 32 bits support CPUs on ARM64 mismatched systems are not isolated by cpusets.Quoted 7 lines
Signed-off-by Frederic Weisbecker <[email protected]>Reviewed-by Waiman Long <[email protected]>--- arch/arm64/kernel/cpufeature.c | 18 +++++++++++++++--- include/linux/cpu.h | 4 ++++ kernel/cgroup/cpuset.c | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-)Quoted 2 lines
tbh, I'd also be fine just saying that isolation isn't reliable on these systems and then you don't need to add the extra arch hook.
Hmm, I think I heard about
nohz_fullusage on arm64 but I'm not sure. And I usually expect isolcpus or cpuset isolated partitions to be even more broadly used, it's lighter isolation with less constraints.Quoted 5 lines
Quoted 2 lines
Anyway you're probably right that we could remove isolation support here but I don't want to break any existing user.
fwiw, I think it's only some Android markets using the mismatched 32-bit support and we're definitely not using
nohz_fullthere.
Quoted 7 lines
Now that removal becomes appealing. And what about isolcpus= / isolated cpuset which only consist in scheduler domain isolation? Probably not used by android either.
Ok but is there a way to detect on early boot that the system has mismatched 32 bits support? Because I need to fail nohz_full= and isolcpus= boot parameters early on top of this information without waiting for secondary CPUs boot.
Honestly, I'm not sure I'd bother trying to be smart here. Even if the system has enabled support for mismatched 32-bit CPUs, things should still work properly with nohz_full/isolcpus if all the tasks are 64-bit, right?
In which case, I'd just document whatever weird behaviour you get if somebody throws 32-bit tasks into the mix. Adding hooks to the generic code for this use-case just seems like a waste, as they're not going to be used in practice and it increases the maintenance burden.
Will
Frederic Weisbecker
maintainerRe: [PATCH 29/33] sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
Quoted 60 lines · Will Deacon
Quoted 46 lines · Frederic Weisbecker
Quoted 39 lines · Will Deacon
Quoted 38 lines · Frederic Weisbecker
Quoted 30 lines · Will Deacon
Hi Frederic,
Quoted 19 lines · Frederic Weisbecker
When none of the allowed CPUs of a task are online, it gets migrated to the fallback cpumask which is all the non
nohz_fullCPUs.However just like
nohz_fullCPUs, domain isolated CPUs don't want to be disturbed by tasks that have lost their CPU affinities.And since
nohz_fullrely on domain isolation to work correctly, the housekeeping mask of domain isolated CPUs should always be a superset of the housekeeping mask ofnohz_fullCPUs (there can be CPUs that are domain isolated but notnohz_full, OTOH there shouldn't benohz_fullCPUs that are not domain isolated):HK_TYPE_DOMAIN | HK_TYPE_KERNEL_NOISE == HK_TYPE_DOMAINTherefore use
HK_TYPE_DOMAINas the appropriate fallback target for tasks and since this cpumask can be modified at runtime, make sure that 32 bits support CPUs on ARM64 mismatched systems are not isolated by cpusets.Quoted 7 lines
Signed-off-by Frederic Weisbecker <[email protected]>Reviewed-by Waiman Long <[email protected]>--- arch/arm64/kernel/cpufeature.c | 18 +++++++++++++++--- include/linux/cpu.h | 4 ++++ kernel/cgroup/cpuset.c | 17 ++++++++++++++--- 3 files changed, 33 insertions(+), 6 deletions(-)Quoted 2 lines
tbh, I'd also be fine just saying that isolation isn't reliable on these systems and then you don't need to add the extra arch hook.
Hmm, I think I heard about
nohz_fullusage on arm64 but I'm not sure. And I usually expect isolcpus or cpuset isolated partitions to be even more broadly used, it's lighter isolation with less constraints.Quoted 5 lines
Quoted 2 lines
Anyway you're probably right that we could remove isolation support here but I don't want to break any existing user.
fwiw, I think it's only some Android markets using the mismatched 32-bit support and we're definitely not using
nohz_fullthere.Quoted 7 lines
Now that removal becomes appealing. And what about isolcpus= / isolated cpuset which only consist in scheduler domain isolation? Probably not used by android either.
Ok but is there a way to detect on early boot that the system has mismatched 32 bits support? Because I need to fail nohz_full= and isolcpus= boot parameters early on top of this information without waiting for secondary CPUs boot.
Honestly, I'm not sure I'd bother trying to be smart here. Even if the system has enabled support for mismatched 32-bit CPUs, things should still work properly with nohz_full/isolcpus if all the tasks are 64-bit, right?
Quoted 4 lines
In which case, I'd just document whatever weird behaviour you get if somebody throws 32-bit tasks into the mix. Adding hooks to the generic code for this use-case just seems like a waste, as they're not going to be used in practice and it increases the maintenance burden.
Ok, how does this updated version look now?
---
From: Frederic Weisbecker <[email protected]>
Date: Thu, 24 Jul 2025 23:38:48 +0200
Subject: [PATCH] sched/arm64: Move fallback task cpumask to HK_TYPE_DOMAIN
When none of the allowed CPUs of a task are online, it gets migrated to the fallback cpumask which is all the non nohz_full CPUs.
However just like nohz_full CPUs, domain isolated CPUs don't want to be disturbed by tasks that have lost their CPU affinities.
And since nohz_full rely on domain isolation to work correctly, the housekeeping mask of domain isolated CPUs should always be a subset of the housekeeping mask of nohz_full CPUs (there can be CPUs that are domain isolated but not nohz_full, OTOH there shouldn't be nohz_full CPUs that are not domain isolated):
HK_TYPE_DOMAIN & HK_TYPE_KERNEL_NOISE == HK_TYPE_DOMAIN
Therefore use HK_TYPE_DOMAIN as the appropriate fallback target for tasks. Note that cpuset isolated partitions are not supported on those systems and may result in undefined behaviour.
--- Documentation/arch/arm64/asymmetric-32bit.rst | 12 ++++++++---- arch/arm64/kernel/cpufeature.c | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-)
Documentation/arch/arm64/asymmetric-32bit.rst +8 -4
@@ -154,10 +154,14 @@ mode will return to host userspace with an ``exit_reason`` of ``KVM_EXIT_FAIL_ENTRY`` and will remain non-runnable until successfully re-initialised by a subsequent ``KVM_ARM_VCPU_INIT`` operation. -NOHZ FULL ---------- +SCHEDULER DOMAIN ISOLATION +-------------------------- -To avoid perturbing an adaptive-ticks CPU (specified using -``nohz_full=``) when a 32-bit task is forcefully migrated, these CPUs +To avoid perturbing a boot-defined domain isolated CPU (specified using +``isolcpus=[domain]``) when a 32-bit task is forcefully migrated, these CPUs are treated as 64-bit-only when support for asymmetric 32-bit systems is enabled. + +However as opposed to boot-defined domain isolation, runtime-defined domain +isolation using cpuset isolated partition is not advised on asymmetric +32-bit systems and will result in undefined behaviour.
arch/arm64/kernel/cpufeature.c +3 -3
@@ -1669,7 +1669,7 @@ const struct cpumask *system_32bit_el0_cpumask(void)const struct cpumask *task_cpu_fallback_mask (struct task_struct *p) { -return __task_cpu_possible_mask (p,housekeeping_cpumask (HK_TYPE_TICK )); +return __task_cpu_possible_mask (p,housekeeping_cpumask (HK_TYPE_DOMAIN )); }static int __init parse_32bit_el0_param (char *str)
@@ -3987,8 +3987,8 @@ static int enable_mismatched_32bit_el0(unsigned int cpu)bool cpu_32bit = false;if (id_aa64pfr0_32bit_el0 (info->reg_id_aa64pfr0)) { -if (!housekeeping_cpu (cpu,HK_TYPE_TICK )) -pr_info ("Treating adaptive-ticks CPU %u as 64-bit only\n" , cpu); +if (!housekeeping_cpu (cpu,HK_TYPE_DOMAIN )) +pr_info ("Treating domain isolated CPU %u as 64-bit only\n" , cpu);else cpu_32bit = true; }
Signature · 1 line
2.51.1
Re: [PATCH 01/33] PCI: Prepare to protect against concurrent isolated cpuset change
In reply to Frederic WeisbeckerQuoted 7 lines · Frederic Weisbecker
HK_TYPE_DOMAINwill soon integrate cpuset isolated partitions and therefore be made modifiable at runtime. Synchronize against the cpumask update using RCU.The RCU locked section includes both the housekeeping CPU target election for the PCI probe work and the work enqueue.
Quoted 6 lines
This way the housekeeping update side will simply need to flush the pending related works after updating the housekeeping mask in order to make sure that no PCI work ever executes on an isolated CPU. This part will be handled in a subsequent patch.
Signed-off-by Frederic Weisbecker <[email protected]>
Quoted 101 lines
--- drivers/pci/pci-driver.c | 47 ++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 9 deletions(-)drivers/pci/pci-driver.c +38
-9@@ -302,9 +302,8 @@ struct drv_dev_and_id {const struct pci_device_id *id; }; -static long local_pci_probe (void *_ddi) +static int local_pci_probe (struct drv_dev_and_id *ddi) { -struct drv_dev_and_id *ddi = _ddi;struct pci_dev *pci_dev = ddi->dev;struct pci_driver *pci_drv = ddi->drv;struct device *dev = &pci_dev->dev;@@ -338,6 +337,19 @@ static long local_pci_probe(void *_ddi)return 0 ; } +struct pci_probe_arg { +struct drv_dev_and_id *ddi; +struct work_struct work; +int ret; +}; + +static void local_pci_probe_callback (struct work_struct *work) +{ + struct pci_probe_arg *arg = container_of(work, struct pci_probe_arg, work); + + arg->ret =local_pci_probe (arg->ddi); +} +static bool pci_physfn_is_probed (struct pci_dev *dev) {#ifdef CONFIG_PCI_IOV @@ -362,34 +374,51 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, dev->is_probed =1 ;cpu_hotplug_disable (); -/* * Prevent nesting work_on_cpu() for the case where a Virtual Function * device is probed from work_on_cpu() of the Physical device. */ if (node <0 || node >=MAX_NUMNODES || !node_online (node) ||pci_physfn_is_probed (dev)) { - cpu = nr_cpu_ids; + error =local_pci_probe (&ddi); }else {cpumask_var_t wq_domain_mask; +struct pci_probe_arg arg = { .ddi = &ddi };if (!zalloc_cpumask_var (&wq_domain_mask,GFP_KERNEL )) { error = -ENOMEM ; goto out; } + +INIT_WORK_ONSTACK (&arg.work, local_pci_probe_callback); + +/* +* The target election and the enqueue of the work must be within +* the same RCU read side section so that when the workqueue pool +* is flushed after a housekeeping cpumask update, further readers +* are guaranteed to queue the probing work to the appropriate +* targets. +*/ +rcu_read_lock ();cpumask_and (wq_domain_mask,housekeeping_cpumask (HK_TYPE_WQ ),housekeeping_cpumask (HK_TYPE_DOMAIN )); cpu =cpumask_any_and (cpumask_of_node (node), wq_domain_mask); +if (cpu < nr_cpu_ids) { +schedule_work_on (cpu, &arg.work); +rcu_read_unlock (); +flush_work (&arg.work); + error = arg.ret; + }else { +rcu_read_unlock (); + error =local_pci_probe (&ddi); + } +free_cpumask_var (wq_domain_mask); +destroy_work_on_stack (&arg.work); } - -if (cpu < nr_cpu_ids) - error =work_on_cpu (cpu, local_pci_probe, &ddi); -else - error =local_pci_probe (&ddi); out: dev->is_probed =0 ;cpu_hotplug_enable ();Signature · 1 line
2.51.1
Re: [PATCH 17/33] PCI: Flush PCI probe workqueue on cpuset isolated partition change
In reply to Frederic WeisbeckerQuoted 5 lines · Frederic Weisbecker
The
HK_TYPE_DOMAINhousekeeping cpumask is now modifiable at runtime. In order to synchronize against PCI probe works and make sure that no asynchronous probing is still pending or executing on a newly isolated CPU, the housekeeping subsystem must flush the PCI probe works.
Quoted 7 lines
However the PCI probe works can't be flushed easily since they are queued to the main per-CPU workqueue pool.
Solve this with creating a PCI probe-specific pool and provide and use the appropriate flushing API.
Signed-off-by Frederic Weisbecker <[email protected]>
Quoted 99 lines
--- drivers/pci/pci-driver.c | 17 ++++++++++++++++- include/linux/pci.h | 3 +++ kernel/sched/isolation.c | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-)drivers/pci/pci-driver.c +16
-1@@ -337,6 +337,8 @@ static int local_pci_probe(struct drv_dev_and_id *ddi)return 0 ; } +static struct workqueue_struct *pci_probe_wq; +struct pci_probe_arg {struct drv_dev_and_id *ddi;struct work_struct work;@@ -407,7 +409,11 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, cpu =cpumask_any_and (cpumask_of_node (node), wq_domain_mask);if (cpu < nr_cpu_ids) { -schedule_work_on (cpu, &arg.work); +struct workqueue_struct *wq = pci_probe_wq; + +if (WARN_ON_ONCE (!wq)) + wq = system_percpu_wq; +queue_work_on (cpu, wq, &arg.work);rcu_read_unlock ();flush_work (&arg.work); error = arg.ret;@@ -425,6 +431,11 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,return error; } +void pci_probe_flush_workqueue (void ) +{ +flush_workqueue (pci_probe_wq); +} +/** * __pci_device_probe - check if a driver wants to claim a specific PCI device * @drv: driver to call to check if it wants the PCI device @@ -1762,6 +1773,10 @@ static int __init pci_driver_init(void) {int ret; + pci_probe_wq =alloc_workqueue ("sync_wq" ,WQ_PERCPU ,0 ); +if (!pci_probe_wq) +return -ENOMEM ; + ret =bus_register (&pci_bus_type);if (ret)return ret;include/linux/pci.h +3
-0@@ -1206,6 +1206,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus, struct pci_ops *ops, void *sysdata, struct list_head *resources);int pci_host_probe (struct pci_host_bridge *bridge); +void pci_probe_flush_workqueue (void );int pci_bus_insert_busn_res (struct pci_bus *b,int bus,int busmax);int pci_bus_update_busn_res_end (struct pci_bus *b,int busmax);void pci_bus_release_busn_res (struct pci_bus *b);@@ -2079,6 +2080,8 @@ static inline int pci_has_flag(int flag) { return 0; } _PCI_NOP_ALL(read, *) _PCI_NOP_ALL(write,) +static inline void pci_probe_flush_workqueue(void) { } + static inline struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from)kernel/sched/isolation.c +2
-0@@ -8,6 +8,7 @@* */ #include <linux/sched/isolation.h> +#include <linux/pci.h> #include "sched.h" enum hk_flags {@@ -142,6 +143,7 @@ int housekeeping_update(struct cpumask *isol_mask)synchronize_rcu (); +pci_probe_flush_workqueue ();mem_cgroup_flush_workqueue ();vmstat_flush_workqueue ();Signature · 1 line
2.51.1
Re: [PATCH 23/33] PCI: Remove superfluous HK_TYPE_WQ check
In reply to Frederic WeisbeckerQuoted 9 lines · Frederic Weisbecker
It doesn't make sense to use
nohz_fullwithout also isolating the related CPUs from the domain topology, either through the use of isolcpus= or cpuset isolated partitions.And now
HK_TYPE_DOMAINincludes all kinds of domain isolated CPUs.This means that
HK_TYPE_KERNEL_NOISE(of whichHK_TYPE_WQis only an alias) should always be a subset ofHK_TYPE_DOMAIN.
Quoted 7 lines
Therefore sane configurations verify:
HK_TYPE_KERNEL_NOISE | HK_TYPE_DOMAIN == HK_TYPE_DOMAINSimplify the PCI probe target election accordingly.
Signed-off-by Frederic Weisbecker <[email protected]>
Quoted 55 lines
--- drivers/pci/pci-driver.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)drivers/pci/pci-driver.c +3
-14@@ -384,16 +384,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, pci_physfn_is_probed(dev)) { error = local_pci_probe(&ddi); } else { -cpumask_var_t wq_domain_mask;struct pci_probe_arg arg = { .ddi = &ddi }; -if (!zalloc_cpumask_var (&wq_domain_mask,GFP_KERNEL )) { - error = -ENOMEM ; - goto out; - } -INIT_WORK_ONSTACK (&arg.work, local_pci_probe_callback); -/* * The target election and the enqueue of the work must be within * the same RCU read side section so that when the workqueue pool @@ -402,12 +395,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,* targets. */ rcu_read_lock (); -cpumask_and (wq_domain_mask, -housekeeping_cpumask (HK_TYPE_WQ ), -housekeeping_cpumask (HK_TYPE_DOMAIN )); - cpu =cpumask_any_and (cpumask_of_node (node), - wq_domain_mask); +housekeeping_cpumask (HK_TYPE_DOMAIN )); +if (cpu < nr_cpu_ids) {struct workqueue_struct *wq = pci_probe_wq;@@ -422,10 +412,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, error =local_pci_probe (&ddi); } -free_cpumask_var (wq_domain_mask);destroy_work_on_stack (&arg.work); } -out: + dev->is_probed =0 ;cpu_hotplug_enable ();return error;Signature · 1 line
2.51.1
Re: [PATCH 04/33] mm: vmstat: Prepare to protect against concurrent isolated cpuset change
In reply to Frederic WeisbeckerQuoted 20 lines · Frederic Weisbecker
The
HK_TYPE_DOMAINhousekeeping cpumask will soon be made modifiable at runtime. In order to synchronize against vmstat workqueue to make sure that no asynchronous vmstat work is pending or executing on a newly made isolated CPU, target and queue a vmstat work under the same RCU read side critical section.Whenever housekeeping will update the
HK_TYPE_DOMAINcpumask, a vmstat workqueue flush will also be issued in a further change to make sure that no work remains pending after a CPU has been made isolated.Signed-off-by Frederic Weisbecker <[email protected]>--- mm/vmstat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)mm/vmstat.c +0
-0
mm/vmstat.c static void vmstat_shepherd(struct work_struct *w) · line 2149
Quoted 8 lines
mm/vmstat.c +3
-2@@ -2144,11 +2144,13 @@ static void vmstat_shepherd(struct work_struct *w)* infrastructure ever noticing. Skip regular flushing from vmstat_shepherd * for all isolated CPUs to avoid interference with the isolated workload. */ -if (cpu_is_isolated (cpu)) -continue ; +scoped_guard (rcu) { +if (cpu_is_isolated (cpu)) +continue ;
I think this might have introduced a bug - or at least an unintentional change in the program flow.
scoped_guard() is implemented using a for loop. Now this continue statement will only exit the scoped_guard() scope rather than continuing the outer for loop. This means that cond_resched() will be called when it previously was not.
Quoted 9 lines
mm/vmstat.c +3
-2-if (!delayed_work_pending (dw) &&need_update (cpu)) -queue_delayed_work_on (cpu, mm_percpu_wq, dw,0 ); +if (!delayed_work_pending (dw) &&need_update (cpu)) +queue_delayed_work_on (cpu, mm_percpu_wq, dw,0 ); + }cond_resched (); }
Re: [PATCH 04/33] mm: vmstat: Prepare to protect against concurrent isolated cpuset change
Quoted 34 lines · David Lechner
Quoted 20 lines · Frederic Weisbecker
The
HK_TYPE_DOMAINhousekeeping cpumask will soon be made modifiable at runtime. In order to synchronize against vmstat workqueue to make sure that no asynchronous vmstat work is pending or executing on a newly made isolated CPU, target and queue a vmstat work under the same RCU read side critical section.Whenever housekeeping will update the
HK_TYPE_DOMAINcpumask, a vmstat workqueue flush will also be issued in a further change to make sure that no work remains pending after a CPU has been made isolated.Signed-off-by Frederic Weisbecker <[email protected]>--- mm/vmstat.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)mm/vmstat.c +0
-0mm/vmstat.c static void vmstat_shepherd(struct work_struct *w) · line 2149
Quoted 8 lines
mm/vmstat.c +3
-2@@ -2144,11 +2144,13 @@ static void vmstat_shepherd(struct work_struct *w)* infrastructure ever noticing. Skip regular flushing from vmstat_shepherd * for all isolated CPUs to avoid interference with the isolated workload. */ -if (cpu_is_isolated (cpu)) -continue ; +scoped_guard (rcu) { +if (cpu_is_isolated (cpu)) +continue ;I think this might have introduced a bug - or at least an unintentional change in the program flow.
Quoted 4 lines
scoped_guard()is implemented using a for loop. Now this continue statement will only exit thescoped_guard()scope rather than continuing the outer for loop. This means thatcond_resched()will be called when it previously was not.
Yup, I've been bitten by that once before. It lead to very subtle breakage that took me a while to figure out. I've now mentally banished the use of scoped_guard() inside any form of loop, but that's a pretty brittle strategy...
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.