diff options
| author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2014-06-03 15:33:27 +0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-12-05 18:08:24 +0100 |
| commit | 60949ae2405c35e9ceec6e7995f4b47be4ffedf1 (patch) | |
| tree | ecb9bdd5e18dea09385f5ac44c021921ef78402c /kernel/workqueue.c | |
| parent | 004bf181b08753d07de827acb2557e6107d4875a (diff) | |
| download | android_kernel_m2note-60949ae2405c35e9ceec6e7995f4b47be4ffedf1.tar.gz | |
workqueue: clear POOL_DISASSOCIATED in rebind_workers()
a9ab775bcadf ("workqueue: directly restore CPU affinity of workers
from CPU_ONLINE") moved pool locking into rebind_workers() but left
"pool->flags &= ~POOL_DISASSOCIATED" in workqueue_cpu_up_callback().
There is nothing necessarily wrong with it, but there is no benefit
either. Let's move it into rebind_workers() and achieve the following
benefits:
1) better readability, POOL_DISASSOCIATED is cleared in rebind_workers()
as expected.
2) we can guarantee that, when POOL_DISASSOCIATED is clear, the
running workers of the pool are on the local CPU (pool->cpu).
tj: Minor description update.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 55d4f0953..45d890cb7 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4761,6 +4761,7 @@ static void rebind_workers(struct worker_pool *pool) pool->attrs->cpumask) < 0); spin_lock_irq(&pool->lock); + pool->flags &= ~POOL_DISASSOCIATED; for_each_pool_worker(worker, wi, pool) { unsigned int worker_flags = worker->flags; @@ -4864,10 +4865,6 @@ static int workqueue_cpu_up_callback(struct notifier_block *nfb, mutex_lock(&pool->manager_mutex); if (pool->cpu == cpu) { - spin_lock_irq(&pool->lock); - pool->flags &= ~POOL_DISASSOCIATED; - spin_unlock_irq(&pool->lock); - rebind_workers(pool); } else if (pool->cpu < 0) { restore_unbound_workers_cpumask(pool, cpu); |