Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b716656 authored by jinho lim's avatar jinho lim Committed by Catalin Marinas
Browse files

arm64: rename dump_instr as dump_kernel_instr 



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.

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarjinho lim <jordan.lim@samsung.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent d9db691d

arch/arm64/kernel/traps.c

+7 −16
Original line number Original line Diff line number Diff line
@@ -66,16 +66,19 @@ static void dump_backtrace_entry(unsigned long where) 
	printk(" %pS\n", (void *)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 = instruction_pointer(regs);

	char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;

	char str[sizeof("00000000 ") * 5 + 2 + 1], *p = str;

	int i;

	int i;





	if (user_mode(regs))

		return;



	for (i = -4; i < 1; i++) {

	for (i = -4; i < 1; i++) {

		unsigned int val, bad;

		unsigned int val, bad;





		bad = get_user(val, &((u32 *)addr)[i]);

		bad = aarch64_insn_read(&((u32 *)addr)[i], &val);





		if (!bad)

		if (!bad)

			p += sprintf(p, i == 0 ? "(%08x) " : "%08x ", val);

			p += sprintf(p, i == 0 ? "(%08x) " : "%08x ", val);
@@ -84,19 +87,8 @@ static void __dump_instr(const char *lvl, struct pt_regs *regs) 
			break;

			break;

		}

		}

	}

	}

	printk("%sCode: %s\n", lvl, str);

}





static void dump_instr(const char *lvl, struct pt_regs *regs)

	printk("%sCode: %s\n", lvl, str);

{

	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);

	}

}

}





void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)

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();

	print_modules();

	show_regs(regs);

	show_regs(regs);





	if (!user_mode(regs))

	dump_kernel_instr(KERN_EMERG, regs);

		dump_instr(KERN_EMERG, regs);





	return ret;

	return ret;

}

}