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>,
Joe Perches <joe@perches.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,
Segher Boessenkool <segher@kernel.crashing.org>
Subject: [PATCH v4 5/6] powerpc: Add show_user_instructions()
Date: Wed, 1 Aug 2018 18:33:19 -0300 [thread overview]
Message-ID: <20180801213320.11203-6-muriloo@linux.ibm.com> (raw)
In-Reply-To: <20180801213320.11203-1-muriloo@linux.ibm.com>
show_user_instructions() is a slightly modified version of
show_instructions() that allows userspace instruction dump.
This will be useful within show_signal_msg() to dump userspace
instructions of the faulty location.
Here is a sample of what show_user_instructions() outputs:
pandafault[10850]: code: 4bfffeec 4bfffee8 3c401002 38427f00 fbe1fff8 f821ffc1 7c3f0b78 3d22fffe
pandafault[10850]: code: 392988d0 f93f0020 e93f0020 39400048 <99490000> 39200000 7d234b78 383f0040
The current->comm and current->pid printed can serve as a glue that
links the instructions dump to its originator, allowing messages to be
interleaved in the logs.
Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.ibm.com>
---
arch/powerpc/include/asm/stacktrace.h | 13 +++++++++
arch/powerpc/kernel/process.c | 40 +++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 arch/powerpc/include/asm/stacktrace.h
diff --git a/arch/powerpc/include/asm/stacktrace.h b/arch/powerpc/include/asm/stacktrace.h
new file mode 100644
index 000000000000..6149b53b3bc8
--- /dev/null
+++ b/arch/powerpc/include/asm/stacktrace.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Stack trace functions.
+ *
+ * Copyright 2018, Murilo Opsfelder Araujo, IBM Corporation.
+ */
+
+#ifndef _ASM_POWERPC_STACKTRACE_H
+#define _ASM_POWERPC_STACKTRACE_H
+
+void show_user_instructions(struct pt_regs *regs);
+
+#endif /* _ASM_POWERPC_STACKTRACE_H */
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index e9533b4d2f08..364645ac732c 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1299,6 +1299,46 @@ static void show_instructions(struct pt_regs *regs)
pr_cont("\n");
}
+void show_user_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(prefix, current->comm, current->pid);
+
+ for (i = 0; i < instructions_to_print; i++) {
+ int instr;
+
+ 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
+ * than print XXXXXXXX.
+ */
+ if (!(regs->msr & MSR_IR))
+ pc = (unsigned long)phys_to_virt(pc);
+#endif
+
+ if (probe_kernel_address((unsigned int __user *)pc, instr)) {
+ pr_cont("XXXXXXXX ");
+ } else {
+ if (regs->nip == pc)
+ pr_cont("<%08x> ", instr);
+ else
+ pr_cont("%08x ", instr);
+ }
+
+ pc += sizeof(int);
+ }
+
+ pr_cont("\n");
+}
+
struct regbit {
unsigned long bit;
const char *name;
--
2.17.1
next prev parent reply other threads:[~2018-08-01 21:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 21:33 [PATCH v4 0/6] powerpc: Modernize unhandled signals message Murilo Opsfelder Araujo
2018-08-01 21:33 ` [PATCH v4 1/6] powerpc/traps: Print unhandled signals in a separate function Murilo Opsfelder Araujo
2018-08-08 14:26 ` [v4, " Michael Ellerman
2018-08-01 21:33 ` [PATCH v4 2/6] powerpc/traps: Use an explicit ratelimit state for show_signal_msg() Murilo Opsfelder Araujo
2018-08-01 21:33 ` [PATCH v4 3/6] powerpc/traps: Use %lx format in show_signal_msg() Murilo Opsfelder Araujo
2018-08-01 21:33 ` [PATCH v4 4/6] powerpc/traps: Print VMA for unhandled signals Murilo Opsfelder Araujo
2018-08-01 21:33 ` Murilo Opsfelder Araujo [this message]
2018-08-02 5:26 ` [PATCH v4 5/6] powerpc: Add show_user_instructions() Christophe LEROY
2018-08-03 0:42 ` Murilo Opsfelder Araujo
2018-08-03 1:22 ` Joe Perches
2018-08-03 6:38 ` Christophe LEROY
2018-08-03 8:44 ` Michael Ellerman
2018-08-03 11:31 ` Murilo Opsfelder Araujo
2018-08-10 9:29 ` Christophe LEROY
2018-08-10 18:08 ` Murilo Opsfelder Araujo
2018-08-01 21:33 ` [PATCH v4 6/6] powerpc/traps: Show instructions on exceptions Murilo Opsfelder Araujo
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=20180801213320.11203-6-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=joe@perches.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=segher@kernel.crashing.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).