Skip to content

Commit

Permalink
lockdep: warn about lockdep disabling after kernel taint
Browse files Browse the repository at this point in the history
Impact: provide useful missing info for developers

Kernel taint can occur in several situations such as warnings,
load of prorietary or staging modules, bad page, etc...

But when such taint happens, a developer might still be working on
the kernel, expecting that lockdep is still enabled. But a taint
disables lockdep without ever warning about it.
Such a kernel behaviour doesn't really help for kernel development.

This patch adds this missing warning.

Since the taint is done most of the time after the main message that
explain the real source issue, it seems safe to warn about it inside
add_taint() so that it appears at last, without hurting the main
information.

v2: Use a generic helper to disable lockdep instead of an
    open coded xchg().

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <1239412638-6739-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
fweisbec authored and Ingo Molnar committed Apr 12, 2009
1 parent 066123a commit 9eeba61
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
7 changes: 7 additions & 0 deletions include/linux/debug_locks.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@
#define __LINUX_DEBUG_LOCKING_H

#include <linux/kernel.h>
#include <asm/atomic.h>

struct task_struct;

extern int debug_locks;
extern int debug_locks_silent;


static inline int __debug_locks_off(void)
{
return xchg(&debug_locks, 0);
}

/*
* Generic 'turn off all lock debugging' function:
*/
Expand Down
10 changes: 8 additions & 2 deletions kernel/panic.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,14 @@ unsigned long get_taint(void)

void add_taint(unsigned flag)
{
/* can't trust the integrity of the kernel anymore: */
debug_locks = 0;
/*
* Can't trust the integrity of the kernel anymore.
* We don't call directly debug_locks_off() because the issue
* is not necessarily serious enough to set oops_in_progress to 1
*/
if (__debug_locks_off())
printk(KERN_WARNING "Disabling lockdep due to kernel taint\n");

set_bit(flag, &tainted_mask);
}
EXPORT_SYMBOL(add_taint);
Expand Down
2 changes: 1 addition & 1 deletion lib/debug_locks.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ int debug_locks_silent;
*/
int debug_locks_off(void)
{
if (xchg(&debug_locks, 0)) {
if (__debug_locks_off()) {
if (!debug_locks_silent) {
oops_in_progress = 1;
console_verbose();
Expand Down

0 comments on commit 9eeba61

Please sign in to comment.