From: Yang Shi <yang.shi@linaro.org>
To: peterz@infradead.org, mingo@redhat.com
Cc: linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org,
yang.shi@linaro.org
Subject: [PATCH] panic: lockdep: correct lock debugging state check
Date: Mon, 25 Apr 2016 20:36:37 -0700 [thread overview]
Message-ID: <1461641797-9368-1-git-send-email-yang.shi@linaro.org> (raw)
When kernel oops happens, lock debugging is turned off by debug_locks_off()
in oops_enter() via calling __debug_locks_off() which set debug_locks to 0
via xchg(). But, calling to __debug_locks_off() to check lock debugging state
in add_taint() called by oops_end() will always return false since xchg()
returns the old value of debug_locks which is cleared in oops_enter() already.
This prevents add_taint() from printing out lock debugging disable information
although LOCKDEP_NOW_UNRELIABLE is passed to it.
Check lock debugging state via !debug_locks to fix this. Although
!__debug_locks_off() could do the same thing, it may look confusing.
Before the fix, oops output looks like:
RIP [<ffffffff8119d2f8>] release_freepages+0x18/0xa0
RSP <ffff88036173fcf8>
CR2: 0000000000000000
[ end trace 2e96d09e0ba6342f ]
Aftere the fix, it looks like:
RIP [<ffffffff8119d2f8>] release_freepages+0x18/0xa0
RSP <ffff88036173fcf8>
CR2: 0000000000000000
Disabling lock debugging due to kernel taint
[ end trace 2e96d09e0ba6342f ]
And, fix a trivial typo in the comment of add_taint().
Signed-off-by: Yang Shi <yang.shi@linaro.org>
---
kernel/panic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/panic.c b/kernel/panic.c
index 535c965..859499d 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -346,11 +346,11 @@ unsigned long get_taint(void)
* @lockdep_ok: whether lock debugging is still OK.
*
* If something bad has gone wrong, you'll want @lockdebug_ok = false, but for
- * some notewortht-but-not-corrupting cases, it can be set to true.
+ * some noteworthy-but-not-corrupting cases, it can be set to true.
*/
void add_taint(unsigned flag, enum lockdep_ok lockdep_ok)
{
- if (lockdep_ok == LOCKDEP_NOW_UNRELIABLE && __debug_locks_off())
+ if (lockdep_ok == LOCKDEP_NOW_UNRELIABLE && !debug_locks)
pr_warn("Disabling lock debugging due to kernel taint\n");
set_bit(flag, &tainted_mask);
--
2.0.2
next reply other threads:[~2016-04-26 4:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 3:36 Yang Shi [this message]
2016-04-26 12:39 ` Peter Zijlstra
2016-04-26 17:33 ` Shi, Yang
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=1461641797-9368-1-git-send-email-yang.shi@linaro.org \
--to=yang.shi@linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.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®