add ->manager to make gcwq_unbind_fn() knows the manager and unbind it. It just prepares, this code is useless until "we unbind/rebind without manager_mutex"
Signed-off-by: Lai Jiangshan <la...@cn.fujitsu.com> --- kernel/workqueue.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 1946be4..9f4dd20 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -160,6 +160,7 @@ struct worker_pool { struct timer_list idle_timer; /* L: worker idle timeout */ struct timer_list mayday_timer; /* L: SOS timer for workers */ + struct worker *manager; /* L: manager worker */ struct mutex manager_mutex; /* mutex manager should hold */ struct ida worker_ida; /* L: for worker IDs */ }; @@ -2055,6 +2056,7 @@ static bool manage_workers(struct worker *worker) if (!mutex_trylock(&pool->manager_mutex)) return ret; + pool->manager = worker; pool->flags &= ~POOL_MANAGE_WORKERS; /* @@ -2065,6 +2067,8 @@ static bool manage_workers(struct worker *worker) ret |= maybe_create_worker(pool); mutex_unlock(&pool->manager_mutex); + pool->manager = NULL; + return ret; } @@ -3426,9 +3430,12 @@ static void gcwq_unbind_fn(struct work_struct *work) * ones which are still executing works from before the last CPU * down must be on the cpu. After this, they may become diasporas. */ - for_each_worker_pool(pool, gcwq) + for_each_worker_pool(pool, gcwq) { list_for_each_entry(worker, &pool->idle_list, entry) worker->flags |= WORKER_UNBOUND; + if (pool->manager) + pool->manager->flags |= WORKER_UNBOUND; + } for_each_busy_worker(worker, i, pos, gcwq) worker->flags |= WORKER_UNBOUND; @@ -3748,6 +3755,7 @@ static int __init init_workqueues(void) setup_timer(&pool->mayday_timer, gcwq_mayday_timeout, (unsigned long)pool); + pool->manager = NULL; mutex_init(&pool->manager_mutex); ida_init(&pool->worker_ida); } -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/