From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: mingo@elte.hu
Cc: linux-kernel@vger.kernel.org, npiggin@suse.de,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 10/21] lockdep: split up mark_lock_irq()
Date: Wed, 28 Jan 2009 14:54:02 +0100 [thread overview]
Message-ID: <20090128135458.250139192@chello.nl> (raw)
In-Reply-To: 20090128135352.679025549@chello.nl
[-- Attachment #1: lockdep-mark_irq.patch --]
[-- Type: text/plain, Size: 12237 bytes --]
split mark_lock_irq() into 4 simple helper functions
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
kernel/lockdep.c | 372 +++++++++++++++++++++----------------------------------
1 file changed, 147 insertions(+), 225 deletions(-)
Index: linux-2.6/kernel/lockdep.c
===================================================================
--- linux-2.6.orig/kernel/lockdep.c
+++ linux-2.6/kernel/lockdep.c
@@ -2001,6 +2001,109 @@ static int reclaim_verbose(struct lock_c
#define STRICT_READ_CHECKS 1
+static int
+mark_lock_irq_used_in(struct task_struct *curr, struct held_lock *this,
+ int new_bit, int excl_bit,
+ const char *name, const char *rname,
+ int (*verbose)(struct lock_class *class))
+{
+ if (!valid_state(curr, this, new_bit, excl_bit))
+ return 0;
+ if (!valid_state(curr, this, new_bit, excl_bit + 1))
+ return 0;
+ /*
+ * just marked it hardirq-safe, check that this lock
+ * took no hardirq-unsafe lock in the past:
+ */
+ if (!check_usage_forwards(curr, this, excl_bit, name))
+ return 0;
+#if STRICT_READ_CHECKS
+ /*
+ * just marked it hardirq-safe, check that this lock
+ * took no hardirq-unsafe-read lock in the past:
+ */
+ if (!check_usage_forwards(curr, this, excl_bit + 1, rname))
+ return 0;
+#endif
+ if (verbose(hlock_class(this)))
+ return 2;
+
+ return 1;
+}
+
+static int
+mark_lock_irq_used_in_read(struct task_struct *curr, struct held_lock *this,
+ int new_bit, int excl_bit,
+ const char *name, const char *rname,
+ int (*verbose)(struct lock_class *class))
+{
+ if (!valid_state(curr, this, new_bit, excl_bit))
+ return 0;
+ /*
+ * just marked it hardirq-read-safe, check that this lock
+ * took no hardirq-unsafe lock in the past:
+ */
+ if (!check_usage_forwards(curr, this, excl_bit, name))
+ return 0;
+ if (verbose(hlock_class(this)))
+ return 2;
+
+ return 1;
+}
+
+static int
+mark_lock_irq_enabled(struct task_struct *curr, struct held_lock *this,
+ int new_bit, int excl_bit,
+ const char *name, const char *rname,
+ int (*verbose)(struct lock_class *class))
+{
+ if (!valid_state(curr, this, new_bit, excl_bit))
+ return 0;
+ if (!valid_state(curr, this, new_bit, excl_bit + 1))
+ return 0;
+ /*
+ * just marked it hardirq-unsafe, check that no hardirq-safe
+ * lock in the system ever took it in the past:
+ */
+ if (!check_usage_backwards(curr, this, excl_bit, name))
+ return 0;
+#if STRICT_READ_CHECKS
+ /*
+ * just marked it hardirq-unsafe, check that no
+ * hardirq-safe-read lock in the system ever took
+ * it in the past:
+ */
+ if (!check_usage_backwards(curr, this, excl_bit + 1, rname))
+ return 0;
+#endif
+ if (verbose(hlock_class(this)))
+ return 2;
+
+ return 1;
+}
+
+static int
+mark_lock_irq_enabled_read(struct task_struct *curr, struct held_lock *this,
+ int new_bit, int excl_bit,
+ const char *name, const char *rname,
+ int (*verbose)(struct lock_class *class))
+{
+ if (!valid_state(curr, this, new_bit, excl_bit))
+ return 0;
+#if STRICT_READ_CHECKS
+ /*
+ * just marked it hardirq-read-unsafe, check that no
+ * hardirq-safe lock in the system ever took it in the past:
+ */
+ if (!check_usage_backwards(curr, this, excl_bit, name))
+ return 0;
+#endif
+ if (verbose(hlock_class(this)))
+ return 2;
+
+ return 1;
+}
+
static int mark_lock_irq(struct task_struct *curr, struct held_lock *this,
enum lock_usage_bit new_bit)
{
@@ -2008,242 +2111,61 @@ static int mark_lock_irq(struct task_str
switch(new_bit) {
case LOCK_USED_IN_HARDIRQ:
- if (!valid_state(curr, this, new_bit, LOCK_ENABLED_HARDIRQ))
- return 0;
- if (!valid_state(curr, this, new_bit,
- LOCK_ENABLED_HARDIRQ_READ))
- return 0;
- /*
- * just marked it hardirq-safe, check that this lock
- * took no hardirq-unsafe lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_HARDIRQ, "hard"))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it hardirq-safe, check that this lock
- * took no hardirq-unsafe-read lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_HARDIRQ_READ, "hard-read"))
- return 0;
-#endif
- if (hardirq_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_used_in(curr, this, new_bit,
+ LOCK_ENABLED_HARDIRQ,
+ "hard", "hard-read", hardirq_verbose);
case LOCK_USED_IN_SOFTIRQ:
- if (!valid_state(curr, this, new_bit, LOCK_ENABLED_SOFTIRQ))
- return 0;
- if (!valid_state(curr, this, new_bit,
- LOCK_ENABLED_SOFTIRQ_READ))
- return 0;
- /*
- * just marked it softirq-safe, check that this lock
- * took no softirq-unsafe lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_SOFTIRQ, "soft"))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it softirq-safe, check that this lock
- * took no softirq-unsafe-read lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_SOFTIRQ_READ, "soft-read"))
- return 0;
-#endif
- if (softirq_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_used_in(curr, this, new_bit,
+ LOCK_ENABLED_SOFTIRQ,
+ "soft", "soft-read", softirq_verbose);
case LOCK_USED_IN_RECLAIM_FS:
- if (!valid_state(curr, this, new_bit, LOCK_ENABLED_RECLAIM_FS))
- return 0;
- if (!valid_state(curr, this, new_bit,
- LOCK_ENABLED_RECLAIM_FS_READ))
- return 0;
- /*
- * just marked it reclaim-fs-safe, check that this lock
- * took no reclaim-fs-unsafe lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_RECLAIM_FS, "reclaim-fs"))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it reclaim-fs-safe, check that this lock
- * took no reclaim-fs-unsafe-read lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_RECLAIM_FS_READ, "reclaim-fs-read"))
- return 0;
-#endif
- if (reclaim_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_used_in(curr, this, new_bit,
+ LOCK_ENABLED_RECLAIM_FS,
+ "reclaim-fs", "reclaim-fs-read",
+ reclaim_verbose);
+
case LOCK_USED_IN_HARDIRQ_READ:
- if (!valid_state(curr, this, new_bit, LOCK_ENABLED_HARDIRQ))
- return 0;
- /*
- * just marked it hardirq-read-safe, check that this lock
- * took no hardirq-unsafe lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_HARDIRQ, "hard"))
- return 0;
- if (hardirq_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_used_in_read(curr, this, new_bit,
+ LOCK_ENABLED_HARDIRQ,
+ "hard", "hard-read", hardirq_verbose);
case LOCK_USED_IN_SOFTIRQ_READ:
- if (!valid_state(curr, this, new_bit, LOCK_ENABLED_SOFTIRQ))
- return 0;
- /*
- * just marked it softirq-read-safe, check that this lock
- * took no softirq-unsafe lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_SOFTIRQ, "soft"))
- return 0;
- if (softirq_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_used_in_read(curr, this, new_bit,
+ LOCK_ENABLED_SOFTIRQ,
+ "soft", "soft-read", softirq_verbose);
case LOCK_USED_IN_RECLAIM_FS_READ:
- if (!valid_state(curr, this, new_bit, LOCK_ENABLED_RECLAIM_FS))
- return 0;
- /*
- * just marked it reclaim-fs-read-safe, check that this lock
- * took no reclaim-fs-unsafe lock in the past:
- */
- if (!check_usage_forwards(curr, this,
- LOCK_ENABLED_RECLAIM_FS, "reclaim-fs"))
- return 0;
- if (reclaim_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_used_in_read(curr, this, new_bit,
+ LOCK_ENABLED_RECLAIM_FS,
+ "reclaim-fs", "reclaim-fs-read",
+ reclaim_verbose);
+
case LOCK_ENABLED_HARDIRQ:
- if (!valid_state(curr, this, new_bit, LOCK_USED_IN_HARDIRQ))
- return 0;
- if (!valid_state(curr, this, new_bit,
- LOCK_USED_IN_HARDIRQ_READ))
- return 0;
- /*
- * just marked it hardirq-unsafe, check that no hardirq-safe
- * lock in the system ever took it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_HARDIRQ, "hard"))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it hardirq-unsafe, check that no
- * hardirq-safe-read lock in the system ever took
- * it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_HARDIRQ_READ, "hard-read"))
- return 0;
-#endif
- if (hardirq_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_enabled(curr, this, new_bit,
+ LOCK_USED_IN_HARDIRQ,
+ "hard", "hard-read", hardirq_verbose);
case LOCK_ENABLED_SOFTIRQ:
- if (!valid_state(curr, this, new_bit, LOCK_USED_IN_SOFTIRQ))
- return 0;
- if (!valid_state(curr, this, new_bit,
- LOCK_USED_IN_SOFTIRQ_READ))
- return 0;
- /*
- * just marked it softirq-unsafe, check that no softirq-safe
- * lock in the system ever took it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_SOFTIRQ, "soft"))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it softirq-unsafe, check that no
- * softirq-safe-read lock in the system ever took
- * it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_SOFTIRQ_READ, "soft-read"))
- return 0;
-#endif
- if (softirq_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_enabled(curr, this, new_bit,
+ LOCK_USED_IN_SOFTIRQ,
+ "soft", "soft-read", softirq_verbose);
case LOCK_ENABLED_RECLAIM_FS:
- if (!valid_state(curr, this, new_bit, LOCK_USED_IN_RECLAIM_FS))
- return 0;
- if (!valid_state(curr, this, new_bit,
- LOCK_USED_IN_RECLAIM_FS_READ))
- return 0;
- /*
- * just marked it reclaim-fs-unsafe, check that no reclaim-fs-safe
- * lock in the system ever took it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_RECLAIM_FS, "reclaim-fs"))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it softirq-unsafe, check that no
- * softirq-safe-read lock in the system ever took
- * it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_RECLAIM_FS_READ, "reclaim-fs-read"))
- return 0;
-#endif
- if (reclaim_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_enabled(curr, this, new_bit,
+ LOCK_USED_IN_RECLAIM_FS,
+ "reclaim-fs", "reclaim-fs-read",
+ reclaim_verbose);
+
case LOCK_ENABLED_HARDIRQ_READ:
- if (!valid_state(curr, this, new_bit, LOCK_USED_IN_HARDIRQ))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it hardirq-read-unsafe, check that no
- * hardirq-safe lock in the system ever took it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_HARDIRQ, "hard"))
- return 0;
-#endif
- if (hardirq_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_enabled_read(curr, this, new_bit,
+ LOCK_USED_IN_HARDIRQ,
+ "hard", "hard-read", hardirq_verbose);
case LOCK_ENABLED_SOFTIRQ_READ:
- if (!valid_state(curr, this, new_bit, LOCK_USED_IN_SOFTIRQ))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it softirq-read-unsafe, check that no
- * softirq-safe lock in the system ever took it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_SOFTIRQ, "soft"))
- return 0;
-#endif
- if (softirq_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_enabled_read(curr, this, new_bit,
+ LOCK_USED_IN_SOFTIRQ,
+ "soft", "soft-read", softirq_verbose);
case LOCK_ENABLED_RECLAIM_FS_READ:
- if (!valid_state(curr, this, new_bit, LOCK_USED_IN_RECLAIM_FS))
- return 0;
-#if STRICT_READ_CHECKS
- /*
- * just marked it reclaim-fs-read-unsafe, check that no
- * reclaim-fs-safe lock in the system ever took it in the past:
- */
- if (!check_usage_backwards(curr, this,
- LOCK_USED_IN_RECLAIM_FS, "reclaim-fs"))
- return 0;
-#endif
- if (reclaim_verbose(hlock_class(this)))
- ret = 2;
- break;
+ return mark_lock_irq_enabled_read(curr, this, new_bit,
+ LOCK_USED_IN_RECLAIM_FS,
+ "reclaim-fs", "reclaim-fs-read",
+ reclaim_verbose);
+
default:
WARN_ON(1);
break;
--
next prev parent reply other threads:[~2009-01-28 14:02 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-28 13:53 [PATCH 00/21] lockdep: pending queue Peter Zijlstra
2009-01-28 13:53 ` [PATCH 01/21] lockdep: annotate reclaim context (__GFP_NOFS) Peter Zijlstra
[not found] ` <tip-bf722c9d324864b4256edaa330751b77f2a19861@git.kernel.org>
2009-03-15 6:48 ` SLOB lockup (was: Re: [tip:core/locking] lockdep: annotate reclaim context (__GFP_NOFS), fix SLOB) Ingo Molnar
2009-03-15 6:51 ` Ingo Molnar
2009-03-15 9:06 ` Nick Piggin
2009-03-15 9:47 ` Ingo Molnar
2009-03-15 10:04 ` Nick Piggin
2009-03-15 15:16 ` Thomas Gleixner
2009-03-16 9:49 ` Nick Piggin
2009-03-17 11:30 ` [tip:core/debugobjects] debugobjects: replace static objects when slab cache becomes available Thomas Gleixner
2009-03-17 11:30 ` [tip:core/debugobjects] debugobjects: delay free of internal objects Thomas Gleixner
2009-03-15 14:56 ` SLOB lockup (was: Re: [tip:core/locking] lockdep: annotate reclaim context (__GFP_NOFS), fix SLOB) Matt Mackall
2009-03-16 10:00 ` Nick Piggin
2009-03-16 14:52 ` Matt Mackall
2009-03-16 15:00 ` Nick Piggin
2009-03-23 8:42 ` Pekka Enberg
2009-03-15 18:56 ` Ingo Molnar
2009-01-28 13:53 ` [PATCH 02/21] lockdep: sanitize bit names Peter Zijlstra
2009-01-28 13:53 ` [PATCH 03/21] lockdep: sanitize reclaim " Peter Zijlstra
2009-01-28 13:53 ` [PATCH 04/21] lockdep: lockdep_states.h Peter Zijlstra
2009-01-28 13:53 ` [PATCH 05/21] lockdep: simplify mark_held_locks Peter Zijlstra
2009-01-28 13:53 ` [PATCH 06/21] lockdep: simplify mark_lock() Peter Zijlstra
2009-01-28 13:53 ` [PATCH 07/21] lockdep: move state bit definitions around Peter Zijlstra
2009-01-28 13:54 ` [PATCH 08/21] lockdep: generate the state bit definitions Peter Zijlstra
2009-01-28 13:54 ` [PATCH 09/21] lockdep: generate usage strings Peter Zijlstra
2009-01-28 13:54 ` Peter Zijlstra [this message]
2009-01-28 13:54 ` [PATCH 11/21] lockdep: simplify the mark_lock_irq() helpers Peter Zijlstra
2009-01-28 13:54 ` [PATCH 12/21] lockdep: further simplify " Peter Zijlstra
2009-01-28 13:54 ` [PATCH 13/21] lockdep: simplify mark_lock_irq() helpers #3 Peter Zijlstra
2009-01-28 13:54 ` [PATCH 14/21] lockdep: merge the _READ mark_lock_irq() helpers Peter Zijlstra
2009-01-28 13:54 ` [PATCH 15/21] lockdep: merge the !_READ " Peter Zijlstra
2009-01-28 13:54 ` [PATCH 16/21] lockdep: fully reduce mark_lock_irq() Peter Zijlstra
2009-01-28 13:54 ` [PATCH 17/21] lockdep: remove macro usage from mark_held_locks() Peter Zijlstra
2009-01-28 13:54 ` [PATCH 18/21] lockdep: add comments to mark_lock_irq() Peter Zijlstra
2009-01-28 13:54 ` [PATCH 19/21] lockdep: simplify get_user_chars() Peter Zijlstra
2009-01-28 13:54 ` [PATCH 20/21] lockdep: get_user_chars() redo Peter Zijlstra
2009-01-28 13:54 ` [PATCH 21/21] lockdep: simplify check_prev_add_irq() Peter Zijlstra
2009-01-29 13:54 ` [PATCH 22/21] lockdep: use stringify.h Peter Zijlstra
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=20090128135458.250139192@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=npiggin@suse.de \
/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