Revert "workqueue: respect isolated cpus when queueing an unbound work" (edbfd911) · Commits · 戴 / test

This reverts commit . It conflicts with the following isolcpus change from the sched branch. ("sched/isolation: Move isolcpus= handling to the housekeeping code") Let's revert for now. Signed-off-by:

Tejun Heo <tj@kernel.org>

kernel/workqueue.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -4980,10 +4980,6 @@ int workqueue_set_unbound_cpumask(cpumask_var_t cpumask)
		if (!zalloc_cpumask_var(&saved_cpumask, GFP_KERNEL))
		return -ENOMEM;

		/*
		* Not excluding isolated cpus on purpose.
		* If the user wishes to include them, we allow that.
		*/
		cpumask_and(cpumask, cpumask, cpu_possible_mask);
		if (!cpumask_empty(cpumask)) {
		apply_wqattrs_lock();
		@@ -5583,7 +5579,7 @@ int __init workqueue_init_early(void)
		WARN_ON(__alignof__(struct pool_workqueue) < __alignof__(long long));

		BUG_ON(!alloc_cpumask_var(&wq_unbound_cpumask, GFP_KERNEL));
		cpumask_andnot(wq_unbound_cpumask, cpu_possible_mask, cpu_isolated_map);
		cpumask_copy(wq_unbound_cpumask, cpu_possible_mask);

		pwq_cache = KMEM_CACHE(pool_workqueue, SLAB_PANIC);

Admin message