[PATCH] workqueue/hotplug: simplify workqueue_offline_cpu()

[PATCH] workqueue/hotplug: simplify workqueue_offline_cpu()

[Lai Jiangshan]

Since the refactor for the cpu/hotplug is done,
workqueue_offline_cpu() is ensured to be run on the
local cpu which is going off.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
---
 kernel/workqueue.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 8fdb710bfdd7..5c99beb8577d 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1634,7 +1634,7 @@ static void worker_enter_idle(struct worker *worker)
 		mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT);
 
 	/*
-	 * Sanity check nr_running.  Because wq_unbind_fn() releases
+	 * Sanity check nr_running.  Because unbind_workers() releases
 	 * pool->lock between setting %WORKER_UNBOUND and zapping
 	 * nr_running, the warning may trigger spuriously.  Check iff
 	 * unbind is not in progress.
@@ -4510,9 +4510,8 @@ void show_workqueue_state(void)
  * cpu comes back online.
  */
 
-static void wq_unbind_fn(struct work_struct *work)
+static void unbind_workers(int cpu)
 {
-	int cpu = smp_processor_id();
 	struct worker_pool *pool;
 	struct worker *worker;
 
@@ -4709,12 +4708,13 @@ int workqueue_online_cpu(unsigned int cpu)
 
 int workqueue_offline_cpu(unsigned int cpu)
 {
-	struct work_struct unbind_work;
 	struct workqueue_struct *wq;
 
 	/* unbinding per-cpu workers should happen on the local CPU */
-	INIT_WORK_ONSTACK(&unbind_work, wq_unbind_fn);
-	queue_work_on(cpu, system_highpri_wq, &unbind_work);
+	if (WARN_ON(cpu != smp_processor_id()))
+		return -1;
+
+	unbind_workers(cpu);
 
 	/* update NUMA affinity of unbound workqueues */
 	mutex_lock(&wq_pool_mutex);
@@ -4722,9 +4722,6 @@ int workqueue_offline_cpu(unsigned int cpu)
 		wq_update_unbound_numa(wq, cpu, false);
 	mutex_unlock(&wq_pool_mutex);
 
-	/* wait for per-cpu unbinding to finish */
-	flush_work(&unbind_work);
-	destroy_work_on_stack(&unbind_work);
 	return 0;
 }
 
-- 
2.13.6 (Apple Git-96)

Re: [PATCH] workqueue/hotplug: simplify workqueue_offline_cpu()

[Tejun Heo]

On Fri, Dec 01, 2017 at 10:20:36PM +0800, Lai Jiangshan wrote:
> Since the refactor for the cpu/hotplug is done,
> workqueue_offline_cpu() is ensured to be run on the
> local cpu which is going off.
> 
> Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>

Applied to wq/for-4.16 w/ minor desc update.

Thanks.

-- 
tejun