[PATCH V2 5/5] workqueue: Init rescuer's affinities as the wq's effective cpumask

From: Lai Jiangshan
Date: Wed Jul 03 2024 - 23:47:44 EST


From: Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx>

Make it consistent with apply_wqattrs_commit().

Link: https://lore.kernel.org/lkml/20240203154334.791910-5-longman@xxxxxxxxxx/
Cc: Juri Lelli <juri.lelli@xxxxxxxxxx>
Cc: Waiman Long <longman@xxxxxxxxxx>
Signed-off-by: Lai Jiangshan <jiangshan.ljs@xxxxxxxxxxxx>
---
kernel/workqueue.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 5129934f274f..8b2a0fe4a85e 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -5525,6 +5525,8 @@ static int init_rescuer(struct workqueue_struct *wq)
struct worker *rescuer;
int ret;

+ lockdep_assert_held(&wq_pool_mutex);
+
if (!(wq->flags & WQ_MEM_RECLAIM))
return 0;

@@ -5547,7 +5549,7 @@ static int init_rescuer(struct workqueue_struct *wq)

wq->rescuer = rescuer;
if (wq->flags & WQ_UNBOUND)
- kthread_bind_mask(rescuer->task, wq_unbound_cpumask);
+ kthread_bind_mask(rescuer->task, unbound_effective_cpumask(wq));
else
kthread_bind_mask(rescuer->task, cpu_possible_mask);
wake_up_process(rescuer->task);
@@ -5711,10 +5713,10 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,

list_add_tail_rcu(&wq->list, &workqueues);

- apply_wqattrs_unlock();
-
if (wq_online && init_rescuer(wq) < 0)
- goto err_destroy;
+ goto err_unlock_destroy;
+
+ apply_wqattrs_unlock();

if ((wq->flags & WQ_SYSFS) && workqueue_sysfs_register(wq))
goto err_destroy;
@@ -5739,6 +5741,8 @@ struct workqueue_struct *alloc_workqueue(const char *fmt,
free_workqueue_attrs(wq->unbound_attrs);
kfree(wq);
return NULL;
+err_unlock_destroy:
+ apply_wqattrs_unlock();
err_destroy:
destroy_workqueue(wq);
return NULL;
--
2.19.1.6.gb485710b