From: Daeseok Youn <daeseok.youn@gmail.com>
To: tj@kernel.org, laijs@cn.fujitsu.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH V3] workqueue: fix double unlock bug
Date: Tue, 15 Apr 2014 08:17:43 +0900 [thread overview]
Message-ID: <1798086.IHnGGWGxmu@daeseok-laptop.cloud.net> (raw)
Use default pwq when alloc_unbound_pwq() is failed.
And remove "if" condition for whether "pwq" is same as "wq->dfl_pwq"
when wq_calc_node_cpumask() returns false and just use "goto use_dfl_pwq"
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
---
V2: replace "if condition" with "goto" as Lai's comment.
V3: Use default pwq when alloc_unbound_pwq() is failed.
kernel/workqueue.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 0ee63af..0679854 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -4087,10 +4087,7 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
if (cpumask_equal(cpumask, pwq->pool->attrs->cpumask))
goto out_unlock;
} else {
- if (pwq == wq->dfl_pwq)
- goto out_unlock;
- else
- goto use_dfl_pwq;
+ goto use_dfl_pwq;
}
mutex_unlock(&wq->mutex);
@@ -4100,7 +4097,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
next reply other threads:[~2014-04-14 23:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-14 23:17 Daeseok Youn [this message]
2014-04-15 3:33 ` Lai Jiangshan
2014-04-15 14:43 ` Tejun Heo
2014-04-15 23:01 ` DaeSeok Youn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1798086.IHnGGWGxmu@daeseok-laptop.cloud.net \
--to=daeseok.youn@gmail.com \
--cc=laijs@cn.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®