From: Peter Zijlstra <peterz@infradead.org>
To: Boqun Feng <boqun.feng@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>,
Alfredo Alvarez Fernandez <alfredoalvarezfernandez@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Sedat Dilek <sedat.dilek@gmail.com>,
"Theodore Ts'o" <tytso@mit.edu>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [Linux-v4.6-rc1] ext4: WARNING: CPU: 2 PID: 2692 at kernel/locking/lockdep.c:2017 __lock_acquire+0x180e/0x2260
Date: Thu, 31 Mar 2016 17:42:34 +0200 [thread overview]
Message-ID: <20160331154234.GA3448@twins.programming.kicks-ass.net> (raw)
In-Reply-To: <20160330095954.GB14352@fixme-laptop.cn.ibm.com>
On Wed, Mar 30, 2016 at 05:59:54PM +0800, Boqun Feng wrote:
> So we should use macro like current_hardirq_context() here? Or
> considering the two helpers introduced in my RFC:
>
> http://lkml.kernel.org/g/1455602265-16490-2-git-send-email-boqun.feng@gmail.com
>
> if you don't think that overkills ;-)
I changed it into the below; since I did significant edits, let me know
if you disagree and / or want your name taken off.
---
Subject: lockdep: Add task_irq_context()
From: Boqun Feng <boqun.feng@gmail.com>
Date: Tue, 16 Feb 2016 13:57:40 +0800
task_irq_context(): returns the encoded irq_context of the task, the
return value is encoded in the same as ->irq_context of held_lock.
Always return 0 if !(CONFIG_TRACE_IRQFLAGS && CONFIG_PROVE_LOCKING)
Cc: Lai Jiangshan <jiangshanlai@gmail.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: sasha.levin@oracle.com
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1455602265-16490-2-git-send-email-boqun.feng@gmail.com
---
kernel/locking/lockdep.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -2932,6 +2932,11 @@ static int mark_irqflags(struct task_str
return 1;
}
+static inline unsigned int task_irq_context(struct task_struct *task)
+{
+ return 2 * !!task->hardirq_context + !!task->softirq_context;
+}
+
static int separate_irq_context(struct task_struct *curr,
struct held_lock *hlock)
{
@@ -2940,8 +2945,6 @@ static int separate_irq_context(struct t
/*
* Keep track of points where we cross into an interrupt context:
*/
- hlock->irq_context = 2*(curr->hardirq_context ? 1 : 0) +
- curr->softirq_context;
if (depth) {
struct held_lock *prev_hlock;
@@ -2973,6 +2976,11 @@ static inline int mark_irqflags(struct t
return 1;
}
+static inline unsigned int task_irq_context(struct task_struct *task)
+{
+ return 0;
+}
+
static inline int separate_irq_context(struct task_struct *curr,
struct held_lock *hlock)
{
@@ -3241,6 +3249,7 @@ static int __lock_acquire(struct lockdep
hlock->acquire_ip = ip;
hlock->instance = lock;
hlock->nest_lock = nest_lock;
+ hlock->irq_context = task_irq_context(curr);
hlock->trylock = trylock;
hlock->read = read;
hlock->check = check;
next prev parent reply other threads:[~2016-03-31 15:42 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-27 8:15 [Linux-v4.6-rc1] ext4: WARNING: CPU: 2 PID: 2692 at kernel/locking/lockdep.c:2017 __lock_acquire+0x180e/0x2260 Sedat Dilek
2016-03-27 8:57 ` Sedat Dilek
2016-03-27 12:03 ` Linus Torvalds
2016-03-27 13:32 ` Boqun Feng
2016-03-27 18:23 ` Theodore Ts'o
2016-03-27 19:40 ` Sedat Dilek
[not found] ` <CA+55aFwoKRpgq8OCTxUaP+8gOg-mnN3nbruYgiK32a=C5U4TkQ@mail.gmail.com>
2016-03-27 20:24 ` Sedat Dilek
2016-03-27 20:48 ` Peter Zijlstra
2016-03-27 20:59 ` Sedat Dilek
2016-03-27 21:48 ` Sedat Dilek
2016-03-28 1:05 ` Boqun Feng
2016-03-28 6:33 ` Peter Zijlstra
2016-03-29 8:47 ` Ingo Molnar
2016-03-30 9:20 ` Sedat Dilek
2016-03-30 9:36 ` Sedat Dilek
2016-03-30 9:36 ` Peter Zijlstra
2016-03-30 9:49 ` Sedat Dilek
2016-03-30 10:33 ` Sedat Dilek
2016-03-30 12:43 ` Peter Zijlstra
2016-03-30 12:46 ` Sedat Dilek
2016-03-30 13:15 ` Peter Zijlstra
2016-03-30 9:50 ` Peter Zijlstra
2016-03-30 9:59 ` Boqun Feng
2016-03-30 10:36 ` Peter Zijlstra
2016-03-30 11:07 ` Sedat Dilek
2016-03-31 15:42 ` Peter Zijlstra [this message]
2016-03-31 15:52 ` Boqun Feng
2016-04-02 6:26 ` Sedat Dilek
2016-03-30 14:06 ` Peter Zijlstra
2016-03-30 15:21 ` Sedat Dilek
2016-03-30 17:03 ` [PATCH] lockdep: print chain_key collision information Alfredo Alvarez Fernandez
2016-03-30 17:19 ` Peter Zijlstra
2016-04-01 6:36 ` [tip:core/urgent] locking/lockdep: Print " tip-bot for Alfredo Alvarez Fernandez
2016-05-10 9:09 ` Peter Zijlstra
2016-04-04 15:31 ` [Linux-v4.6-rc1] ext4: WARNING: CPU: 2 PID: 2692 at kernel/locking/lockdep.c:2017 __lock_acquire+0x180e/0x2260 Sedat Dilek
2016-04-04 16:02 ` Peter Zijlstra
2016-05-09 11:37 ` Sedat Dilek
2016-06-03 15:15 ` Sedat Dilek
2016-04-23 12:54 ` [tip:locking/urgent] lockdep: Fix lock_chain::base size tip-bot for 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=20160331154234.GA3448@twins.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=alfredoalvarezfernandez@gmail.com \
--cc=boqun.feng@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sedat.dilek@gmail.com \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
/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).