diff options
author | Nur Hussein <nurhussein@gmail.com> | 2008-04-29 03:58:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:05:59 -0400 |
commit | 95b570c9cef3b12356454c7112571b7e406b4b51 (patch) | |
tree | f4494412f9e3a02bce5b59a906ee9360a536191d | |
parent | bd3feb13e15a4859f629c9a076554e260c1d1397 (diff) |
Taint kernel after WARN_ON(condition)
The kernel is sent to tainted within the warn_on_slowpath() function, and
whenever a warning occurs the new taint flag 'W' is set. This is useful to
know if a warning occurred before a BUG by preserving the warning as a flag
in the taint state.
This does not work on architectures where WARN_ON has its own definition.
These archs are:
1. s390
2. superh
3. avr32
4. parisc
The maintainers of these architectures have been added in the Cc: list
in this email to alert them to the situation.
The documentation in oops-tracing.txt has been updated to include the
new flag.
Signed-off-by: Nur Hussein <nurhussein@gmail.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | Documentation/oops-tracing.txt | 4 | ||||
-rw-r--r-- | include/linux/kernel.h | 1 | ||||
-rw-r--r-- | kernel/panic.c | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt index 7f60dfe642ca..b152e81da592 100644 --- a/Documentation/oops-tracing.txt +++ b/Documentation/oops-tracing.txt | |||
@@ -253,6 +253,10 @@ characters, each representing a particular tainted value. | |||
253 | 253 | ||
254 | 8: 'D' if the kernel has died recently, i.e. there was an OOPS or BUG. | 254 | 8: 'D' if the kernel has died recently, i.e. there was an OOPS or BUG. |
255 | 255 | ||
256 | 9: 'A' if the ACPI table has been overridden. | ||
257 | |||
258 | 10: 'W' if a warning has previously been issued by the kernel. | ||
259 | |||
256 | The primary reason for the 'Tainted: ' string is to tell kernel | 260 | The primary reason for the 'Tainted: ' string is to tell kernel |
257 | debuggers if this is a clean kernel or if anything unusual has | 261 | debuggers if this is a clean kernel or if anything unusual has |
258 | occurred. Tainting is permanent: even if an offending module is | 262 | occurred. Tainting is permanent: even if an offending module is |
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index cd6d02cf854d..28caa53dd1f7 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
@@ -255,6 +255,7 @@ extern enum system_states { | |||
255 | #define TAINT_USER (1<<6) | 255 | #define TAINT_USER (1<<6) |
256 | #define TAINT_DIE (1<<7) | 256 | #define TAINT_DIE (1<<7) |
257 | #define TAINT_OVERRIDDEN_ACPI_TABLE (1<<8) | 257 | #define TAINT_OVERRIDDEN_ACPI_TABLE (1<<8) |
258 | #define TAINT_WARN (1<<9) | ||
258 | 259 | ||
259 | extern void dump_stack(void) __cold; | 260 | extern void dump_stack(void) __cold; |
260 | 261 | ||
diff --git a/kernel/panic.c b/kernel/panic.c index 24af9f8bac99..425567f45b9f 100644 --- a/kernel/panic.c +++ b/kernel/panic.c | |||
@@ -153,6 +153,8 @@ EXPORT_SYMBOL(panic); | |||
153 | * 'M' - System experienced a machine check exception. | 153 | * 'M' - System experienced a machine check exception. |
154 | * 'B' - System has hit bad_page. | 154 | * 'B' - System has hit bad_page. |
155 | * 'U' - Userspace-defined naughtiness. | 155 | * 'U' - Userspace-defined naughtiness. |
156 | * 'A' - ACPI table overridden. | ||
157 | * 'W' - Taint on warning. | ||
156 | * | 158 | * |
157 | * The string is overwritten by the next call to print_taint(). | 159 | * The string is overwritten by the next call to print_taint(). |
158 | */ | 160 | */ |
@@ -161,7 +163,7 @@ const char *print_tainted(void) | |||
161 | { | 163 | { |
162 | static char buf[20]; | 164 | static char buf[20]; |
163 | if (tainted) { | 165 | if (tainted) { |
164 | snprintf(buf, sizeof(buf), "Tainted: %c%c%c%c%c%c%c%c%c", | 166 | snprintf(buf, sizeof(buf), "Tainted: %c%c%c%c%c%c%c%c%c%c", |
165 | tainted & TAINT_PROPRIETARY_MODULE ? 'P' : 'G', | 167 | tainted & TAINT_PROPRIETARY_MODULE ? 'P' : 'G', |
166 | tainted & TAINT_FORCED_MODULE ? 'F' : ' ', | 168 | tainted & TAINT_FORCED_MODULE ? 'F' : ' ', |
167 | tainted & TAINT_UNSAFE_SMP ? 'S' : ' ', | 169 | tainted & TAINT_UNSAFE_SMP ? 'S' : ' ', |
@@ -170,7 +172,8 @@ const char *print_tainted(void) | |||
170 | tainted & TAINT_BAD_PAGE ? 'B' : ' ', | 172 | tainted & TAINT_BAD_PAGE ? 'B' : ' ', |
171 | tainted & TAINT_USER ? 'U' : ' ', | 173 | tainted & TAINT_USER ? 'U' : ' ', |
172 | tainted & TAINT_DIE ? 'D' : ' ', | 174 | tainted & TAINT_DIE ? 'D' : ' ', |
173 | tainted & TAINT_OVERRIDDEN_ACPI_TABLE ? 'A' : ' '); | 175 | tainted & TAINT_OVERRIDDEN_ACPI_TABLE ? 'A' : ' ', |
176 | tainted & TAINT_WARN ? 'W' : ' '); | ||
174 | } | 177 | } |
175 | else | 178 | else |
176 | snprintf(buf, sizeof(buf), "Not tainted"); | 179 | snprintf(buf, sizeof(buf), "Not tainted"); |
@@ -312,6 +315,7 @@ void warn_on_slowpath(const char *file, int line) | |||
312 | print_modules(); | 315 | print_modules(); |
313 | dump_stack(); | 316 | dump_stack(); |
314 | print_oops_end_marker(); | 317 | print_oops_end_marker(); |
318 | add_taint(TAINT_WARN); | ||
315 | } | 319 | } |
316 | EXPORT_SYMBOL(warn_on_slowpath); | 320 | EXPORT_SYMBOL(warn_on_slowpath); |
317 | #endif | 321 | #endif |