Commit 539e786c authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Linus Torvalds

sh: add loglvl to show_trace()

Currently, the log-level of show_stack() depends on a platform
realization.  It creates situations where the headers are printed with
lower log level or higher than the stacktrace (depending on a platform or
user).

Furthermore, it forces the logic decision from user to an architecture
side.  In result, some users as sysrq/kdb/etc are doing tricks with
temporary rising console_loglevel while printing their messages.  And in
result it not only may print unwanted messages from other CPUs, but also
omit printing at all in the unlucky case where the printk() was deferred.

Introducing log-level parameter and KERN_UNSUPPRESSED [1] seems an easier
approach than introducing more printk buffers.  Also, it will consolidate
printings with headers.

Add log level parameter to show_trace() as a preparation to introduce
show_stack_loglvl().

[1]: https://lore.kernel.org/lkml/20190528002412.1625-1-dima@arista.com/T/#uSigned-off-by: default avatarDmitry Safonov <dima@arista.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Rich Felker <dalias@libc.org>
Link: http://lkml.kernel.org/r/20200418201944.482088-33-dima@arista.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2deebe4d
...@@ -171,7 +171,7 @@ static __inline__ void enable_fpu(void) ...@@ -171,7 +171,7 @@ static __inline__ void enable_fpu(void)
#define thread_saved_pc(tsk) (tsk->thread.pc) #define thread_saved_pc(tsk) (tsk->thread.pc)
void show_trace(struct task_struct *tsk, unsigned long *sp, void show_trace(struct task_struct *tsk, unsigned long *sp,
struct pt_regs *regs); struct pt_regs *regs, const char *loglvl);
#ifdef CONFIG_DUMP_CODE #ifdef CONFIG_DUMP_CODE
void show_code(struct pt_regs *regs); void show_code(struct pt_regs *regs);
......
...@@ -127,16 +127,16 @@ static const struct stacktrace_ops print_trace_ops = { ...@@ -127,16 +127,16 @@ static const struct stacktrace_ops print_trace_ops = {
}; };
void show_trace(struct task_struct *tsk, unsigned long *sp, void show_trace(struct task_struct *tsk, unsigned long *sp,
struct pt_regs *regs) struct pt_regs *regs, const char *loglvl)
{ {
if (regs && user_mode(regs)) if (regs && user_mode(regs))
return; return;
printk("\nCall trace:\n"); printk("%s\nCall trace:\n", loglvl);
unwind_stack(tsk, regs, sp, &print_trace_ops, ""); unwind_stack(tsk, regs, sp, &print_trace_ops, (void *)loglvl);
printk("\n"); printk("%s\n", loglvl);
if (!tsk) if (!tsk)
tsk = current; tsk = current;
...@@ -158,5 +158,5 @@ void show_stack(struct task_struct *tsk, unsigned long *sp) ...@@ -158,5 +158,5 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
stack = (unsigned long)sp; stack = (unsigned long)sp;
dump_mem("Stack: ", KERN_DEFAULT, stack, THREAD_SIZE + dump_mem("Stack: ", KERN_DEFAULT, stack, THREAD_SIZE +
(unsigned long)task_stack_page(tsk)); (unsigned long)task_stack_page(tsk));
show_trace(tsk, sp, NULL); show_trace(tsk, sp, NULL, KERN_DEFAULT);
} }
...@@ -59,7 +59,7 @@ void show_regs(struct pt_regs * regs) ...@@ -59,7 +59,7 @@ void show_regs(struct pt_regs * regs)
printk("MACH: %08lx MACL: %08lx GBR : %08lx PR : %08lx\n", printk("MACH: %08lx MACL: %08lx GBR : %08lx PR : %08lx\n",
regs->mach, regs->macl, regs->gbr, regs->pr); regs->mach, regs->macl, regs->gbr, regs->pr);
show_trace(NULL, (unsigned long *)regs->regs[15], regs); show_trace(NULL, (unsigned long *)regs->regs[15], regs, KERN_DEFAULT);
show_code(regs); show_code(regs);
} }
......
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