diff options
| author | Daeseok Youn <daeseok.youn@gmail.com> | 2014-04-16 14:32:29 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-07 10:28:21 -0700 |
| commit | 65eefbee64455cb2f18a77be616ca1df10c95d6d (patch) | |
| tree | 8cbca3bb9b3a382d66f99987a9cc273d3c901481 /kernel | |
| parent | 91c372b12c4a6dca1663338aed088e4c19d14f17 (diff) | |
| download | linux-stable-65eefbee64455cb2f18a77be616ca1df10c95d6d.tar.gz linux-stable-65eefbee64455cb2f18a77be616ca1df10c95d6d.tar.bz2 linux-stable-65eefbee64455cb2f18a77be616ca1df10c95d6d.zip | |
workqueue: fix bugs in wq_update_unbound_numa() failure path
commit 77f300b198f93328c26191b52655ce1b62e202cf upstream.
wq_update_unbound_numa() failure path has the following two bugs.
- alloc_unbound_pwq() is called without holding wq->mutex; however, if
the allocation fails, it jumps to out_unlock which tries to unlock
wq->mutex.
- The function should switch to dfl_pwq on failure but didn't do so
after alloc_unbound_pwq() failure.
Fix it by regrabbing wq->mutex and jumping to use_dfl_pwq on
alloc_unbound_pwq() failure.
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Acked-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Fixes: 4c16bd327c74 ("workqueue: implement NUMA affinity for unbound workqueues")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 193e977a10ea..23b8d896a8c6 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -4093,7 +4093,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu, if (!pwq) { pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n", wq->name); - goto out_unlock; + mutex_lock(&wq->mutex); + goto use_dfl_pwq; } /* |