From: Andi Kleen <andi@firstfloor.org>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Andi Kleen <ak@linux.intel.com>,
axboe@kernel.dk
Subject: [PATCH 01/13] block: use lockdep_assert_held for queue locking
Date: Tue, 27 Mar 2012 17:47:05 -0700 [thread overview]
Message-ID: <1332895637-32572-2-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1332895637-32572-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Instead of an ugly open coded variant.
Cc: axboe@kernel.dk
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
block/blk-throttle.c | 2 +-
include/linux/blkdev.h | 18 +++++++-----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 5eed6a7..f2ddb94 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1218,7 +1218,7 @@ void blk_throtl_drain(struct request_queue *q)
struct bio_list bl;
struct bio *bio;
- WARN_ON_ONCE(!queue_is_locked(q));
+ queue_lockdep_assert_held(q);
bio_list_init(&bl);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 606cf33..2aa2466 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -426,14 +426,10 @@ struct request_queue {
(1 << QUEUE_FLAG_SAME_COMP) | \
(1 << QUEUE_FLAG_ADD_RANDOM))
-static inline int queue_is_locked(struct request_queue *q)
+static inline void queue_lockdep_assert_held(struct request_queue *q)
{
-#ifdef CONFIG_SMP
- spinlock_t *lock = q->queue_lock;
- return lock && spin_is_locked(lock);
-#else
- return 1;
-#endif
+ if (q->queue_lock)
+ lockdep_assert_held(q->queue_lock);
}
static inline void queue_flag_set_unlocked(unsigned int flag,
@@ -445,7 +441,7 @@ static inline void queue_flag_set_unlocked(unsigned int flag,
static inline int queue_flag_test_and_clear(unsigned int flag,
struct request_queue *q)
{
- WARN_ON_ONCE(!queue_is_locked(q));
+ queue_lockdep_assert_held(q);
if (test_bit(flag, &q->queue_flags)) {
__clear_bit(flag, &q->queue_flags);
@@ -458,7 +454,7 @@ static inline int queue_flag_test_and_clear(unsigned int flag,
static inline int queue_flag_test_and_set(unsigned int flag,
struct request_queue *q)
{
- WARN_ON_ONCE(!queue_is_locked(q));
+ queue_lockdep_assert_held(q);
if (!test_bit(flag, &q->queue_flags)) {
__set_bit(flag, &q->queue_flags);
@@ -470,7 +466,7 @@ static inline int queue_flag_test_and_set(unsigned int flag,
static inline void queue_flag_set(unsigned int flag, struct request_queue *q)
{
- WARN_ON_ONCE(!queue_is_locked(q));
+ queue_lockdep_assert_held(q);
__set_bit(flag, &q->queue_flags);
}
@@ -487,7 +483,7 @@ static inline int queue_in_flight(struct request_queue *q)
static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
{
- WARN_ON_ONCE(!queue_is_locked(q));
+ queue_lockdep_assert_held(q);
__clear_bit(flag, &q->queue_flags);
}
--
1.7.7.6
next prev parent reply other threads:[~2012-03-28 0:47 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 0:47 spin-is-locked is evil patchkit v2 Andi Kleen
2012-03-28 0:47 ` Andi Kleen [this message]
2012-03-30 10:33 ` [PATCH 01/13] block: use lockdep_assert_held for queue locking Jens Axboe
2012-03-28 0:47 ` [PATCH 02/13] sgi-xp: Use lockdep_assert_held Andi Kleen
2012-03-28 0:47 ` [PATCH 03/13] ada152x: Remove broken usage of spin_is_locked Andi Kleen
2012-03-28 0:47 ` [PATCH 04/13] staging/zmem: Use lockdep_assert_held instead " Andi Kleen
2012-03-28 0:47 ` [PATCH 05/13] XFS: Fix lock ASSERT on UP Andi Kleen
2012-03-29 23:21 ` Christoph Hellwig
2012-03-29 23:52 ` Andi Kleen
2012-03-30 4:13 ` Dave Chinner
2012-03-30 14:04 ` Andi Kleen
2012-03-30 14:10 ` Christoph Hellwig
2012-04-19 21:31 ` Andrew Morton
2012-03-28 0:47 ` [PATCH 06/13] huge-memory: Use lockdep_assert_held Andi Kleen
2012-03-28 0:47 ` [PATCH 07/13] futex: Use lockdep_assert_held() for lock checking Andi Kleen
2012-03-28 0:47 ` [PATCH 08/13] irda: remove spin_is_locked Andi Kleen
2012-03-28 1:32 ` David Miller
2012-03-28 0:47 ` [PATCH 09/13] usb: gadget: f_fs: Remove lock is held before freeing checks Andi Kleen
2012-04-10 10:42 ` Felipe Balbi
2012-03-28 0:47 ` [PATCH 10/13] smsc911x: Use lockdep_assert_held instead of home grown buggy construct Andi Kleen
2012-03-28 1:32 ` David Miller
2012-03-28 0:47 ` [PATCH 11/13] Add a discussion on why spin_is_locked() is bad to spinlocks.txt Andi Kleen
2012-03-28 8:48 ` Wolfram Sang
2012-03-28 9:07 ` Andi Kleen
2012-03-28 0:47 ` [PATCH 12/13] Add a kerneldoc comment to spin_is_locked() that discourages its usage Andi Kleen
2012-03-28 8:49 ` Wolfram Sang
2012-03-28 0:47 ` [PATCH 13/13] checkpatch: Check for spin_is_locked Andi Kleen
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=1332895637-32572-2-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.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
Powered by JetHome