From: Stephen Boyd <sboyd@codeaurora.org>
To: Tejun Heo <tj@kernel.org>
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
Ben Dooks <ben-linux@fluff.org>
Subject: Re: [PATCH 1/2] workqueue: Catch more locking problems with flush_work()
Date: Fri, 20 Apr 2012 16:15:01 -0700 [thread overview]
Message-ID: <4F91EDF5.6020003@codeaurora.org> (raw)
In-Reply-To: <20120420173529.GD32324@google.com>
On 4/20/2012 10:35 AM, Tejun Heo wrote:
>
> All that's necessary is acquiring and releasing work->lockdep_map.
> There's no need to nest start_flush_work() inside it. Without
> nesting, there's nothing to worry about ABBA lockdeps.
Yes I see. This patch should work then?
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 5abf42f..038cf64 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2506,6 +2506,9 @@ bool flush_work(struct work_struct *work)
{
struct wq_barrier barr;
+ lock_map_acquire(&work->lockdep_map);
+ lock_map_release(&work->lockdep_map);
+
if (start_flush_work(work, &barr, true)) {
wait_for_completion(&barr.done);
destroy_work_on_stack(&barr.work);
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
next prev parent reply other threads:[~2012-04-20 23:15 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-19 3:25 [PATCH 1/2] workqueue: Catch more locking problems with flush_work() Stephen Boyd
2012-04-19 3:25 ` [PATCH 2/2] ks8851: Fix mutex deadlock in ks8851_net_stop() Stephen Boyd
2012-04-21 19:34 ` David Miller
2012-04-19 8:10 ` [PATCH 1/2] workqueue: Catch more locking problems with flush_work() Yong Zhang
2012-04-19 18:36 ` Stephen Boyd
2012-04-20 5:26 ` Yong Zhang
2012-04-20 6:01 ` Yong Zhang
2012-04-20 6:26 ` Stephen Boyd
2012-04-20 7:18 ` Yong Zhang
2012-04-20 8:18 ` Stephen Boyd
2012-04-20 8:32 ` Yong Zhang
2012-04-21 0:32 ` Yong Zhang
2012-04-19 15:28 ` Tejun Heo
2012-04-19 18:10 ` Stephen Boyd
2012-04-20 17:35 ` Tejun Heo
2012-04-20 23:15 ` Stephen Boyd [this message]
2012-04-21 0:28 ` [PATCHv2] " Stephen Boyd
2012-04-21 0:34 ` Yong Zhang
2012-04-23 18:07 ` Tejun Heo
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=4F91EDF5.6020003@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=ben-linux@fluff.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@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;
as well as URLs for NNTP newsgroup(s).