]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "workqueue: Don't call cpumask_test_cpu() with -1 CPU in wq_update_node_max_ac...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 14:35:37 +0000 (16:35 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Apr 2024 18:23:06 +0000 (20:23 +0200)
This reverts commit 7df62b8cca38aa452b508b477b16544cba615084 which is
commit 15930da42f8981dc42c19038042947b475b19f47 upstream.

The workqueue patches backported to 6.6.y caused some reported
regressions, so revert them for now.

Reported-by: Thorsten Leemhuis <regressions@leemhuis.info>
Cc: Tejun Heo <tj@kernel.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Cc: Audra Mitchell <audra@redhat.com>
Link: https://lore.kernel.org/all/ce4c2f67-c298-48a0-87a3-f933d646c73b@leemhuis.info/
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/workqueue.c

index 7d231bbd165937875e7d312d726309a39a861b74..b2975e44dffa9c200005eff25407f87f1121f42a 100644 (file)
@@ -1500,7 +1500,7 @@ static void wq_update_node_max_active(struct workqueue_struct *wq, int off_cpu)
 
        lockdep_assert_held(&wq->mutex);
 
-       if (off_cpu >= 0 && !cpumask_test_cpu(off_cpu, effective))
+       if (!cpumask_test_cpu(off_cpu, effective))
                off_cpu = -1;
 
        total_cpus = cpumask_weight_and(effective, cpu_online_mask);