2023-01-13 18:01:09

by Valentin Schneider

Subject: [PATCH] workqueue: Fold rebind_worker() within rebind_workers()

!CONFIG_SMP builds complain about rebind_worker() being unused. Its only
user, rebind_workers() is indeed only defined for CONFIG_SMP, so just fold
the two lines back up there.

Link: http://lore.kernel.org/r/[email protected]
Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Valentin Schneider <[email protected]>
---
kernel/workqueue.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0d44c33b5b24e..dce29154cd07a 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1986,12 +1986,6 @@ static void unbind_worker(struct worker *worker)
WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, cpu_possible_mask) < 0);
}

-static void rebind_worker(struct worker *worker, struct worker_pool *pool)
-{
- kthread_set_per_cpu(worker->task, pool->cpu);
- WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task, pool->attrs->cpumask) < 0);
-}
-
static void wake_dying_workers(struct list_head *cull_list)
{
struct worker *worker, *tmp;
@@ -5149,8 +5143,11 @@ static void rebind_workers(struct worker_pool *pool)
* of all workers first and then clear UNBOUND. As we're called
* from CPU_ONLINE, the following shouldn't fail.
*/
- for_each_pool_worker(worker, pool)
- rebind_worker(worker, pool);
+ for_each_pool_worker(worker, pool) {
+ kthread_set_per_cpu(worker->task, pool->cpu);
+ WARN_ON_ONCE(set_cpus_allowed_ptr(worker->task,
+ pool->attrs->cpumask) < 0);
+ }

raw_spin_lock_irq(&pool->lock);

--
2.31.1

2023-01-13 19:07:25

by Tejun Heo

Subject: Re: [PATCH] workqueue: Fold rebind_worker() within rebind_workers()

On Fri, Jan 13, 2023 at 05:40:40PM +0000, Valentin Schneider wrote:
> !CONFIG_SMP builds complain about rebind_worker() being unused. Its only
> user, rebind_workers() is indeed only defined for CONFIG_SMP, so just fold
> the two lines back up there.
>
> Link: http://lore.kernel.org/r/[email protected]
> Reported-by: Stephen Rothwell <[email protected]>
> Signed-off-by: Valentin Schneider <[email protected]>

Applied to wq/for-6.3.

Thanks.

--
tejun