* [PATCH v3] arm64: rename dump_instr as dump_kernel_instr [not found] <CGME20190626115016epcas1p455530417de86ea2e72ce1b389ae57a75@epcas1p4.samsung.com> @ 2019-06-26 11:50 ` jinho lim 2019-06-26 12:21 ` Will Deacon 2019-06-26 16:59 ` Catalin Marinas 0 siblings, 2 replies; 3+ messages in thread From: jinho lim @ 2019-06-26 11:50 UTC (permalink / raw) To: will.deacon Cc: mark.rutland, ebiederm, marc.zyngier, anshuman.khandual, andreyknvl, linux-arm-kernel, linux-kernel, seroto7, jinho lim In traps.c, only __die calls dump_instr. However, this function has sub-function as __dump_instr. dump_kernel_instr can replace those functions. By using aarch64_insn_read, it does not have to change fs to KERNEL_DS. Signed-off-by: jinho lim <jordan.lim@samsung.com> --- arch/arm64/kernel/traps.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index ccc13b45d9b1..7e69454fd250 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -66,16 +66,19 @@ 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); char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str; int i; + if (user_mode(regs)) + return; + for (i = -4; i < 1; i++) { unsigned int val, bad; - bad = get_user(val, &((u32 *)addr)[i]); + bad = aarch64_insn_read(&((u32 *)addr)[i], &val); if (!bad) p += sprintf(p, i == 0 ? "(%08x) " : "%08x ", val); @@ -84,19 +87,8 @@ 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); - } + printk("%sCode: %s\n", lvl, str); } void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) @@ -182,8 +174,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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] arm64: rename dump_instr as dump_kernel_instr 2019-06-26 11:50 ` [PATCH v3] arm64: rename dump_instr as dump_kernel_instr jinho lim @ 2019-06-26 12:21 ` Will Deacon 2019-06-26 16:59 ` Catalin Marinas 1 sibling, 0 replies; 3+ messages in thread From: Will Deacon @ 2019-06-26 12:21 UTC (permalink / raw) To: jinho lim, catalin.marinas Cc: will.deacon, mark.rutland, anshuman.khandual, marc.zyngier, andreyknvl, linux-kernel, seroto7, ebiederm, linux-arm-kernel On Wed, Jun 26, 2019 at 08:50:13PM +0900, jinho lim wrote: > In traps.c, only __die calls dump_instr. > However, this function has sub-function as __dump_instr. > > dump_kernel_instr can replace those functions. > By using aarch64_insn_read, it does not have to change fs to KERNEL_DS. > > Signed-off-by: jinho lim <jordan.lim@samsung.com> > --- > arch/arm64/kernel/traps.c | 23 +++++++---------------- > 1 file changed, 7 insertions(+), 16 deletions(-) Thanks, this looks good to me now: Acked-by: Will Deacon <will.deacon@arm.com> Catalin can pick this up for 5.3. Will ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] arm64: rename dump_instr as dump_kernel_instr 2019-06-26 11:50 ` [PATCH v3] arm64: rename dump_instr as dump_kernel_instr jinho lim 2019-06-26 12:21 ` Will Deacon @ 2019-06-26 16:59 ` Catalin Marinas 1 sibling, 0 replies; 3+ messages in thread From: Catalin Marinas @ 2019-06-26 16:59 UTC (permalink / raw) To: jinho lim Cc: will.deacon, mark.rutland, anshuman.khandual, marc.zyngier, andreyknvl, linux-kernel, seroto7, ebiederm, linux-arm-kernel On Wed, Jun 26, 2019 at 08:50:13PM +0900, jinho lim wrote: > In traps.c, only __die calls dump_instr. > However, this function has sub-function as __dump_instr. > > dump_kernel_instr can replace those functions. > By using aarch64_insn_read, it does not have to change fs to KERNEL_DS. > > Signed-off-by: jinho lim <jordan.lim@samsung.com> Queued for 5.3. Thanks. -- Catalin ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-26 16:59 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <CGME20190626115016epcas1p455530417de86ea2e72ce1b389ae57a75@epcas1p4.samsung.com> 2019-06-26 11:50 ` [PATCH v3] arm64: rename dump_instr as dump_kernel_instr jinho lim 2019-06-26 12:21 ` Will Deacon 2019-06-26 16:59 ` Catalin Marinas
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).