From: Christoph Hellwig <hch@lst.de>
To: Ingo Molnar <mingo@redhat.com>, Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Andrea Arcangeli <aarcange@redhat.com>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Jason Baron <jbaron@akamai.com>,
linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] sched/wait: assert the wait_queue_head lock is held in __wake_up_common
Date: Thu, 14 Dec 2017 16:23:44 +0100 [thread overview]
Message-ID: <20171214152344.6880-4-hch@lst.de> (raw)
In-Reply-To: <20171214152344.6880-1-hch@lst.de>
Better ensure we actually hold the lock using lockdep than just commenting
on it. Due to the various exported _locked interfaces it is far too easy
to get the locking wrong.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/wait.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c
index 929ecb7d6b78..d09c4de4865c 100644
--- a/kernel/sched/wait.c
+++ b/kernel/sched/wait.c
@@ -76,6 +76,8 @@ static int __wake_up_common(struct wait_queue_head *wq_head, unsigned int mode,
wait_queue_entry_t *curr, *next;
int cnt = 0;
+ lockdep_assert_held(&wq_head->lock);
+
if (bookmark && (bookmark->flags & WQ_FLAG_BOOKMARK)) {
curr = list_next_entry(bookmark, entry);
--
2.14.2
next prev parent reply other threads:[~2017-12-14 15:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-14 15:23 waitqueue lockdep annotation V3 Christoph Hellwig
2017-12-14 15:23 ` [PATCH 1/3] epoll: use the waitqueue lock to protect ep->wq Christoph Hellwig
2017-12-14 15:23 ` [PATCH 2/3] userfaultfd: use fault_wqh lock Christoph Hellwig
2017-12-17 7:10 ` Mike Rapoport
2017-12-14 15:23 ` Christoph Hellwig [this message]
2018-07-12 19:17 ` waitqueue lockdep annotation V3 Davidlohr Bueso
2018-07-17 14:24 ` Christoph Hellwig
2018-07-17 15:04 ` Peter Zijlstra
2018-07-17 15:09 ` Christoph Hellwig
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=20171214152344.6880-4-hch@lst.de \
--to=hch@lst.de \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=jbaron@akamai.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rppt@linux.vnet.ibm.com \
--cc=viro@zeniv.linux.org.uk \
/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