Commit dd315df1 authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] x86: Compress stack unwinder output 

The unwinder has some extra newlines, which eat up loads of screen
space when it spews. (See https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=137900


for a nasty example).

warning_symbol-> and warning-> already printk a newline, so don't add one
in the strings passed to them.

[AK: redone for new code]

Signed-off-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent b615ebda

arch/i386/kernel/traps.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -202,22 +202,22 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs, 
		if (unw_ret > 0) {

		if (unw_ret > 0) {

			if (call_trace == 1 && !arch_unw_user_mode(&info)) {

			if (call_trace == 1 && !arch_unw_user_mode(&info)) {

				ops->warning_symbol(data,

				ops->warning_symbol(data,

					     "DWARF2 unwinder stuck at %s\n",

					     "DWARF2 unwinder stuck at %s",

					     UNW_PC(&info));

					     UNW_PC(&info));

				if (UNW_SP(&info) >= PAGE_OFFSET) {

				if (UNW_SP(&info) >= PAGE_OFFSET) {

					MSG("Leftover inexact backtrace:\n");

					MSG("Leftover inexact backtrace:");

					stack = (void *)UNW_SP(&info);

					stack = (void *)UNW_SP(&info);

					if (!stack)

					if (!stack)

						return;

						return;

					ebp = UNW_FP(&info);

					ebp = UNW_FP(&info);

				} else

				} else

					MSG("Full inexact backtrace again:\n");

					MSG("Full inexact backtrace again:");

			} else if (call_trace >= 1)

			} else if (call_trace >= 1)

				return;

				return;

			else

			else

				MSG("Full inexact backtrace again:\n");

				MSG("Full inexact backtrace again:");

		} else

		} else

			MSG("Inexact backtrace:\n");

			MSG("Inexact backtrace:");

	}

	}

	if (!stack) {

	if (!stack) {

		unsigned long dummy;

		unsigned long dummy;

arch/x86_64/kernel/traps.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -280,7 +280,7 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, 
		if (unw_ret > 0) {

		if (unw_ret > 0) {

			if (call_trace == 1 && !arch_unw_user_mode(&info)) {

			if (call_trace == 1 && !arch_unw_user_mode(&info)) {

				ops->warning_symbol(data,

				ops->warning_symbol(data,

					     "DWARF2 unwinder stuck at %s\n",

					     "DWARF2 unwinder stuck at %s",

					     UNW_PC(&info));

					     UNW_PC(&info));

				if ((long)UNW_SP(&info) < 0) {

				if ((long)UNW_SP(&info) < 0) {

					MSG("Leftover inexact backtrace:");

					MSG("Leftover inexact backtrace:");
@@ -288,13 +288,13 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, 
					if (!stack)

					if (!stack)

						return;

						return;

				} else

				} else

					MSG("Full inexact backtrace again:\n");

					MSG("Full inexact backtrace again:");

			} else if (call_trace >= 1)

			} else if (call_trace >= 1)

				return;

				return;

			else

			else

				MSG("Full inexact backtrace again:\n");

				MSG("Full inexact backtrace again:");

		} else

		} else

			MSG("Inexact backtrace:\n");

			MSG("Inexact backtrace:");

	}

	}

	if (!stack) {

	if (!stack) {

		unsigned long dummy;

		unsigned long dummy;

CRA Git | Maintained and supported by SUSTech CRA and CCSE