mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

kernel: rename show_stack_loglvl() => show_stack() 

Now the last users of show_stack() got converted to use an explicit log
level, show_stack_loglvl() can drop it's redundant suffix and become once
again well known show_stack().

Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200418201944.482088-51-dima@arista.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Dmitry Safonov 2020-06-08 21:32:29 -07:00 committed by Linus Torvalds
parent fe1993a001
commit 9cb8f069de
39 changed files with 52 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/alpha/kernel/traps.c
View File

@ -144,8 +144,7 @@ dik_show_trace(unsigned long *sp, const char *loglvl)
static int kstack_depth_to_print = 24;
void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
{
unsigned long *stack;
int i;
@ -174,11 +173,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
dik_show_trace(sp, loglvl);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_DEFAULT);
}
void
die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
{

8
arch/arc/kernel/stacktrace.c
View File

@ -228,17 +228,11 @@ noinline void show_stacktrace(struct task_struct *tsk, struct pt_regs *regs,
EXPORT_SYMBOL(show_stacktrace);
/* Expected by sched Code */
void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)
{
show_stacktrace(tsk, NULL, loglvl);
}
void show_stack(struct task_struct *tsk, unsigned long *sp)
{
show_stack_loglvl(tsk, sp, KERN_DEFAULT);
}
/* Another API expected by schedular, shows up in "ps" as Wait Channel
* Of course just returning schedule( ) would be pointless so unwind until
* the function is not in schedular code

8
arch/arm/kernel/traps.c
View File

@ -247,18 +247,12 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk,
}
#endif
void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)
{
dump_backtrace(NULL, tsk, loglvl);
barrier();
}
void show_stack(struct task_struct *tsk, unsigned long *sp)
{
show_stack_loglvl(tsk, sp, KERN_DEFAULT);
}
#ifdef CONFIG_PREEMPT
#define S_PREEMPT " PREEMPT"
#elif defined(CONFIG_PREEMPT_RT)

8
arch/arm64/kernel/traps.c
View File

@ -137,18 +137,12 @@ void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk,
put_task_stack(tsk);
}
void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)
{
dump_backtrace(NULL, tsk, loglvl);
barrier();
}
void show_stack(struct task_struct *tsk, unsigned long *sp)
{
show_stack_loglvl(tsk, sp, KERN_DEFAULT);
}
#ifdef CONFIG_PREEMPT
#define S_PREEMPT " PREEMPT"
#elif defined(CONFIG_PREEMPT_RT)

7
arch/c6x/kernel/traps.c
View File

@ -374,7 +374,7 @@ static void show_trace(unsigned long *stack, unsigned long *endstack,
printk("%s\n", loglvl);
}
void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
void show_stack(struct task_struct *task, unsigned long *stack,
const char *loglvl)
{
unsigned long *p, *endstack;
@ -403,11 +403,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
show_trace(stack, endstack, loglvl);
}
void show_stack(struct task_struct *task, unsigned long *stack)
{
show_stack_loglvl(task, stack, KERN_DEBUG);
}
int is_valid_bugaddr(unsigned long addr)
{
return __kernel_text_address(addr);

4
arch/csky/kernel/ptrace.c
View File

@ -344,7 +344,7 @@ asmlinkage void syscall_trace_exit(struct pt_regs *regs)
trace_sys_exit(regs, syscall_get_return_value(current, regs));
}
extern void show_stack(struct task_struct *task, unsigned long *stack);
extern void show_stack(struct task_struct *task, unsigned long *stack, const char *loglvl);
void show_regs(struct pt_regs *fp)
{
unsigned long *sp;
@ -420,6 +420,6 @@ void show_regs(struct pt_regs *fp)
}
pr_cont("\n");
show_stack(NULL, (unsigned long *)fp->regs[4]);
show_stack(NULL, (unsigned long *)fp->regs[4], KERN_INFO);
return;
}

9
arch/csky/kernel/stacktrace.c
View File

@ -95,19 +95,12 @@ static bool print_trace_address(unsigned long pc, void *arg)
return false;
}
void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
{
pr_cont("Call Trace:\n");
walk_stackframe(task, NULL, print_trace_address, (void *)loglvl);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
pr_cont("Call Trace:\n");
walk_stackframe(task, NULL, print_trace_address, KERN_INFO);
}
static bool save_wchan(unsigned long pc, void *arg)
{
if (!in_sched_functions(pc)) {

8
arch/h8300/kernel/traps.c
View File

@ -115,8 +115,7 @@ void die(const char *str, struct pt_regs *fp, unsigned long err)
static int kstack_depth_to_print = 24;
void show_stack_loglvl(struct task_struct *task, unsigned long *esp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *esp, const char *loglvl)
{
unsigned long *stack, addr;
int i;
@ -158,8 +157,3 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *esp,
}
printk("%s\n", loglvl);
}
void show_stack(struct task_struct *task, unsigned long *esp)
{
show_stack_loglvl(task, esp, KERN_INFO);
}

8
arch/hexagon/kernel/traps.c
View File

@ -175,18 +175,12 @@ static void do_show_stack(struct task_struct *task, unsigned long *fp,
}
}
void show_stack_loglvl(struct task_struct *task, unsigned long *fp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *fp, const char *loglvl)
{
/* Saved link reg is one word above FP */
do_show_stack(task, fp, 0, loglvl);
}
void show_stack(struct task_struct *task, unsigned long *fp)
{
show_stack_loglvl(task, fp, 0, KERN_INFO);
}
int die(const char *str, struct pt_regs *regs, long err)
{
static struct {

2
arch/ia64/kernel/mca.c
View File

@ -1631,7 +1631,7 @@ default_monarch_init_process(struct notifier_block *self, unsigned long val, voi
if (read_trylock(&tasklist_lock)) {
do_each_thread (g, t) {
printk("\nBacktrace of pid %d (%s)\n", t->pid, t->comm);
show_stack(t, NULL);
show_stack(t, NULL, KERN_DEFAULT);
} while_each_thread (g, t);
read_unlock(&tasklist_lock);
}

11
arch/ia64/kernel/process.c
View File

@ -85,8 +85,7 @@ ia64_do_show_stack (struct unw_frame_info *info, void *arg)
}
void
show_stack_loglvl (struct task_struct *task, unsigned long *sp,
const char *loglvl)
show_stack (struct task_struct *task, unsigned long *sp, const char *loglvl)
{
if (!task)
unw_init_running(ia64_do_show_stack, (void *)loglvl);
@ -98,12 +97,6 @@ show_stack_loglvl (struct task_struct *task, unsigned long *sp,
}
}
void
show_stack (struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_DEFAULT);
}
void
show_regs (struct pt_regs *regs)
{
@ -158,7 +151,7 @@ show_regs (struct pt_regs *regs)
((i == sof - 1) || (i % 3) == 2) ? "\n" : " ");
}
} else
show_stack(NULL, NULL);
show_stack(NULL, NULL, KERN_DEFAULT);
}
/* local support for deprecated console_print */

11
arch/m68k/kernel/traps.c
View File

@ -916,7 +916,7 @@ void show_registers(struct pt_regs *regs)
default:
pr_cont("\n");
}
show_stack(NULL, (unsigned long *)addr);
show_stack(NULL, (unsigned long *)addr, KERN_INFO);
pr_info("Code:");
set_fs(KERNEL_DS);
@ -935,8 +935,8 @@ void show_registers(struct pt_regs *regs)
pr_cont("\n");
}
void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *stack,
const char *loglvl)
{
unsigned long *p;
unsigned long *endstack;
@ -963,11 +963,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
show_trace(stack, loglvl);
}
void show_stack(struct task_struct *task, unsigned long *stack)
{
show_stack_loglvl(task, stack, KERN_INFO);
}
/*
* The vector number returned in the frame pointer may also contain
* the "fs" (Fault Status) bits on ColdFire. These are in the bottom

8
arch/microblaze/kernel/traps.c
View File

@ -31,8 +31,7 @@ static int __init kstack_setup(char *s)
}
__setup("kstack=", kstack_setup);
void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
{
unsigned long words_to_show;
u32 fp = (u32) sp;
@ -77,8 +76,3 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
debug_show_held_locks(task);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_INFO);
}

8
arch/mips/kernel/traps.c
View File

@ -198,8 +198,7 @@ static void show_stacktrace(struct task_struct *task,
show_backtrace(task, regs, loglvl);
}
void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
{
struct pt_regs regs;
mm_segment_t old_fs = get_fs();
@ -227,11 +226,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
set_fs(old_fs);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_DEFAULT)
}
static void show_code(unsigned int __user *pc)
{
long i;

8
arch/nds32/kernel/traps.c
View File

@ -135,8 +135,7 @@ static void __dump(struct task_struct *tsk, unsigned long *base_reg,
printk("%s\n", loglvl);
}
void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)
{
unsigned long *base_reg;
@ -157,11 +156,6 @@ void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,
barrier();
}
void show_stack(struct task_struct *tsk, unsigned long *sp)
{
show_stack_loglvl(tsk, sp, KERN_EMERG);
}
DEFINE_SPINLOCK(die_lock);
/*

12
arch/nios2/kernel/traps.c
View File

@ -52,14 +52,13 @@ void _exception(int signo, struct pt_regs *regs, int code, unsigned long addr)
}
/*
* The show_stack(), show_stack_loglvl() are external API
* which we do not use ourselves.
* The show_stack() is external API which we do not use ourselves.
*/
int kstack_depth_to_print = 48;
void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *stack,
const char *loglvl)
{
unsigned long *endstack, addr;
int i;
@ -106,11 +105,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
printk("%s\n", loglvl);
}
void show_stack(struct task_struct *task, unsigned long *stack)
{
show_stack_loglvl(task, stack, KERN_EMERG);
}
void __init trap_init(void)
{
/* Nothing to do here */

10
arch/openrisc/kernel/traps.c
View File

@ -48,8 +48,7 @@ void print_trace(void *data, unsigned long addr, int reliable)
}
/* displays a short stack trace */
void show_stack_loglvl(struct task_struct *task, unsigned long *esp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *esp, const char *loglvl)
{
if (esp == NULL)
esp = (unsigned long *)&esp;
@ -58,11 +57,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *esp,
unwind_stack((void *)loglvl, esp, print_trace);
}
void show_stack(struct task_struct *task, unsigned long *esp)
{
show_stack_loglvl(task, esp, KERN_EMERG);
}
void show_registers(struct pt_regs *regs)
{
int i;
@ -104,7 +98,7 @@ void show_registers(struct pt_regs *regs)
if (in_kernel) {
printk("\nStack: ");
show_stack(NULL, (unsigned long *)esp);
show_stack(NULL, (unsigned long *)esp, KERN_EMERG);
printk("\nCode: ");
if (regs->pc < PAGE_OFFSET)

8
arch/parisc/kernel/traps.c
View File

@ -198,17 +198,11 @@ static void parisc_show_stack(struct task_struct *task,
do_show_stack(&info, loglvl);
}
void show_stack_loglvl(struct task_struct *t, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *t, unsigned long *sp, const char *loglvl)
{
parisc_show_stack(t, NULL, loglvl);
}
void show_stack(struct task_struct *t, unsigned long *sp)
{
show_stack_loglvl(t, sp, KERN_CRIT)
}
int is_valid_bugaddr(unsigned long iaoq)
{
return 1;

11
arch/powerpc/kernel/process.c
View File

@ -1456,7 +1456,7 @@ void show_regs(struct pt_regs * regs)
printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
#endif
show_stack(current, (unsigned long *) regs->gpr[1]);
show_stack(current, (unsigned long *) regs->gpr[1], KERN_DEFAULT);
if (!user_mode(regs))
show_instructions(regs);
}
@ -2063,8 +2063,8 @@ unsigned long get_wchan(struct task_struct *p)
static int kstack_depth_to_print = CONFIG_PRINT_STACK_DEPTH;
void show_stack_loglvl(struct task_struct *tsk, unsigned long *stack,
const char *loglvl)
void show_stack(struct task_struct *tsk, unsigned long *stack,
const char *loglvl)
{
unsigned long sp, ip, lr, newsp;
int count = 0;
@ -2133,11 +2133,6 @@ void show_stack_loglvl(struct task_struct *tsk, unsigned long *stack,
put_task_stack(tsk);
}
void show_stack(struct task_struct *tsk, unsigned long *stack)
{
show_stack_loglvl(tsk, stack, KERN_DEFAULT);
}
#ifdef CONFIG_PPC64
/* Called with hard IRQs off */
void notrace __ppc64_runlatch_on(void)

2
arch/powerpc/kernel/stacktrace.c
View File

@ -260,7 +260,7 @@ static void raise_backtrace_ipi(cpumask_t *mask)
pr_cont(" current pointer corrupt? (%px)\n", p->__current);
pr_warn("Back trace of paca->saved_r1 (0x%016llx) (possibly stale):\n", p->saved_r1);
show_stack(p->__current, (unsigned long *)p->saved_r1);
show_stack(p->__current, (unsigned long *)p->saved_r1, KERN_WARNING);
}
}

8
arch/riscv/kernel/stacktrace.c
View File

@ -105,18 +105,12 @@ static bool print_trace_address(unsigned long pc, void *arg)
return false;
}
void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
{
pr_cont("Call Trace:\n");
walk_stackframe(task, NULL, print_trace_address, (void *)loglvl);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_DEFAULT);
}
static bool save_wchan(unsigned long pc, void *arg)
{
if (!in_sched_functions(pc)) {

9
arch/s390/kernel/dumpstack.c
View File

@ -126,7 +126,7 @@ unknown:
return -EINVAL;
}
void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
void show_stack(struct task_struct *task, unsigned long *stack,
const char *loglvl)
{
struct unwind_state state;
@ -139,11 +139,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
debug_show_held_locks(task ? : current);
}
void show_stack(struct task_struct *task, unsigned long *stack)
{
show_stack_loglvl(task, stack, KERN_DEFAULT);
}
static void show_last_breaking_event(struct pt_regs *regs)
{
printk("Last Breaking-Event-Address:\n");
@ -181,7 +176,7 @@ void show_regs(struct pt_regs *regs)
show_registers(regs);
/* Show stack backtrace if pt_regs is from kernel mode */
if (!user_mode(regs))
show_stack(NULL, (unsigned long *) regs->gprs[15]);
show_stack(NULL, (unsigned long *) regs->gprs[15], KERN_DEFAULT);
show_last_breaking_event(regs);
}

8
arch/sh/kernel/dumpstack.c
View File

@ -144,8 +144,7 @@ void show_trace(struct task_struct *tsk, unsigned long *sp,
debug_show_held_locks(tsk);
}
void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *tsk, unsigned long *sp, const char *loglvl)
{
unsigned long stack;
@ -161,8 +160,3 @@ void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,
(unsigned long)task_stack_page(tsk));
show_trace(tsk, sp, NULL, loglvl);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_DEFAULT);
}

11
arch/sparc/kernel/process_32.c
View File

@ -145,12 +145,10 @@ void show_regs(struct pt_regs *r)
}
/*
* The show_stack(), show_stack_loglvl() are external APIs which
* we do not use ourselves.
* The show_stack() is external API which we do not use ourselves.
* The oops is printed in die_if_kernel.
*/
void show_stack_loglvl(struct task_struct *tsk, unsigned long *_ksp,
const char *loglvl)
void show_stack(struct task_struct *tsk, unsigned long *_ksp, const char *loglvl)
{
unsigned long pc, fp;
unsigned long task_base;
@ -179,11 +177,6 @@ void show_stack_loglvl(struct task_struct *tsk, unsigned long *_ksp,
printk("%s\n", loglvl);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_DEFAULT);
}
/*
* Free current thread data structures etc..
*/

2
arch/sparc/kernel/process_64.c
View File

@ -195,7 +195,7 @@ void show_regs(struct pt_regs *regs)
regs->u_regs[15]);
printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
show_regwindow(regs);
show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
show_stack(current, (unsigned long *)regs->u_regs[UREG_FP], KERN_DEFAULT);
}
union global_cpu_snapshot global_cpu_snapshot[NR_CPUS];

8
arch/sparc/kernel/traps_64.c
View File

@ -2453,8 +2453,7 @@ static void user_instruction_dump(unsigned int __user *pc)
printk("\n");
}
void show_stack_loglvl(struct task_struct *tsk, unsigned long *_ksp,
const char *loglvl)
void show_stack(struct task_struct *tsk, unsigned long *_ksp, const char *loglvl)
{
unsigned long fp, ksp;
struct thread_info *tp;
@ -2514,11 +2513,6 @@ void show_stack_loglvl(struct task_struct *tsk, unsigned long *_ksp,
} while (++count < 16);
}
void show_stack(struct task_struct *tsk, unsigned long *_ksp)
{
show_stack_loglvl(task, sp, KERN_DEFAULT);
}
static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
{
unsigned long fp = rw->ins[6];

2
arch/um/drivers/mconsole_kern.c
View File

@ -648,7 +648,7 @@ static void stack_proc(void *arg)
{
struct task_struct *task = arg;
show_stack(task, NULL);
show_stack(task, NULL, KERN_INFO);
}
/*

7
arch/um/kernel/sysrq.c
View File

@ -27,7 +27,7 @@ static const struct stacktrace_ops stackops = {
.address = _print_addr
};
void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
void show_stack(struct task_struct *task, unsigned long *stack,
const char *loglvl)
{
struct pt_regs *segv_regs = current->thread.segv_regs;
@ -56,8 +56,3 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *stack,
dump_trace(current, &stackops, (void *)loglvl);
printk("%s\n", loglvl);
}
void show_stack(struct task_struct *task, unsigned long *stack)
{
show_stack_loglvl(task, stack, KERN_INFO);
}

7
arch/unicore32/kernel/traps.c
View File

@ -167,18 +167,13 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk,
c_backtrace(fp, loglvl);
}
void show_stack_loglvl(struct task_struct *tsk, unsigned long *sp,
void show_stack(struct task_struct *tsk, unsigned long *sp,
const char *loglvl)
{
dump_backtrace(NULL, tsk, loglvl);
barrier();
}
void show_stack(struct task_struct *tsk, unsigned long *sp)
{
show_stack_loglvl(tsk, sp, KERN_DEFAULT)
}
static int __die(const char *str, int err, struct thread_info *thread,
struct pt_regs *regs)
{

2
arch/x86/kernel/amd_gart_64.c
View File

@ -159,7 +159,7 @@ static void dump_leak(void)
return;
dump = 1;
show_stack_loglvl(NULL, NULL, KERN_ERR);
show_stack(NULL, NULL, KERN_ERR);
debug_dma_dump_mappings(NULL);
}
#endif

7
arch/x86/kernel/dumpstack.c
View File

@ -279,7 +279,7 @@ next:
}
}
void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
void show_stack(struct task_struct *task, unsigned long *sp,
const char *loglvl)
{
task = task ? : current;
@ -294,11 +294,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
show_trace_log_lvl(task, NULL, sp, loglvl);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_DEFAULT);
}
void show_stack_regs(struct pt_regs *regs)
{
show_trace_log_lvl(current, regs, NULL, KERN_DEFAULT);

10
arch/xtensa/kernel/traps.c
View File

@ -501,8 +501,7 @@ static void show_trace(struct task_struct *task, unsigned long *sp,
#define STACK_DUMP_LINE_SIZE 32
static size_t kstack_depth_to_print = CONFIG_PRINT_STACK_DEPTH;
void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
const char *loglvl)
void show_stack(struct task_struct *task, unsigned long *sp, const char *loglvl)
{
size_t len;
@ -519,11 +518,6 @@ void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
show_trace(task, sp, loglvl);
}
void show_stack(struct task_struct *task, unsigned long *sp)
{
show_stack_loglvl(task, sp, KERN_INFO);
}
DEFINE_SPINLOCK(die_lock);
void die(const char * str, struct pt_regs * regs, long err)
@ -540,7 +534,7 @@ void die(const char * str, struct pt_regs * regs, long err)
pr_info("%s: sig: %ld [#%d]%s\n", str, err, ++die_counter, pr);
show_regs(regs);
if (!user_mode(regs))
show_stack(NULL, (unsigned long*)regs->areg[1]);
show_stack(NULL, (unsigned long *)regs->areg[1], KERN_INFO);
add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
spin_unlock_irq(&die_lock);

2
drivers/base/power/main.c
View File

@ -519,7 +519,7 @@ static void dpm_watchdog_handler(struct timer_list *t)
struct dpm_watchdog *wd = from_timer(wd, t, timer);
dev_emerg(wd->dev, "**** DPM device timeout ****\n");
show_stack_loglvl(wd->tsk, NULL, KERN_EMERG);
show_stack(wd->tsk, NULL, KERN_EMERG);
panic("%s %s: unrecoverable failure\n",
dev_driver_string(wd->dev), dev_name(wd->dev));
}

2
drivers/tty/sysrq.c
View File

@ -235,7 +235,7 @@ static void showacpu(void *dummy)
raw_spin_lock_irqsave(&show_lock, flags);
pr_info("CPU%d:\n", smp_processor_id());
show_stack_loglvl(NULL, NULL, KERN_INFO);
show_stack(NULL, NULL, KERN_INFO);
raw_spin_unlock_irqrestore(&show_lock, flags);
}

5
include/linux/sched/debug.h
View File

@ -30,9 +30,8 @@ extern void show_regs(struct pt_regs *);
* task), SP is the stack pointer of the first frame that should be shown in the back
* trace (or NULL if the entire call-chain of the task should be shown).
*/
extern void show_stack(struct task_struct *task, unsigned long *sp);
extern void show_stack_loglvl(struct task_struct *task, unsigned long *sp,
const char *loglvl);
extern void show_stack(struct task_struct *task, unsigned long *sp,
const char *loglvl);
extern void sched_show_task(struct task_struct *p);

2
kernel/debug/kdb/kdb_bt.c
View File

@ -30,7 +30,7 @@ static void kdb_show_stack(struct task_struct *p, void *addr)
kdb_dump_stack_on_cpu(kdb_process_cpu(p));
console_loglevel = old_lvl;
} else {
show_stack_loglvl(p, addr, KERN_EMERG);
show_stack(p, addr, KERN_EMERG);
}
kdb_trap_printk--;

2
kernel/locking/rtmutex-debug.c
View File

@ -125,7 +125,7 @@ void debug_rt_mutex_print_deadlock(struct rt_mutex_waiter *waiter)
printk("\n%s/%d's [blocked] stackdump:\n\n",
task->comm, task_pid_nr(task));
show_stack_loglvl(task, NULL, KERN_DEFAULT);
show_stack(task, NULL, KERN_DEFAULT);
printk("\n%s/%d's [current] stackdump:\n\n",
current->comm, task_pid_nr(current));
dump_stack();

2
kernel/sched/core.c
View File

@ -6025,7 +6025,7 @@ void sched_show_task(struct task_struct *p)
(unsigned long)task_thread_info(p)->flags);
print_worker_info(KERN_INFO, p);
show_stack_loglvl(p, NULL, KERN_INFO);
show_stack(p, NULL, KERN_INFO);
put_task_stack(p);
}
EXPORT_SYMBOL_GPL(sched_show_task);

2
lib/dump_stack.c
View File

@ -74,7 +74,7 @@ void show_regs_print_info(const char *log_lvl)
static void __dump_stack(void)
{
dump_stack_print_info(KERN_DEFAULT);
show_stack_loglvl(NULL, NULL, KERN_DEFAULT);
show_stack(NULL, NULL, KERN_DEFAULT);
}
/**