From: Chen Lin <chen45464546@163.com>
To: catalin.marinas@arm.com
Cc: will@kernel.org, mark.rutland@arm.com, joey.gouly@arm.com,
maz@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Chen Lin <chen.lin5@zte.com.cn>
Subject: [PATCH] arm64: traps: add dump instr before BUG in kernel
Date: Wed, 29 Sep 2021 21:29:46 +0800 [thread overview]
Message-ID: <1632922186-3116-1-git-send-email-chen45464546@163.com> (raw)
From: Chen Lin <chen.lin5@zte.com.cn>
we should dump the real instructions before BUG in kernel mode, and
compare this to the instructions from objdump.
Signed-off-by: Chen Lin <chen.lin5@zte.com.cn>
---
arch/arm64/kernel/traps.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index b03e383..621a9dd 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -495,7 +495,12 @@ void do_undefinstr(struct pt_regs *regs)
if (call_undef_hook(regs) == 0)
return;
- BUG_ON(!user_mode(regs));
+ if (!user_mode(regs)) {
+ pr_emerg("Undef instruction in kernel, dump instr:");
+ dump_kernel_instr(KERN_EMERG, regs);
+ BUG();
+ }
+
force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc, 0);
}
NOKPROBE_SYMBOL(do_undefinstr);
--
1.7.9.5
next reply other threads:[~2021-09-29 13:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-29 13:29 Chen Lin [this message]
2021-09-30 8:42 ` [PATCH] arm64: traps: add dump instr before BUG in kernel Will Deacon
2021-09-30 14:41 ` Chen Lin
2021-10-11 10:06 ` Will Deacon
2021-10-13 13:08 ` Chen Lin
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=1632922186-3116-1-git-send-email-chen45464546@163.com \
--to=chen45464546@163.com \
--cc=catalin.marinas@arm.com \
--cc=chen.lin5@zte.com.cn \
--cc=joey.gouly@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=will@kernel.org \
/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).