Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57da8b96 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: Avoid double stack traces with show_regs() 



What was called show_registers() so far already showed a stack
trace for kernel faults, and kernel_stack_pointer() isn't even
valid to be used for faults from user mode, hence it was
pointless for show_regs() to call show_trace() after
show_registers().

Simply rename show_registers() to show_regs() and eliminate
the old definition.

Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/4FAA3D3902000078000826E1@nat28.tlf.novell.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent febb72a6

arch/x86/include/asm/kdebug.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ enum die_val { 
extern void printk_address(unsigned long address, int reliable);

extern void die(const char *, struct pt_regs *,long);

extern int __must_check __die(const char *, struct pt_regs *, long);

extern void show_registers(struct pt_regs *regs);

extern void show_trace(struct task_struct *t, struct pt_regs *regs,

		       unsigned long *sp, unsigned long bp);

extern void __show_regs(struct pt_regs *regs, int all);

arch/x86/kernel/dumpstack.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
			current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)

		return 1;



	show_registers(regs);

	show_regs(regs);

#ifdef CONFIG_X86_32

	if (user_mode_vm(regs)) {

		sp = regs->sp;

arch/x86/kernel/dumpstack_32.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
}





void show_registers(struct pt_regs *regs)

void show_regs(struct pt_regs *regs)

{

	int i;

arch/x86/kernel/dumpstack_64.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
	show_trace_log_lvl(task, regs, sp, bp, log_lvl);

}



void show_registers(struct pt_regs *regs)

void show_regs(struct pt_regs *regs)

{

	int i;

	unsigned long sp;

arch/x86/kernel/kprobes.c

+2 −2
Original line number Diff line number Diff line
@@ -1037,9 +1037,9 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) 
			       "current sp %p does not match saved sp %p\n",

			       stack_addr(regs), kcb->jprobe_saved_sp);

			printk(KERN_ERR "Saved registers for jprobe %p\n", jp);

			show_registers(saved_regs);

			show_regs(saved_regs);

			printk(KERN_ERR "Current registers\n");

			show_registers(regs);

			show_regs(regs);

			BUG();

		}

		*regs = kcb->jprobe_saved_regs;