Skip to content

L
linux
Commit 4ee48103 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'x86-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 debug fixlets from Ingo Molnar:
 "Improve x86 debuggability: print registers with the same log level as
  the backtrace"

* tag 'x86-core-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/dumpstack: Show registers dump with trace's log level
  x86/dumpstack: Add log_lvl to __show_regs()
  x86/dumpstack: Add log_lvl to show_iret_regs()
parents 37e88224 ef2ff0f5
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 51 deletions
arch/x86/include/asm/kdebug.h
View file @ 4ee48103
...@@ -36,8 +36,9 @@ extern void die(const char *, struct pt_regs *,long); ...@@ -36,8 +36,9 @@ extern void die(const char *, struct pt_regs *,long);
void die_addr(const char *str, struct pt_regs *regs, long err, long gp_addr); void die_addr(const char *str, struct pt_regs *regs, long err, long gp_addr);
extern int __must_check __die(const char *, struct pt_regs *, long); extern int __must_check __die(const char *, struct pt_regs *, long);
extern void show_stack_regs(struct pt_regs *regs); extern void show_stack_regs(struct pt_regs *regs);
extern void __show_regs(struct pt_regs *regs, enum show_regs_mode); extern void __show_regs(struct pt_regs *regs, enum show_regs_mode,
extern void show_iret_regs(struct pt_regs *regs); const char *log_lvl);
extern void show_iret_regs(struct pt_regs *regs, const char *log_lvl);
extern unsigned long oops_begin(void); extern unsigned long oops_begin(void);
extern void oops_end(unsigned long, struct pt_regs *, int signr); extern void oops_end(unsigned long, struct pt_regs *, int signr);
......
arch/x86/kernel/dumpstack.c
View file @ 4ee48103
...@@ -133,15 +133,15 @@ void show_ip(struct pt_regs *regs, const char *loglvl) ...@@ -133,15 +133,15 @@ void show_ip(struct pt_regs *regs, const char *loglvl)
show_opcodes(regs, loglvl); show_opcodes(regs, loglvl);
} }
void show_iret_regs(struct pt_regs *regs) void show_iret_regs(struct pt_regs *regs, const char *log_lvl)
{ {
show_ip(regs, KERN_DEFAULT); show_ip(regs, log_lvl);
printk(KERN_DEFAULT "RSP: %04x:%016lx EFLAGS: %08lx", (int)regs->ss, printk("%sRSP: %04x:%016lx EFLAGS: %08lx", log_lvl, (int)regs->ss,
regs->sp, regs->flags); regs->sp, regs->flags);
} }
static void show_regs_if_on_stack(struct stack_info *info, struct pt_regs *regs, static void show_regs_if_on_stack(struct stack_info *info, struct pt_regs *regs,
bool partial) bool partial, const char *log_lvl)
{ {
/* /*
* These on_stack() checks aren't strictly necessary: the unwind code * These on_stack() checks aren't strictly necessary: the unwind code
...@@ -153,7 +153,7 @@ static void show_regs_if_on_stack(struct stack_info *info, struct pt_regs *regs, ...@@ -153,7 +153,7 @@ static void show_regs_if_on_stack(struct stack_info *info, struct pt_regs *regs,
* they can be printed in the right context. * they can be printed in the right context.
*/ */
if (!partial && on_stack(info, regs, sizeof(*regs))) { if (!partial && on_stack(info, regs, sizeof(*regs))) {
__show_regs(regs, SHOW_REGS_SHORT); __show_regs(regs, SHOW_REGS_SHORT, log_lvl);
} else if (partial && on_stack(info, (void *)regs + IRET_FRAME_OFFSET, } else if (partial && on_stack(info, (void *)regs + IRET_FRAME_OFFSET,
IRET_FRAME_SIZE)) { IRET_FRAME_SIZE)) {
...@@ -162,7 +162,7 @@ static void show_regs_if_on_stack(struct stack_info *info, struct pt_regs *regs, ...@@ -162,7 +162,7 @@ static void show_regs_if_on_stack(struct stack_info *info, struct pt_regs *regs,
* full pt_regs might not have been saved yet. In that case * full pt_regs might not have been saved yet. In that case
* just print the iret frame. * just print the iret frame.
*/ */
show_iret_regs(regs); show_iret_regs(regs, log_lvl);
} }
} }
...@@ -217,7 +217,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, ...@@ -217,7 +217,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
printk("%s <%s>\n", log_lvl, stack_name); printk("%s <%s>\n", log_lvl, stack_name);
if (regs) if (regs)
show_regs_if_on_stack(&stack_info, regs, partial); show_regs_if_on_stack(&stack_info, regs, partial, log_lvl);
/* /*
* Scan the stack, printing any text addresses we find. At the * Scan the stack, printing any text addresses we find. At the
...@@ -278,7 +278,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs, ...@@ -278,7 +278,7 @@ void show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
/* if the frame has entry regs, print them */ /* if the frame has entry regs, print them */
regs = unwind_get_entry_regs(&state, &partial); regs = unwind_get_entry_regs(&state, &partial);
if (regs) if (regs)
show_regs_if_on_stack(&stack_info, regs, partial); show_regs_if_on_stack(&stack_info, regs, partial, log_lvl);
} }
if (stack_name) if (stack_name)
...@@ -352,7 +352,7 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr) ...@@ -352,7 +352,7 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
oops_exit(); oops_exit();
/* Executive summary in case the oops scrolled away */ /* Executive summary in case the oops scrolled away */
__show_regs(&exec_summary_regs, SHOW_REGS_ALL); __show_regs(&exec_summary_regs, SHOW_REGS_ALL, KERN_DEFAULT);
if (!signr) if (!signr)
return; return;
...@@ -444,9 +444,12 @@ void die_addr(const char *str, struct pt_regs *regs, long err, long gp_addr) ...@@ -444,9 +444,12 @@ void die_addr(const char *str, struct pt_regs *regs, long err, long gp_addr)
void show_regs(struct pt_regs *regs) void show_regs(struct pt_regs *regs)
{ {
enum show_regs_mode print_kernel_regs;
show_regs_print_info(KERN_DEFAULT); show_regs_print_info(KERN_DEFAULT);
__show_regs(regs, user_mode(regs) ? SHOW_REGS_USER : SHOW_REGS_ALL); print_kernel_regs = user_mode(regs) ? SHOW_REGS_USER : SHOW_REGS_ALL;
__show_regs(regs, print_kernel_regs, KERN_DEFAULT);
/* /*
* When in-kernel, we also print out the stack at the time of the fault.. * When in-kernel, we also print out the stack at the time of the fault..
......
arch/x86/kernel/process_32.c
View file @ 4ee48103
...@@ -56,7 +56,8 @@ ...@@ -56,7 +56,8 @@
#include "process.h" #include "process.h"
void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) void __show_regs(struct pt_regs *regs, enum show_regs_mode mode,
const char *log_lvl)
{ {
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L; unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L;
unsigned long d0, d1, d2, d3, d6, d7; unsigned long d0, d1, d2, d3, d6, d7;
...@@ -67,14 +68,14 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) ...@@ -67,14 +68,14 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode)
else else
savesegment(gs, gs); savesegment(gs, gs);
show_ip(regs, KERN_DEFAULT); show_ip(regs, log_lvl);
printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n", printk("%sEAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
regs->ax, regs->bx, regs->cx, regs->dx); log_lvl, regs->ax, regs->bx, regs->cx, regs->dx);
printk(KERN_DEFAULT "ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n", printk("%sESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n",
regs->si, regs->di, regs->bp, regs->sp); log_lvl, regs->si, regs->di, regs->bp, regs->sp);
printk(KERN_DEFAULT "DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x EFLAGS: %08lx\n", printk("%sDS: %04x ES: %04x FS: %04x GS: %04x SS: %04x EFLAGS: %08lx\n",
(u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, regs->ss, regs->flags); log_lvl, (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, regs->ss, regs->flags);
if (mode != SHOW_REGS_ALL) if (mode != SHOW_REGS_ALL)
return; return;
...@@ -83,8 +84,8 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) ...@@ -83,8 +84,8 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode)
cr2 = read_cr2(); cr2 = read_cr2();
cr3 = __read_cr3(); cr3 = __read_cr3();
cr4 = __read_cr4(); cr4 = __read_cr4();
printk(KERN_DEFAULT "CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n", printk("%sCR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n",
cr0, cr2, cr3, cr4); log_lvl, cr0, cr2, cr3, cr4);
get_debugreg(d0, 0); get_debugreg(d0, 0);
get_debugreg(d1, 1); get_debugreg(d1, 1);
...@@ -98,10 +99,10 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) ...@@ -98,10 +99,10 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode)
(d6 == DR6_RESERVED) && (d7 == 0x400)) (d6 == DR6_RESERVED) && (d7 == 0x400))
return; return;
printk(KERN_DEFAULT "DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n", printk("%sDR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n",
d0, d1, d2, d3); log_lvl, d0, d1, d2, d3);
printk(KERN_DEFAULT "DR6: %08lx DR7: %08lx\n", printk("%sDR6: %08lx DR7: %08lx\n",
d6, d7); log_lvl, d6, d7);
} }
void release_thread(struct task_struct *dead_task) void release_thread(struct task_struct *dead_task)
......
arch/x86/kernel/process_64.c
View file @ 4ee48103
...@@ -62,30 +62,31 @@ ...@@ -62,30 +62,31 @@
#include "process.h" #include "process.h"
/* Prints also some state that isn't saved in the pt_regs */ /* Prints also some state that isn't saved in the pt_regs */
void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) void __show_regs(struct pt_regs *regs, enum show_regs_mode mode,
const char *log_lvl)
{ {
unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L, fs, gs, shadowgs; unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L, fs, gs, shadowgs;
unsigned long d0, d1, d2, d3, d6, d7; unsigned long d0, d1, d2, d3, d6, d7;
unsigned int fsindex, gsindex; unsigned int fsindex, gsindex;
unsigned int ds, es; unsigned int ds, es;
show_iret_regs(regs); show_iret_regs(regs, log_lvl);
if (regs->orig_ax != -1) if (regs->orig_ax != -1)
pr_cont(" ORIG_RAX: %016lx\n", regs->orig_ax); pr_cont(" ORIG_RAX: %016lx\n", regs->orig_ax);
else else
pr_cont("\n"); pr_cont("\n");
printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n", printk("%sRAX: %016lx RBX: %016lx RCX: %016lx\n",
regs->ax, regs->bx, regs->cx); log_lvl, regs->ax, regs->bx, regs->cx);
printk(KERN_DEFAULT "RDX: %016lx RSI: %016lx RDI: %016lx\n", printk("%sRDX: %016lx RSI: %016lx RDI: %016lx\n",
regs->dx, regs->si, regs->di); log_lvl, regs->dx, regs->si, regs->di);
printk(KERN_DEFAULT "RBP: %016lx R08: %016lx R09: %016lx\n", printk("%sRBP: %016lx R08: %016lx R09: %016lx\n",
regs->bp, regs->r8, regs->r9); log_lvl, regs->bp, regs->r8, regs->r9);
printk(KERN_DEFAULT "R10: %016lx R11: %016lx R12: %016lx\n", printk("%sR10: %016lx R11: %016lx R12: %016lx\n",
regs->r10, regs->r11, regs->r12); log_lvl, regs->r10, regs->r11, regs->r12);
printk(KERN_DEFAULT "R13: %016lx R14: %016lx R15: %016lx\n", printk("%sR13: %016lx R14: %016lx R15: %016lx\n",
regs->r13, regs->r14, regs->r15); log_lvl, regs->r13, regs->r14, regs->r15);
if (mode == SHOW_REGS_SHORT) if (mode == SHOW_REGS_SHORT)
return; return;
...@@ -93,8 +94,8 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) ...@@ -93,8 +94,8 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode)
if (mode == SHOW_REGS_USER) { if (mode == SHOW_REGS_USER) {
rdmsrl(MSR_FS_BASE, fs); rdmsrl(MSR_FS_BASE, fs);
rdmsrl(MSR_KERNEL_GS_BASE, shadowgs); rdmsrl(MSR_KERNEL_GS_BASE, shadowgs);
printk(KERN_DEFAULT "FS: %016lx GS: %016lx\n", printk("%sFS: %016lx GS: %016lx\n",
fs, shadowgs); log_lvl, fs, shadowgs);
return; return;
} }
...@@ -112,12 +113,12 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) ...@@ -112,12 +113,12 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode)
cr3 = __read_cr3(); cr3 = __read_cr3();
cr4 = __read_cr4(); cr4 = __read_cr4();
printk(KERN_DEFAULT "FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n", printk("%sFS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",
fs, fsindex, gs, gsindex, shadowgs); log_lvl, fs, fsindex, gs, gsindex, shadowgs);
printk(KERN_DEFAULT "CS: %04lx DS: %04x ES: %04x CR0: %016lx\n", regs->cs, ds, printk("%sCS: %04lx DS: %04x ES: %04x CR0: %016lx\n",
es, cr0); log_lvl, regs->cs, ds, es, cr0);
printk(KERN_DEFAULT "CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, printk("%sCR2: %016lx CR3: %016lx CR4: %016lx\n",
cr4); log_lvl, cr2, cr3, cr4);
get_debugreg(d0, 0); get_debugreg(d0, 0);
get_debugreg(d1, 1); get_debugreg(d1, 1);
...@@ -129,14 +130,14 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) ...@@ -129,14 +130,14 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode)
/* Only print out debug registers if they are in their non-default state. */ /* Only print out debug registers if they are in their non-default state. */
if (!((d0 == 0) && (d1 == 0) && (d2 == 0) && (d3 == 0) && if (!((d0 == 0) && (d1 == 0) && (d2 == 0) && (d3 == 0) &&
(d6 == DR6_RESERVED) && (d7 == 0x400))) { (d6 == DR6_RESERVED) && (d7 == 0x400))) {
printk(KERN_DEFAULT "DR0: %016lx DR1: %016lx DR2: %016lx\n", printk("%sDR0: %016lx DR1: %016lx DR2: %016lx\n",
d0, d1, d2); log_lvl, d0, d1, d2);
printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n", printk("%sDR3: %016lx DR6: %016lx DR7: %016lx\n",
d3, d6, d7); log_lvl, d3, d6, d7);
} }
if (boot_cpu_has(X86_FEATURE_OSPKE)) if (boot_cpu_has(X86_FEATURE_OSPKE))
printk(KERN_DEFAULT "PKRU: %08x\n", read_pkru()); printk("%sPKRU: %08x\n", log_lvl, read_pkru());
} }
void release_thread(struct task_struct *dead_task) void release_thread(struct task_struct *dead_task)
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7