diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-03 16:29:19 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-04 20:25:05 +0200 |
| commit | e1b470581760c6de76ce372132a2c0cb8efa6499 (patch) | |
| tree | 2aa291b7a244128fd5eb699ac6061426037bab34 | |
| parent | 9459d4af2460721100559cbe52f4d8c445f7955b (diff) | |
Revert "workqueue: Make wq_adjust_max_active() round-robin pwqs while activating"
This reverts commit ddb232dc0f1339f9ed506730fd6bee6f5e3dcb37 which is
commit c5404d4e6df6faba1007544b5f4e62c7c14416dd upstream.
The workqueue patches backported to 6.8.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>
| -rw-r--r-- | kernel/workqueue.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 1659cd4a36c6..80733046ee01 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4703,7 +4703,7 @@ static int init_rescuer(struct workqueue_struct *wq) */ static void wq_adjust_max_active(struct workqueue_struct *wq) { - bool activated; + struct pool_workqueue *pwq; lockdep_assert_held(&wq->mutex); @@ -4723,26 +4723,19 @@ static void wq_adjust_max_active(struct workqueue_struct *wq) */ WRITE_ONCE(wq->max_active, wq->saved_max_active); - /* - * Round-robin through pwq's activating the first inactive work item - * until max_active is filled. - */ - do { - struct pool_workqueue *pwq; + for_each_pwq(pwq, wq) { + unsigned long flags; - activated = false; - for_each_pwq(pwq, wq) { - unsigned long flags; + /* this function can be called during early boot w/ irq disabled */ + raw_spin_lock_irqsave(&pwq->pool->lock, flags); - /* can be called during early boot w/ irq disabled */ - raw_spin_lock_irqsave(&pwq->pool->lock, flags); - if (pwq_activate_first_inactive(pwq)) { - activated = true; - kick_pool(pwq->pool); - } - raw_spin_unlock_irqrestore(&pwq->pool->lock, flags); - } - } while (activated); + while (pwq_activate_first_inactive(pwq)) + ; + + kick_pool(pwq->pool); + + raw_spin_unlock_irqrestore(&pwq->pool->lock, flags); + } } __printf(1, 4) |