iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workqueue: fix bugs in wq_update_unbound_numa() failure path

Browse Source 
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>
Cc: stable@vger.kernel.org
Fixes: 4c16bd327c ("workqueue: implement NUMA affinity for unbound workqueues")
This commit is contained in:
Daeseok Youn 2014-04-16 14:32:29 +09:00 committed by Tejun Heo
parent c9eaa447e7
commit 77f300b198
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/workqueue.c
View File

@ -4100,7 +4100,8 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
if (!pwq) { if (!pwq) {
pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n", pr_warning("workqueue: allocation failed while updating NUMA affinity of \"%s\"\n",
wq->name); wq->name);
goto out_unlock; mutex_lock(&wq->mutex);
goto use_dfl_pwq;
} }
/* /*