Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca0a8164 authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

dumpstack: x86: use log_lvl and unify trace formatting 



- x86: Write log_lvl strings if available
 - start raw stack dumps on new line
 - i386: Remove extra indentation for raw stack dumps

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2ac53721

arch/x86/kernel/dumpstack_32.c

+9 −9
Original line number Diff line number Diff line
@@ -155,8 +155,8 @@ static void 
show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,

		unsigned long *stack, unsigned long bp, char *log_lvl)

{

	printk("%sCall Trace:\n", log_lvl);

	dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl);

	printk("%s =======================\n", log_lvl);

}



void show_trace(struct task_struct *task, struct pt_regs *regs,
@@ -186,15 +186,14 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
		if (i && ((i % 8) == 0))

			printk("\n%s", log_lvl);

		printk(" %08lx", *stack++);

		touch_nmi_watchdog();

	}

	printk("\n%sCall Trace:\n", log_lvl);



	printk("\n");

	show_trace_log_lvl(task, regs, sp, bp, log_lvl);

}



void show_stack(struct task_struct *task, unsigned long *sp)

{

	printk("       ");

	show_stack_log_lvl(task, NULL, sp, 0, "");

}
@@ -229,7 +228,7 @@ void show_registers(struct pt_regs *regs) 
	print_modules();

	__show_regs(regs, 0);



	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)",

	printk(KERN_EMERG "Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",

		TASK_COMM_LEN, current->comm, task_pid_nr(current),

		current_thread_info(), current, task_thread_info(current));

	/*
@@ -242,8 +241,9 @@ void show_registers(struct pt_regs *regs) 
		unsigned char c;

		u8 *ip;



		printk("\n" KERN_EMERG "Stack: ");

		show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);

		printk(KERN_EMERG "Stack:\n");

		show_stack_log_lvl(NULL, regs, &regs->sp,

				0, KERN_EMERG);



		printk(KERN_EMERG "Code: ");

arch/x86/kernel/dumpstack_64.c

+4 −4
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static void 
show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,

		unsigned long *stack, unsigned long bp, char *log_lvl)

{

	printk("Call Trace:\n");

	printk("%sCall Trace:\n", log_lvl);

	dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl);

}
@@ -330,7 +330,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs, 
			break;

		}

		if (i && ((i % 4) == 0))

			printk("\n");

			printk("\n%s", log_lvl);

		printk(" %016lx", *stack++);

		touch_nmi_watchdog();

	}
@@ -388,9 +388,9 @@ void show_registers(struct pt_regs *regs) 
		unsigned char c;

		u8 *ip;



		printk("Stack: ");

		printk(KERN_EMERG "Stack:\n");

		show_stack_log_lvl(NULL, regs, (unsigned long *)sp,

				regs->bp, "");

				regs->bp, KERN_EMERG);



		printk(KERN_EMERG "Code: ");