From: Ingo Molnar <mingo@elte.hu>
To: Andrew Morton <akpm@osdl.org>
Cc: Linus Torvalds <torvalds@osdl.org>, linux-kernel@vger.kernel.org
Subject: [patch] lockdep: fix seqlock_init()
Date: Tue, 12 Dec 2006 12:10:28 +0100 [thread overview]
Message-ID: <20061212111028.GA13908@elte.hu> (raw)
Subject: [patch] lockdep: fix seqlock_init()
From: Ingo Molnar <mingo@elte.hu>
seqlock_init() needs to use spin_lock_init() for dynamic locks, so that
lockdep is notified about the presence of a new lock.
(this is a fallout of the recent networking merge, which started using
the so-far unused seqlock_init() API.)
This fix solves the following lockdep-internal warning on current -git:
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
[<c0104fd9>] dump_trace+0x63/0x1e8
[<c0105177>] show_trace_log_lvl+0x19/0x2e
[<c010557e>] show_trace+0x12/0x14
[<c0105594>] dump_stack+0x14/0x16
[<c0142992>] __lock_acquire+0x10c/0x9f9
[<c0143564>] lock_acquire+0x56/0x72
[<c03c514f>] _spin_lock+0x35/0x42
[<c0369875>] neigh_destroy+0x9d/0x12e
[<c036a1d5>] neigh_periodic_timer+0x10a/0x15c
[<c01302a5>] run_timer_softirq+0x126/0x18e
[<c012c530>] __do_softirq+0x6b/0xe6
[<c0106404>] do_softirq+0x64/0xd2
[<c012c249>] ksoftirqd+0x82/0x138
[<c01398f1>] kthread+0xb2/0xd7
[<c0104c1b>] kernel_thread_helper+0x7/0x10
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
include/linux/seqlock.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: linux-hres-timers.q/include/linux/seqlock.h
===================================================================
--- linux-hres-timers.q.orig/include/linux/seqlock.h
+++ linux-hres-timers.q/include/linux/seqlock.h
@@ -44,8 +44,11 @@ typedef struct {
#define SEQLOCK_UNLOCKED \
__SEQLOCK_UNLOCKED(old_style_seqlock_init)
-#define seqlock_init(x) \
- do { *(x) = (seqlock_t) __SEQLOCK_UNLOCKED(x); } while (0)
+#define seqlock_init(x) \
+ do { \
+ (x)->sequence = 0; \
+ spin_lock_init(&(x)->lock); \
+ } while (0)
#define DEFINE_SEQLOCK(x) \
seqlock_t x = __SEQLOCK_UNLOCKED(x)
next reply other threads:[~2006-12-12 11:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-12 11:10 Ingo Molnar [this message]
2006-12-12 17:48 ` Andrew Morton
2006-12-12 20:50 ` Ingo Molnar
2006-12-12 21:06 ` Andrew Morton
2006-12-13 1:15 ` Ingo Molnar
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=20061212111028.GA13908@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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®