Commit 2ab73938 authored by Waiman Long's avatar Waiman Long Committed by Tejun Heo
Browse files

workqueue: Remove HK_TYPE_WQ from affecting wq_unbound_cpumask 



For historical reason, wq_unbound_cpumask is initially set as
intersection of HK_TYPE_DOMAIN, HK_TYPE_WQ and workqueue.unbound_cpus
boot command line option.

At run time, users can update the unbound cpumask via the
/sys/devices/virtual/workqueue/cpumask sysfs file. Creation
and modification of cpuset isolated partitions will also update
wq_unbound_cpumask based on the latest HK_TYPE_DOMAIN cpumask.
The HK_TYPE_WQ cpumask is out of the picture with these runtime updates.

Complete the transition by taking HK_TYPE_WQ out from the workqueue code
and make it depends on HK_TYPE_DOMAIN only from the housekeeping side.
The final goal is to eliminate HK_TYPE_WQ as a housekeeping cpumask type.

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent afeaa9f2

kernel/workqueue.c

+1 −2
Original line number Diff line number Diff line
@@ -7081,7 +7081,7 @@ int workqueue_unbound_housekeeping_update(const struct cpumask *hk) 
	/*

	 * If the operation fails, it will fall back to

	 * wq_requested_unbound_cpumask which is initially set to

	 * (HK_TYPE_WQ ∩ HK_TYPE_DOMAIN) house keeping mask and rewritten

	 * HK_TYPE_DOMAIN house keeping mask and rewritten

	 * by any subsequent write to workqueue/cpumask sysfs file.

	 */

	if (!cpumask_and(cpumask, wq_requested_unbound_cpumask, hk))
@@ -7901,7 +7901,6 @@ void __init workqueue_init_early(void) 


	cpumask_copy(wq_online_cpumask, cpu_online_mask);

	cpumask_copy(wq_unbound_cpumask, cpu_possible_mask);

	restrict_unbound_cpumask("HK_TYPE_WQ", housekeeping_cpumask(HK_TYPE_WQ));

	restrict_unbound_cpumask("HK_TYPE_DOMAIN", housekeeping_cpumask(HK_TYPE_DOMAIN));

	if (!cpumask_empty(&wq_cmdline_cpumask))

		restrict_unbound_cpumask("workqueue.unbound_cpus", &wq_cmdline_cpumask);