* [PATCH 1/2] workqueue: fix bugs in wq_update_unbound_numa() failure path
@ 2014-04-16 5:32 Daeseok Youn
2014-04-16 16:22 ` Lai Jiangshan
2014-04-16 17:30 ` Tejun Heo
0 siblings, 2 replies; 5+ messages in thread
From: Daeseok Youn @ 2014-04-16 5:32 UTC (permalink / raw)
To: tj; +Cc: laijs, linux-kernel
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>
---
kernel/workqueue.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0ee63af..3150b21 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4100,7 +4100,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;
}
/*
--
1.7.4.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] workqueue: fix bugs in wq_update_unbound_numa() failure path
2014-04-16 5:32 [PATCH 1/2] workqueue: fix bugs in wq_update_unbound_numa() failure path Daeseok Youn
@ 2014-04-16 16:22 ` Lai Jiangshan
2014-04-16 17:30 ` Tejun Heo
1 sibling, 0 replies; 5+ messages in thread
From: Lai Jiangshan @ 2014-04-16 16:22 UTC (permalink / raw)
To: Daeseok Youn; +Cc: Tejun Heo, LKML
Acked.
On Wed, Apr 16, 2014 at 1:32 PM, Daeseok Youn <daeseok.youn@gmail.com> wrote:
>
> 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>
> ---
> kernel/workqueue.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/workqueue.c b/kernel/workqueue.c
> index 0ee63af..3150b21 100644
> --- a/kernel/workqueue.c
> +++ b/kernel/workqueue.c
> @@ -4100,7 +4100,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;
> }
>
> /*
> --
> 1.7.4.4
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] workqueue: fix bugs in wq_update_unbound_numa() failure path
2014-04-16 5:32 [PATCH 1/2] workqueue: fix bugs in wq_update_unbound_numa() failure path Daeseok Youn
2014-04-16 16:22 ` Lai Jiangshan
@ 2014-04-16 17:30 ` Tejun Heo
1 sibling, 0 replies; 5+ messages in thread
From: Tejun Heo @ 2014-04-16 17:30 UTC (permalink / raw)
To: Daeseok Youn; +Cc: laijs, linux-kernel
On Wed, Apr 16, 2014 at 02:32:29PM +0900, Daeseok Youn wrote:
>
> 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>
Applied to wq/for-3.15-fixes.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] workqueue: fix bugs in wq_update_unbound_numa() failure path
@ 2014-04-16 5:22 Daeseok Youn
0 siblings, 0 replies; 5+ messages in thread
From: Daeseok Youn @ 2014-04-16 5:22 UTC (permalink / raw)
To: tj; +Cc: laijs, linux-kernel
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>
---
kernel/workqueue.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0ee63af..3150b21 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4100,7 +4100,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;
}
/*
--
1.7.4.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] workqueue: fix bugs in wq_update_unbound_numa() failure path
@ 2014-04-16 5:11 Daeseok Youn
0 siblings, 0 replies; 5+ messages in thread
From: Daeseok Youn @ 2014-04-16 5:11 UTC (permalink / raw)
To: tj; +Cc: laijs, linux-kernel
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>
---
kernel/workqueue.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0ee63af..3150b21 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4100,7 +4100,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;
}
/*
--
1.7.4.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-04-16 17:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-16 5:32 [PATCH 1/2] workqueue: fix bugs in wq_update_unbound_numa() failure path Daeseok Youn
2014-04-16 16:22 ` Lai Jiangshan
2014-04-16 17:30 ` Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2014-04-16 5:22 Daeseok Youn
2014-04-16 5:11 Daeseok Youn
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.