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

Commit 36e635cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 stackdump update from Ingo Molnar:
 "A number of stackdump enhancements"

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/dumpstack: Add show_stack_regs() and use it
  printk: Make the printk*once() variants return a value
  x86/dumpstack: Honor supplied @regs arg
parents c265cc5c 81c2949f

arch/x86/include/asm/kdebug.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ extern void die(const char *, struct pt_regs *,long); 
extern int __must_check __die(const char *, struct pt_regs *, long);

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

		       unsigned long *sp, unsigned long bp);

extern void show_stack_regs(struct pt_regs *regs);

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

extern unsigned long oops_begin(void);

extern void oops_end(unsigned long, struct pt_regs *, int signr);

arch/x86/kernel/dumpstack.c

+5 −0
Original line number Diff line number Diff line
@@ -205,6 +205,11 @@ void show_stack(struct task_struct *task, unsigned long *sp) 
	show_stack_log_lvl(task, NULL, sp, bp, "");

}



void show_stack_regs(struct pt_regs *regs)

{

	show_stack_log_lvl(current, regs, (unsigned long *)regs->sp, regs->bp, "");

}



static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;

static int die_owner = -1;

static unsigned int die_nest_count;

arch/x86/kernel/dumpstack_32.c

+3 −1
Original line number Diff line number Diff line
@@ -96,7 +96,9 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
	int i;



	if (sp == NULL) {

		if (task)

		if (regs)

			sp = (unsigned long *)regs->sp;

		else if (task)

			sp = (unsigned long *)task->thread.sp;

		else

			sp = (unsigned long *)&sp;

arch/x86/kernel/dumpstack_64.c

+3 −1
Original line number Diff line number Diff line
@@ -264,7 +264,9 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
	 * back trace for this cpu:

	 */

	if (sp == NULL) {

		if (task)

		if (regs)

			sp = (unsigned long *)regs->sp;

		else if (task)

			sp = (unsigned long *)task->thread.sp;

		else

			sp = (unsigned long *)&sp;

arch/x86/mm/extable.c

+8 −5
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <asm/uaccess.h>

#include <asm/traps.h>

#include <asm/kdebug.h>



typedef bool (*ex_handler_t)(const struct exception_table_entry *,

			    struct pt_regs *, int);
@@ -46,8 +47,9 @@ EXPORT_SYMBOL(ex_handler_ext); 
bool ex_handler_rdmsr_unsafe(const struct exception_table_entry *fixup,

			     struct pt_regs *regs, int trapnr)

{

	WARN_ONCE(1, "unchecked MSR access error: RDMSR from 0x%x\n",

		  (unsigned int)regs->cx);

	if (pr_warn_once("unchecked MSR access error: RDMSR from 0x%x at rIP: 0x%lx (%pF)\n",

			 (unsigned int)regs->cx, regs->ip, (void *)regs->ip))

		show_stack_regs(regs);



	/* Pretend that the read succeeded and returned 0. */

	regs->ip = ex_fixup_addr(fixup);
@@ -60,9 +62,10 @@ EXPORT_SYMBOL(ex_handler_rdmsr_unsafe); 
bool ex_handler_wrmsr_unsafe(const struct exception_table_entry *fixup,

			     struct pt_regs *regs, int trapnr)

{

	WARN_ONCE(1, "unchecked MSR access error: WRMSR to 0x%x (tried to write 0x%08x%08x)\n",

		  (unsigned int)regs->cx,

		  (unsigned int)regs->dx, (unsigned int)regs->ax);

	if (pr_warn_once("unchecked MSR access error: WRMSR to 0x%x (tried to write 0x%08x%08x) at rIP: 0x%lx (%pF)\n",

			 (unsigned int)regs->cx, (unsigned int)regs->dx,

			 (unsigned int)regs->ax,  regs->ip, (void *)regs->ip))

		show_stack_regs(regs);



	/* Pretend that the write succeeded. */

	regs->ip = ex_fixup_addr(fixup);