diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-13 16:16:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-13 16:16:51 -0700 |
| commit | da92223908f309d5ba63ce7dd568dfb6a7e5d7d2 (patch) | |
| tree | 51a8ce374c8d3dde8a2c7d86b9b66077e27b5f7e /kernel | |
| parent | 65643e3abe71e970bef656ea0b125dace7c7a1b3 (diff) | |
| parent | f7c17d26f43d5cc1b7a6b896cd2fa24a079739b9 (diff) | |
| download | linux-da92223908f309d5ba63ce7dd568dfb6a7e5d7d2.tar.gz | |
Merge branch 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
Pull workqueue fix from Tejun Heo: "CPU hotplug callbacks can invoke DOWN_FAILED w/o preceding DOWN_PREPARE which can trigger a WARN_ON() in workqueue. The bug has been there for a very long time. It only triggers if CPU down fails at a specific point and I don't think it has adverse effects other than the warning messages. The fix is very low impact" * 'for-4.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: fix rebind bound workers warning
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 3bfdff06eea7..5f5068e94003 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4554,6 +4554,17 @@ static void rebind_workers(struct worker_pool *pool) pool->attrs->cpumask) < 0); spin_lock_irq(&pool->lock); + + /* + * XXX: CPU hotplug notifiers are weird and can call DOWN_FAILED + * w/o preceding DOWN_PREPARE. Work around it. CPU hotplug is + * being reworked and this can go away in time. + */ + if (!(pool->flags & POOL_DISASSOCIATED)) { + spin_unlock_irq(&pool->lock); + return; + } + pool->flags &= ~POOL_DISASSOCIATED; for_each_pool_worker(worker, pool) { |