aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaeseok Youn <daeseok.youn@gmail.com>2014-04-16 14:32:29 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-07 13:25:37 -0700
commit55a3dfcc84ab3dc82708d93cd0bca4a0aad7715c (patch)
treef4f43c1cd94d7f20e8b60c315536fab1842792fb
parent04931ac044a638b79ea3c4b48c448b66cae0c2b5 (diff)
downloadlinux-linaro-stable-55a3dfcc84ab3dc82708d93cd0bca4a0aad7715c.tar.gz
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>
-rw-r--r--kernel/workqueue.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index db7a6ac7c0a8..45c24d723448 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4043,7 +4043,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;
}
/*