git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 517cd3032fa424c6b79e26858b0457cb5bfae7dd Mon Sep 17 00:00:00 2001
   2 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   3 Date: Wed, 3 Apr 2024 16:29:12 +0200
   4 Subject: Revert "workqueue: Don't call cpumask_test_cpu() with -1 CPU in wq_update_node_max_active()"
   5
   6 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   7
   8 This reverts commit 9fc557d489f8163c1aabcb89114b8eba960f4097 which is commit
   9 15930da42f8981dc42c19038042947b475b19f47 upstream.
  10
  11 The workqueue patches backported to 6.8.y caused some reported
  12 regressions, so revert them for now.
  13
  14 Reported-by: Thorsten Leemhuis <regressions@leemhuis.info>
  15 Cc: Tejun Heo <tj@kernel.org>
  16 Cc: Marek Szyprowski <m.szyprowski@samsung.com>
  17 Cc: Nathan Chancellor <nathan@kernel.org>
  18 Cc: Sasha Levin <sashal@kernel.org>
  19 Cc: Audra Mitchell <audra@redhat.com>
  20 Link: https://lore.kernel.org/all/ce4c2f67-c298-48a0-87a3-f933d646c73b@leemhuis.info/
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  22 ---
  23  kernel/workqueue.c |    2 +-
  24  1 file changed, 1 insertion(+), 1 deletion(-)
  25
  26 --- a/kernel/workqueue.c
  27 +++ b/kernel/workqueue.c
  28 @@ -1506,7 +1506,7 @@ static void wq_update_node_max_active(st
  29
  30         lockdep_assert_held(&wq->mutex);
  31
  32 -       if (off_cpu >= 0 && !cpumask_test_cpu(off_cpu, effective))
  33 +       if (!cpumask_test_cpu(off_cpu, effective))
  34                 off_cpu = -1;
  35
  36         total_cpus = cpumask_weight_and(effective, cpu_online_mask);