From: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: "Alastair D'Silva" <alastair@d-silva.org>,
Andrew Donnellan <andrew.donnellan@au1.ibm.com>,
Balbir Singh <bsingharora@gmail.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Cyril Bur <cyrilbur@gmail.com>,
"Eric W . Biederman" <ebiederm@xmission.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Michael Neuling <mikey@neuling.org>,
Murilo Opsfelder Araujo <muriloo@linux.ibm.com>,
Nicholas Piggin <npiggin@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Simon Guo <wei.guo.simon@gmail.com>,
Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>,
"Tobin C . Harding" <me@tobin.cc>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH v2 10/10] powerpc/traps: Add line prefix in show_instructions()
Date: Fri, 27 Jul 2018 11:58:11 -0300 [thread overview]
Message-ID: <20180727145811.12334-11-muriloo@linux.ibm.com> (raw)
In-Reply-To: <20180727145811.12334-1-muriloo@linux.ibm.com>
Remove "Instruction dump:" line by adding a prefix to display current->comm
and current->pid, along with the instructions dump.
The prefix can serve as a glue that links the instructions dump to its
originator, allowing messages to be interleaved in the logs.
Before this patch, a page fault looked like:
pandafault[10524]: segfault (11) at 00000000100007d0 nip 000000001000061c lr 00007fffbd295100 code 2 in pandafault[10000000+10000]
Instruction dump:
4bfffeec 4bfffee8 3c401002 38427f00 fbe1fff8 f821ffc1 7c3f0b78 3d22fffe
392988d0 f93f0020 e93f0020 39400048 <99490000> 39200000 7d234b78 383f0040
After this patch, it looks like:
pandafault[10850]: segfault (11) at 00000000100007d0 nip 000000001000061c lr 00007fff9f3e5100 code 2 in pandafault[10000000+10000]
pandafault[10850]: code: 4bfffeec 4bfffee8 3c401002 38427f00 fbe1fff8 f821ffc1 7c3f0b78 3d22fffe
pandafault[10850]: code: 392988d0 f93f0020 e93f0020 39400048 <99490000> 39200000 7d234b78 383f0040
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
---
arch/powerpc/kernel/process.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 709bfb524b84..25b6dfc8dd81 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1265,16 +1265,19 @@ static int instructions_to_print = 16;
void show_instructions(struct pt_regs *regs)
{
int i;
+ const char *prefix = KERN_INFO "%s[%d]: code: ";
unsigned long pc = regs->nip - (instructions_to_print * 3 / 4 *
sizeof(int));
- printk("Instruction dump:");
+ printk(prefix, current->comm, current->pid);
for (i = 0; i < instructions_to_print; i++) {
int instr;
- if (!(i % 8))
+ if (!(i % 8) && (i > 0)) {
pr_cont("\n");
+ printk(prefix, current->comm, current->pid);
+ }
#if !defined(CONFIG_BOOKE)
/* If executing with the IMMU off, adjust pc rather
--
2.17.1
prev parent reply other threads:[~2018-07-27 14:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-27 14:58 [PATCH v2 00/10] powerpc: Modernize unhandled signals message Murilo Opsfelder Araujo
2018-07-27 14:58 ` [PATCH v2 01/10] powerpc/traps: Print unhandled signals in a separate function Murilo Opsfelder Araujo
2018-07-27 14:58 ` [PATCH v2 02/10] powerpc/traps: Return early in show_signal_msg() Murilo Opsfelder Araujo
2018-07-27 14:58 ` [PATCH v2 03/10] powerpc/reg: Add REG_FMT definition Murilo Opsfelder Araujo
2018-07-27 14:58 ` [PATCH v2 04/10] powerpc/traps: Use REG_FMT in show_signal_msg() Murilo Opsfelder Araujo
2018-07-27 16:40 ` LEROY Christophe
2018-07-27 17:18 ` Joe Perches
2018-07-30 15:28 ` Murilo Opsfelder Araujo
2018-07-30 16:30 ` LEROY Christophe
2018-07-30 23:17 ` Murilo Opsfelder Araujo
2018-07-31 9:32 ` Michael Ellerman
2018-07-31 9:52 ` Alastair D'Silva
2018-07-27 14:58 ` [PATCH v2 05/10] powerpc/traps: Print VMA for unhandled signals Murilo Opsfelder Araujo
2018-07-27 14:58 ` [PATCH v2 06/10] powerpc/traps: Print signal name " Murilo Opsfelder Araujo
2018-07-27 14:58 ` [PATCH v2 07/10] powerpc: Do not call __kernel_text_address() in show_instructions() Murilo Opsfelder Araujo
2018-07-27 14:58 ` [PATCH v2 08/10] powerpc: Add stacktrace.h header Murilo Opsfelder Araujo
2018-07-27 14:58 ` [PATCH v2 09/10] powerpc/traps: Show instructions on exceptions Murilo Opsfelder Araujo
2018-07-27 14:58 ` Murilo Opsfelder Araujo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180727145811.12334-11-muriloo@linux.ibm.com \
--to=muriloo@linux.ibm.com \
--cc=alastair@d-silva.org \
--cc=andrew.donnellan@au1.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bsingharora@gmail.com \
--cc=christophe.leroy@c-s.fr \
--cc=cyrilbur@gmail.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=me@tobin.cc \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=paulus@samba.org \
--cc=sukadev@linux.vnet.ibm.com \
--cc=wei.guo.simon@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).