Skip to content

Commit

Permalink
ia64: pass log level as arg into ia64_do_show_stack()
Browse files Browse the repository at this point in the history
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 ia64_do_show_stack() as a preparation to
introduce show_stack_loglvl().  Also, make ia64_do_show_stack() static as
it's not used outside.

[1]: https://lore.kernel.org/lkml/[email protected]/T/#u

Signed-off-by: Dmitry Safonov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Cc: Fenghua Yu <[email protected]>
Cc: Tony Luck <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
0x7f454c46 authored and torvalds committed Jun 9, 2020
1 parent d1e9086 commit c261ad6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
1 change: 0 additions & 1 deletion arch/ia64/include/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ static inline long regs_return_value(struct pt_regs *regs)
struct task_struct; /* forward decl */
struct unw_frame_info; /* forward decl */

extern void ia64_do_show_stack (struct unw_frame_info *, void *);
extern unsigned long ia64_get_user_rbs_end (struct task_struct *, struct pt_regs *,
unsigned long *);
extern long ia64_peek (struct task_struct *, struct switch_stack *, unsigned long,
Expand Down
13 changes: 7 additions & 6 deletions arch/ia64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,35 +64,36 @@ EXPORT_SYMBOL(boot_option_idle_override);
void (*pm_power_off) (void);
EXPORT_SYMBOL(pm_power_off);

void
static void
ia64_do_show_stack (struct unw_frame_info *info, void *arg)
{
unsigned long ip, sp, bsp;
const char *loglvl = arg;

printk("\nCall Trace:\n");
printk("%s\nCall Trace:\n", loglvl);
do {
unw_get_ip(info, &ip);
if (ip == 0)
break;

unw_get_sp(info, &sp);
unw_get_bsp(info, &bsp);
printk(" [<%016lx>] %pS\n"
printk("%s [<%016lx>] %pS\n"
" sp=%016lx bsp=%016lx\n",
ip, (void *)ip, sp, bsp);
loglvl, ip, (void *)ip, sp, bsp);
} while (unw_unwind(info) >= 0);
}

void
show_stack (struct task_struct *task, unsigned long *sp)
{
if (!task)
unw_init_running(ia64_do_show_stack, NULL);
unw_init_running(ia64_do_show_stack, (void *)KERN_DEFAULT);
else {
struct unw_frame_info info;

unw_init_from_blocked_task(&info, task);
ia64_do_show_stack(&info, NULL);
ia64_do_show_stack(&info, (void *)KERN_DEFAULT);
}
}

Expand Down

0 comments on commit c261ad6

Please sign in to comment.