[PATCH 3.10 073/103] workqueue: fix bugs in wq_update_unbound_numa() failure path

From: Greg Kroah-Hartman
Date: Wed Jun 04 2014 - 19:32:08 EST

3.10-stable review patch. If anyone has any objections, please let me know.


From: Daeseok Youn <daeseok.youn@xxxxxxxxx>

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

- 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@xxxxxxxxx>
Acked-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Signed-off-by: Tejun Heo <tj@xxxxxxxxxx>
Fixes: 4c16bd327c74 ("workqueue: implement NUMA affinity for unbound workqueues")
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

kernel/workqueue.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4043,7 +4043,8 @@ static void wq_update_unbound_numa(struc
if (!pwq) {
pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",
- goto out_unlock;
+ mutex_lock(&wq->mutex);
+ goto use_dfl_pwq;


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/