Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751170AbcDZED1 (ORCPT ); Tue, 26 Apr 2016 00:03:27 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34218 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750697AbcDZEDZ (ORCPT ); Tue, 26 Apr 2016 00:03:25 -0400 From: Yang Shi 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 Message-Id: <1461641797-9368-1-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1953 Lines: 52 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 [] release_freepages+0x18/0xa0 RSP CR2: 0000000000000000 [ end trace 2e96d09e0ba6342f ] Aftere the fix, it looks like: RIP [] release_freepages+0x18/0xa0 RSP 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 --- 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