From: jinho lim <jordan.lim@samsung.com>
To: will.deacon@arm.com
Cc: mark.rutland@arm.com, ebiederm@xmission.com,
marc.zyngier@arm.com, anshuman.khandual@arm.com,
andreyknvl@google.com, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, seroto7@gmail.com,
jinho lim <jordan.lim@samsung.com>
Subject: [PATCH v2] arm64: rename dump_instr as dump_kernel_instr
Date: Thu, 20 Jun 2019 15:52:49 +0900 [thread overview]
Message-ID: <20190620065249.24112-1-jordan.lim@samsung.com> (raw)
In-Reply-To: <CGME20190620065254epcas1p48539060e94433cc254a1650cdc359ac4@epcas1p4.samsung.com>
[v2]
dump_kernel_instr does not work for user mode.
rename dump_instr function and remove __dump_instr.
Signed-off-by: jinho lim <jordan.lim@samsung.com>
---
Thanks for review, I rename dump_instr function and merge __dump_instr in it.
arch/arm64/kernel/traps.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index ccc13b45d9b1..7053165cb31a 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -66,11 +66,20 @@ static void dump_backtrace_entry(unsigned long where)
printk(" %pS\n", (void *)where);
}
-static void __dump_instr(const char *lvl, struct pt_regs *regs)
+static void dump_kernel_instr(const char *lvl, struct pt_regs *regs)
{
- unsigned long addr = instruction_pointer(regs);
+ unsigned long addr;
char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;
int i;
+ mm_segment_t fs;
+
+ if (user_mode(regs))
+ return;
+
+ addr = instruction_pointer(regs);
+
+ fs = get_fs();
+ set_fs(KERNEL_DS);
for (i = -4; i < 1; i++) {
unsigned int val, bad;
@@ -84,19 +93,10 @@ static void __dump_instr(const char *lvl, struct pt_regs *regs)
break;
}
}
+
printk("%sCode: %s\n", lvl, str);
-}
-static void dump_instr(const char *lvl, struct pt_regs *regs)
-{
- if (!user_mode(regs)) {
- mm_segment_t fs = get_fs();
- set_fs(KERNEL_DS);
- __dump_instr(lvl, regs);
- set_fs(fs);
- } else {
- __dump_instr(lvl, regs);
- }
+ set_fs(fs);
}
void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
@@ -182,8 +182,7 @@ static int __die(const char *str, int err, struct pt_regs *regs)
print_modules();
show_regs(regs);
- if (!user_mode(regs))
- dump_instr(KERN_EMERG, regs);
+ dump_kernel_instr(KERN_EMERG, regs);
return ret;
}
--
2.17.1
next parent reply other threads:[~2019-06-20 6:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20190620065254epcas1p48539060e94433cc254a1650cdc359ac4@epcas1p4.samsung.com>
2019-06-20 6:52 ` jinho lim [this message]
2019-06-24 13:21 ` Will Deacon
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=20190620065249.24112-1-jordan.lim@samsung.com \
--to=jordan.lim@samsung.com \
--cc=andreyknvl@google.com \
--cc=anshuman.khandual@arm.com \
--cc=ebiederm@xmission.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=seroto7@gmail.com \
--cc=will.deacon@arm.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
all inboxes | Powered by JetHome®