Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/dumpstack: Add log_lvl to __show_regs()

show_trace_log_lvl() provides x86 platform-specific way to unwind
backtrace with a given log level. Unfortunately, registers dump(s) are
not printed with the same log level - instead, KERN_DEFAULT is always
used.

Arista's switches uses quite common setup with rsyslog, where only
urgent messages goes to console (console_log_level=KERN_ERR), everything
else goes into /var/log/ as the console baud-rate often is indecently
slow (9600 bps).

Backtrace dumps without registers printed have proven to be as useful as
morning standups. Furthermore, in order to introduce KERN_UNSUPPRESSED
(which I believe is still the most elegant way to fix raciness of sysrq[1])
the log level should be passed down the stack to register dumping
functions. Besides, there is a potential use-case for printing traces
with KERN_DEBUG level [2] (where registers dump shouldn't appear with
higher log level).

Add log_lvl parameter to __show_regs().
Keep the used log level intact to separate visible change.

[1]: https://lore.kernel.org/lkml/20190528002412.1625-1-dima@arista.com/
[2]: https://lore.kernel.org/linux-doc/20190724170249.9644-1-dima@arista.com/

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Petr Mladek <pmladek@suse.com>
Link: https://lkml.kernel.org/r/20200629144847.492794-3-dima@arista.com

authored by

Dmitry Safonov and committed by
Thomas Gleixner
44e21535 fd07f802

+49 -43
+2 -1
arch/x86/include/asm/kdebug.h
··· 36 36 void die_addr(const char *str, struct pt_regs *regs, long err, long gp_addr); 37 37 extern int __must_check __die(const char *, struct pt_regs *, long); 38 38 extern void show_stack_regs(struct pt_regs *regs); 39 - extern void __show_regs(struct pt_regs *regs, enum show_regs_mode); 39 + extern void __show_regs(struct pt_regs *regs, enum show_regs_mode, 40 + const char *log_lvl); 40 41 extern void show_iret_regs(struct pt_regs *regs, const char *log_lvl); 41 42 extern unsigned long oops_begin(void); 42 43 extern void oops_end(unsigned long, struct pt_regs *, int signr);
+6 -3
arch/x86/kernel/dumpstack.c
··· 146 146 * they can be printed in the right context. 147 147 */ 148 148 if (!partial && on_stack(info, regs, sizeof(*regs))) { 149 - __show_regs(regs, SHOW_REGS_SHORT); 149 + __show_regs(regs, SHOW_REGS_SHORT, KERN_DEFAULT); 150 150 151 151 } else if (partial && on_stack(info, (void *)regs + IRET_FRAME_OFFSET, 152 152 IRET_FRAME_SIZE)) { ··· 345 345 oops_exit(); 346 346 347 347 /* Executive summary in case the oops scrolled away */ 348 - __show_regs(&exec_summary_regs, SHOW_REGS_ALL); 348 + __show_regs(&exec_summary_regs, SHOW_REGS_ALL, KERN_DEFAULT); 349 349 350 350 if (!signr) 351 351 return; ··· 437 437 438 438 void show_regs(struct pt_regs *regs) 439 439 { 440 + enum show_regs_mode print_kernel_regs; 441 + 440 442 show_regs_print_info(KERN_DEFAULT); 441 443 442 - __show_regs(regs, user_mode(regs) ? SHOW_REGS_USER : SHOW_REGS_ALL); 444 + print_kernel_regs = user_mode(regs) ? SHOW_REGS_USER : SHOW_REGS_ALL; 445 + __show_regs(regs, print_kernel_regs, KERN_DEFAULT); 443 446 444 447 /* 445 448 * When in-kernel, we also print out the stack at the time of the fault..
+15 -14
arch/x86/kernel/process_32.c
··· 56 56 57 57 #include "process.h" 58 58 59 - void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) 59 + void __show_regs(struct pt_regs *regs, enum show_regs_mode mode, 60 + const char *log_lvl) 60 61 { 61 62 unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L; 62 63 unsigned long d0, d1, d2, d3, d6, d7; ··· 68 67 else 69 68 savesegment(gs, gs); 70 69 71 - show_ip(regs, KERN_DEFAULT); 70 + show_ip(regs, log_lvl); 72 71 73 - printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n", 74 - regs->ax, regs->bx, regs->cx, regs->dx); 75 - printk(KERN_DEFAULT "ESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n", 76 - regs->si, regs->di, regs->bp, regs->sp); 77 - printk(KERN_DEFAULT "DS: %04x ES: %04x FS: %04x GS: %04x SS: %04x EFLAGS: %08lx\n", 78 - (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, regs->ss, regs->flags); 72 + printk("%sEAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n", 73 + log_lvl, regs->ax, regs->bx, regs->cx, regs->dx); 74 + printk("%sESI: %08lx EDI: %08lx EBP: %08lx ESP: %08lx\n", 75 + log_lvl, regs->si, regs->di, regs->bp, regs->sp); 76 + printk("%sDS: %04x ES: %04x FS: %04x GS: %04x SS: %04x EFLAGS: %08lx\n", 77 + log_lvl, (u16)regs->ds, (u16)regs->es, (u16)regs->fs, gs, regs->ss, regs->flags); 79 78 80 79 if (mode != SHOW_REGS_ALL) 81 80 return; ··· 84 83 cr2 = read_cr2(); 85 84 cr3 = __read_cr3(); 86 85 cr4 = __read_cr4(); 87 - printk(KERN_DEFAULT "CR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n", 88 - cr0, cr2, cr3, cr4); 86 + printk("%sCR0: %08lx CR2: %08lx CR3: %08lx CR4: %08lx\n", 87 + log_lvl, cr0, cr2, cr3, cr4); 89 88 90 89 get_debugreg(d0, 0); 91 90 get_debugreg(d1, 1); ··· 99 98 (d6 == DR6_RESERVED) && (d7 == 0x400)) 100 99 return; 101 100 102 - printk(KERN_DEFAULT "DR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n", 103 - d0, d1, d2, d3); 104 - printk(KERN_DEFAULT "DR6: %08lx DR7: %08lx\n", 105 - d6, d7); 101 + printk("%sDR0: %08lx DR1: %08lx DR2: %08lx DR3: %08lx\n", 102 + log_lvl, d0, d1, d2, d3); 103 + printk("%sDR6: %08lx DR7: %08lx\n", 104 + log_lvl, d6, d7); 106 105 } 107 106 108 107 void release_thread(struct task_struct *dead_task)
+26 -25
arch/x86/kernel/process_64.c
··· 62 62 #include "process.h" 63 63 64 64 /* Prints also some state that isn't saved in the pt_regs */ 65 - void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) 65 + void __show_regs(struct pt_regs *regs, enum show_regs_mode mode, 66 + const char *log_lvl) 66 67 { 67 68 unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L, fs, gs, shadowgs; 68 69 unsigned long d0, d1, d2, d3, d6, d7; 69 70 unsigned int fsindex, gsindex; 70 71 unsigned int ds, es; 71 72 72 - show_iret_regs(regs, KERN_DEFAULT); 73 + show_iret_regs(regs, log_lvl); 73 74 74 75 if (regs->orig_ax != -1) 75 76 pr_cont(" ORIG_RAX: %016lx\n", regs->orig_ax); 76 77 else 77 78 pr_cont("\n"); 78 79 79 - printk(KERN_DEFAULT "RAX: %016lx RBX: %016lx RCX: %016lx\n", 80 - regs->ax, regs->bx, regs->cx); 81 - printk(KERN_DEFAULT "RDX: %016lx RSI: %016lx RDI: %016lx\n", 82 - regs->dx, regs->si, regs->di); 83 - printk(KERN_DEFAULT "RBP: %016lx R08: %016lx R09: %016lx\n", 84 - regs->bp, regs->r8, regs->r9); 85 - printk(KERN_DEFAULT "R10: %016lx R11: %016lx R12: %016lx\n", 86 - regs->r10, regs->r11, regs->r12); 87 - printk(KERN_DEFAULT "R13: %016lx R14: %016lx R15: %016lx\n", 88 - regs->r13, regs->r14, regs->r15); 80 + printk("%sRAX: %016lx RBX: %016lx RCX: %016lx\n", 81 + log_lvl, regs->ax, regs->bx, regs->cx); 82 + printk("%sRDX: %016lx RSI: %016lx RDI: %016lx\n", 83 + log_lvl, regs->dx, regs->si, regs->di); 84 + printk("%sRBP: %016lx R08: %016lx R09: %016lx\n", 85 + log_lvl, regs->bp, regs->r8, regs->r9); 86 + printk("%sR10: %016lx R11: %016lx R12: %016lx\n", 87 + log_lvl, regs->r10, regs->r11, regs->r12); 88 + printk("%sR13: %016lx R14: %016lx R15: %016lx\n", 89 + log_lvl, regs->r13, regs->r14, regs->r15); 89 90 90 91 if (mode == SHOW_REGS_SHORT) 91 92 return; ··· 94 93 if (mode == SHOW_REGS_USER) { 95 94 rdmsrl(MSR_FS_BASE, fs); 96 95 rdmsrl(MSR_KERNEL_GS_BASE, shadowgs); 97 - printk(KERN_DEFAULT "FS: %016lx GS: %016lx\n", 98 - fs, shadowgs); 96 + printk("%sFS: %016lx GS: %016lx\n", 97 + log_lvl, fs, shadowgs); 99 98 return; 100 99 } 101 100 ··· 113 112 cr3 = __read_cr3(); 114 113 cr4 = __read_cr4(); 115 114 116 - printk(KERN_DEFAULT "FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n", 117 - fs, fsindex, gs, gsindex, shadowgs); 118 - printk(KERN_DEFAULT "CS: %04lx DS: %04x ES: %04x CR0: %016lx\n", regs->cs, ds, 119 - es, cr0); 120 - printk(KERN_DEFAULT "CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, 121 - cr4); 115 + printk("%sFS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n", 116 + log_lvl, fs, fsindex, gs, gsindex, shadowgs); 117 + printk("%sCS: %04lx DS: %04x ES: %04x CR0: %016lx\n", 118 + log_lvl, regs->cs, ds, es, cr0); 119 + printk("%sCR2: %016lx CR3: %016lx CR4: %016lx\n", 120 + log_lvl, cr2, cr3, cr4); 122 121 123 122 get_debugreg(d0, 0); 124 123 get_debugreg(d1, 1); ··· 130 129 /* Only print out debug registers if they are in their non-default state. */ 131 130 if (!((d0 == 0) && (d1 == 0) && (d2 == 0) && (d3 == 0) && 132 131 (d6 == DR6_RESERVED) && (d7 == 0x400))) { 133 - printk(KERN_DEFAULT "DR0: %016lx DR1: %016lx DR2: %016lx\n", 134 - d0, d1, d2); 135 - printk(KERN_DEFAULT "DR3: %016lx DR6: %016lx DR7: %016lx\n", 136 - d3, d6, d7); 132 + printk("%sDR0: %016lx DR1: %016lx DR2: %016lx\n", 133 + log_lvl, d0, d1, d2); 134 + printk("%sDR3: %016lx DR6: %016lx DR7: %016lx\n", 135 + log_lvl, d3, d6, d7); 137 136 } 138 137 139 138 if (boot_cpu_has(X86_FEATURE_OSPKE)) 140 - printk(KERN_DEFAULT "PKRU: %08x\n", read_pkru()); 139 + printk("%sPKRU: %08x\n", log_lvl, read_pkru()); 141 140 } 142 141 143 142 void release_thread(struct task_struct *dead_task)