From: Lai Jiangshan Date: Fri, 21 Jun 2024 07:32:25 +0000 (+0800) Subject: workqueue: Remove useless pool->dying_workers X-Git-Tag: v6.11-rc1~220^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a071b043ab13ae1f5d12ba6f267936feb800dff8;p=thirdparty%2Fkernel%2Flinux.git workqueue: Remove useless pool->dying_workers A dying worker is first moved from pool->workers to pool->dying_workers in set_worker_dying() and removed from pool->dying_workers in detach_dying_workers(). The whole procedure is in the some lock context of wq_pool_attach_mutex. So pool->dying_workers is useless, just remove it and keep the dying worker in pool->workers after set_worker_dying() and remove it in detach_dying_workers() with wq_pool_attach_mutex held. Cc: Valentin Schneider Signed-off-by: Lai Jiangshan Signed-off-by: Tejun Heo --- diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 04168972814bb..adf1893b161ee 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -215,7 +215,6 @@ struct worker_pool { struct worker *manager; /* L: purely informational */ struct list_head workers; /* A: attached workers */ - struct list_head dying_workers; /* A: workers about to die */ struct ida worker_ida; /* worker IDs for task name */ @@ -2862,7 +2861,6 @@ static void set_worker_dying(struct worker *worker, struct list_head *list) worker->flags |= WORKER_DIE; list_move(&worker->entry, list); - list_move(&worker->node, &pool->dying_workers); /* get an extra task struct reference for later kthread_stop_put() */ get_task_struct(worker->task); @@ -4721,7 +4719,6 @@ static int init_worker_pool(struct worker_pool *pool) timer_setup(&pool->mayday_timer, pool_mayday_timeout, 0); INIT_LIST_HEAD(&pool->workers); - INIT_LIST_HEAD(&pool->dying_workers); ida_init(&pool->worker_ida); INIT_HLIST_NODE(&pool->hash_node);