From c5178e6ca6c8063edc103b75f410add7e4565e63 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Thu, 4 Jul 2024 11:49:11 +0800 Subject: [PATCH] workqueue: Make rescuer initialization as the last step of the creation of a new wq For early wq allocation, rescuer initialization is the last step of the creation of a new wq. Make the behavior the same for all allocations. Prepare for initializing rescuer's affinities with the default pwq's affinities. Prepare for moving the whole workqueue initializing procedure into wq_pool_mutex and cpu hotplug locks. Cc: Juri Lelli Cc: Waiman Long Signed-off-by: Lai Jiangshan Signed-off-by: Tejun Heo --- kernel/workqueue.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 5cb1dd0a49fb..af00e63182d0 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5681,9 +5681,6 @@ struct workqueue_struct *alloc_workqueue(const char *fmt, if (alloc_and_link_pwqs(wq) < 0) goto err_free_node_nr_active; - if (wq_online && init_rescuer(wq) < 0) - goto err_destroy; - /* * wq_pool_mutex protects global freeze state and workqueues list. * Grab it, adjust max_active and add the new @wq to workqueues @@ -5699,6 +5696,9 @@ struct workqueue_struct *alloc_workqueue(const char *fmt, mutex_unlock(&wq_pool_mutex); + if (wq_online && init_rescuer(wq) < 0) + goto err_destroy; + if ((wq->flags & WQ_SYSFS) && workqueue_sysfs_register(wq)) goto err_destroy;