Commit 86c41837 authored by Chuck Ebbert's avatar Chuck Ebbert Committed by Andi Kleen

[PATCH] i386: add option to show more code in oops reports

Sometimes developers need to see more object code in an oops report,
e.g. when kernel may be corrupted at runtime.

Add the "code_bytes" option for this.
Signed-off-by: default avatarChuck Ebbert <cebbert@redhat.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 8469adde
...@@ -364,6 +364,11 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -364,6 +364,11 @@ and is between 256 and 4096 characters. It is defined in the file
clocksource is not available, it defaults to PIT. clocksource is not available, it defaults to PIT.
Format: { pit | tsc | cyclone | pmtmr } Format: { pit | tsc | cyclone | pmtmr }
code_bytes [IA32] How many bytes of object code to print in an
oops report.
Range: 0 - 8192
Default: 64
disable_8254_timer disable_8254_timer
enable_8254_timer enable_8254_timer
[IA32/X86_64] Disable/Enable interrupt 0 timer routing [IA32/X86_64] Disable/Enable interrupt 0 timer routing
......
...@@ -94,6 +94,7 @@ asmlinkage void spurious_interrupt_bug(void); ...@@ -94,6 +94,7 @@ asmlinkage void spurious_interrupt_bug(void);
asmlinkage void machine_check(void); asmlinkage void machine_check(void);
int kstack_depth_to_print = 24; int kstack_depth_to_print = 24;
static unsigned int code_bytes = 64;
ATOMIC_NOTIFIER_HEAD(i386die_chain); ATOMIC_NOTIFIER_HEAD(i386die_chain);
int register_die_notifier(struct notifier_block *nb) int register_die_notifier(struct notifier_block *nb)
...@@ -325,7 +326,8 @@ void show_registers(struct pt_regs *regs) ...@@ -325,7 +326,8 @@ void show_registers(struct pt_regs *regs)
*/ */
if (in_kernel) { if (in_kernel) {
u8 *eip; u8 *eip;
int code_bytes = 64; unsigned int code_prologue = code_bytes * 43 / 64;
unsigned int code_len = code_bytes;
unsigned char c; unsigned char c;
printk("\n" KERN_EMERG "Stack: "); printk("\n" KERN_EMERG "Stack: ");
...@@ -333,14 +335,14 @@ void show_registers(struct pt_regs *regs) ...@@ -333,14 +335,14 @@ void show_registers(struct pt_regs *regs)
printk(KERN_EMERG "Code: "); printk(KERN_EMERG "Code: ");
eip = (u8 *)regs->eip - 43; eip = (u8 *)regs->eip - code_prologue;
if (eip < (u8 *)PAGE_OFFSET || if (eip < (u8 *)PAGE_OFFSET ||
probe_kernel_address(eip, c)) { probe_kernel_address(eip, c)) {
/* try starting at EIP */ /* try starting at EIP */
eip = (u8 *)regs->eip; eip = (u8 *)regs->eip;
code_bytes = 32; code_len = code_len - code_prologue + 1;
} }
for (i = 0; i < code_bytes; i++, eip++) { for (i = 0; i < code_len; i++, eip++) {
if (eip < (u8 *)PAGE_OFFSET || if (eip < (u8 *)PAGE_OFFSET ||
probe_kernel_address(eip, c)) { probe_kernel_address(eip, c)) {
printk(" Bad EIP value."); printk(" Bad EIP value.");
...@@ -1192,3 +1194,13 @@ static int __init kstack_setup(char *s) ...@@ -1192,3 +1194,13 @@ static int __init kstack_setup(char *s)
return 1; return 1;
} }
__setup("kstack=", kstack_setup); __setup("kstack=", kstack_setup);
static int __init code_bytes_setup(char *s)
{
code_bytes = simple_strtoul(s, NULL, 0);
if (code_bytes > 8192)
code_bytes = 8192;
return 1;
}
__setup("code_bytes=", code_bytes_setup);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment