xtensa: 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 argument to show_trace() as a preparation for introducing
show_stack_loglvl().

[1]: https://lore.kernel.org/lkml/20190528002412.1625-1-dima@arista.com/T/#u

[rppt@kernel.org: build fix]
Link: http://lkml.kernel.org/r/20200511194534.GA1018386@kernel.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mike Rapoport <rppt@kernel.org>
Link: http://lkml.kernel.org/r/20200418201944.482088-43-dima@arista.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 0976e27b8d5dada29cc15b48a22c12d10e1a7167..5013b62a9943f521a63ed31915a604f47b39e1da 100644 (file)
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -479,18 +479,22 @@ void show_regs(struct pt_regs * regs)
 
 static int show_trace_cb(struct stackframe *frame, void *data)
 {
+       const char *loglvl = data;
+
        if (kernel_text_address(frame->pc))
-               pr_cont(" [<%08lx>] %pB\n", frame->pc, (void *)frame->pc);
+               printk("%s [<%08lx>] %pB\n",
+                       loglvl, frame->pc, (void *)frame->pc);
        return 0;
 }
 
-void show_trace(struct task_struct *task, unsigned long *sp)
+static void show_trace(struct task_struct *task, unsigned long *sp,
+                      const char *loglvl)
 {
        if (!sp)
                sp = stack_pointer(task);
 
-       pr_info("Call Trace:\n");
-       walk_stackframe(sp, show_trace_cb, NULL);
+       printk("%sCall Trace:\n", loglvl);
+       walk_stackframe(sp, show_trace_cb, (void *)loglvl);
 }
 
 #define STACK_DUMP_ENTRY_SIZE 4
@@ -511,7 +515,7 @@ void show_stack(struct task_struct *task, unsigned long *sp)
        print_hex_dump(KERN_INFO, " ", DUMP_PREFIX_NONE,
                       STACK_DUMP_LINE_SIZE, STACK_DUMP_ENTRY_SIZE,
                       sp, len, false);
-       show_trace(task, sp);
+       show_trace(task, sp, KERN_INFO);
 }
 
 DEFINE_SPINLOCK(die_lock);