Print number of oopses in Sysrq-P output

PATCH In review Alexey Dobriyan 4 participants 4 messages Jan 18, 2007 – Jan 19, 2007

lore

Share & tools

lore

Alexey Dobriyan

author

2007-01-18 16:58 UTC #0 lore raw

PATCH 1/1 Print number of oopses in Sysrq-P output

From: Pavel Emelianov <[email protected]>

Useful in deciding whether said output should be ignored in absence of other info. :)

Signed-off-by Pavel Emelianov <[email protected]>

Signed-off-by Alexey Dobriyan <[email protected]>

---

 arch/i386/kernel/process.c   |    4 +++-
 arch/i386/kernel/traps.c     |    2 +-
 arch/x86_64/kernel/process.c |    6 ++++--
 arch/x86_64/kernel/traps.c   |    3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

arch/i386/kernel/process.c +3 -1

@@ -292,9 +292,11 @@ __setup("idle=", idle_setup);
 void show_regs(struct pt_regs * regs)
 {
 	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
+	extern int die_counter;
 
 	printk("\n");
-	printk("Pid: %d, comm: %20s\n", current->pid, current->comm);
+	printk("Pid: %d, comm: %20s, oopses: %d\n",
+		current->pid, current->comm, die_counter);
 	printk("EIP: %04x:[<%08lx>] CPU: %d\n",0xffff & regs->xcs,regs->eip, smp_processor_id());
 	print_symbol("EIP is at %s\n", regs->eip);

arch/i386/kernel/traps.c +1 -1

@@ -366,6 +366,7 @@ int is_valid_bugaddr(unsigned long eip)
 	return ud2 == 0x0b0f;
 }
 
+int die_counter = 0;
 /*
  * This is gone through when something in the kernel has done something bad and
  * is about to be terminated.

@@ -381,7 +382,6 @@ void die(const char * str, struct pt_reg
 		.lock_owner =		-1,
 		.lock_owner_depth =	0
 	};
-	static int die_counter;
 	unsigned long flags;
 
 	oops_enter();

arch/x86_64/kernel/process.c +4 -2

@@ -305,14 +305,16 @@ void __show_regs(struct pt_regs * regs)
 	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L, fs, gs, shadowgs;
 	unsigned int fsindex,gsindex;
 	unsigned int ds,cs,es; 
+	extern int die_counter;
 
 	printk("\n");
 	print_modules();
-	printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+	printk("Pid: %d, comm: %.20s %s %s %.*s oopses: %d\n",
 		current->pid, current->comm, print_tainted(),
 		init_utsname()->release,
 		(int)strcspn(init_utsname()->version, " "),
-		init_utsname()->version);
+		init_utsname()->version,
+		die_counter);
 	printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip);
 	printk_address(regs->rip); 
 	printk("RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss, regs->rsp,

arch/x86_64/kernel/traps.c +2 -1

@@ -519,9 +519,10 @@ void __kprobes oops_end(unsigned long fl
 	oops_exit();
 }
 
+int die_counter = 0;
+
 void __kprobes __die(const char * str, struct pt_regs * regs, long err)
 {
-	static int die_counter;
 	printk(KERN_EMERG "%s: %04lx [%u] ", str, err & 0xffff,++die_counter);
 #ifdef CONFIG_PREEMPT
 	printk("PREEMPT ");

Erik Mouw

2007-01-18 17:46 UTC #1 lore raw

Quoted 7 lines · Alexey Dobriyan

From: Pavel Emelianov <[email protected]>
Useful in deciding whether said output should be ignored in absence of other info. :)
Signed-off-by Pavel Emelianov <[email protected]>
Signed-off-by Alexey Dobriyan <[email protected]>

Quoted 7 lines

---

 arch/i386/kernel/process.c   |    4 +++-
 arch/i386/kernel/traps.c     |    2 +-
 arch/x86_64/kernel/process.c |    6 ++++--
 arch/x86_64/kernel/traps.c   |    3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

What about the other architectures?

arch/i386/kernel/traps.c int is_valid_bugaddr(unsigned long eip) · line 369

Quoted 7 lines

arch/i386/kernel/traps.c +1 -0

@@ -366,6 +366,7 @@ int is_valid_bugaddr(unsigned long eip)
 	return ud2 == 0x0b0f;
 }
 
+int die_counter = 0;

Global variables don't have to be initialised at 0. They live in the .bss segment so they will automatically initialised at 0 and not take space in the kernel image.

Erik

Signature · 2 lines

+-- Erik Mouw -- www.harddisk-recovery.com -- +31 70 370 12 90 --
| Lab address: Delftechpark 26, 2628 XH, Delft, The Netherlands

Andi Kleen

2007-01-18 23:24 UTC #2 lore raw

In reply to Alexey Dobriyan

arch/i386/kernel/process.c __setup("idle=", idle_setup); · line 295

Quoted 5 lines · Alexey Dobriyan

arch/i386/kernel/process.c +1 -0

@@ -292,9 +292,11 @@ __setup("idle=", idle_setup);
 void show_regs(struct pt_regs * regs)
 {
 	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
+	extern int die_counter;

externs should always be in some .h file, never in a sub scope.

-Andi

Kirill Korotaev

2007-01-19 11:25 UTC #3 lore raw

In reply to Alexey Dobriyan

please fix the comment as well.

oops number is very helpful in dealing with people reports. Very often the first Oops is required to get understanding of the real problem, so
further oops can be ignored and the first one requested if the problem is reproducable.

Kirill

Quoted 89 lines