Revert "arm64: add undefined instruction handler hooks" (6e81856c) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm64/include/asm/traps.h

+0 −13

Original line number	Diff line number	Diff line
		@@ -18,19 +18,6 @@
		#ifndef __ASM_TRAP_H
		#define __ASM_TRAP_H

		#include <linux/list.h>

		struct undef_hook {
		struct list_head node;
		u32 instr_mask;
		u32 instr_val;
		u32 pstate_mask;
		u32 pstate_val;
		int (fn)(struct pt_regs regs, unsigned int instr);
		};

		void register_undef_hook(struct undef_hook *hook);

		static inline int in_exception_text(unsigned long ptr)
		{
		extern char __exception_text_start[];

arch/arm64/kernel/traps.c

+0 −40

Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		*
		* Copyright (C) 1995-2009 Russell King
		* Copyright (C) 2012 ARM Ltd.
		* Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		@@ -260,54 +259,15 @@ void arm64_notify_die(const char str, struct pt_regs regs,
		}
		}

		static LIST_HEAD(undef_hook);

		void register_undef_hook(struct undef_hook *hook)
		{
		list_add(&hook->node, &undef_hook);
		}

		static int call_undef_hook(struct pt_regs *regs, unsigned int instr)
		{
		struct undef_hook *hook;
		int (fn)(struct pt_regs regs, unsigned int instr) = NULL;

		list_for_each_entry(hook, &undef_hook, node)
		if ((instr & hook->instr_mask) == hook->instr_val &&
		(regs->pstate & hook->pstate_mask) == hook->pstate_val)
		fn = hook->fn;

		return fn ? fn(regs, instr) : 1;
		}

		asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
		{
		u32 instr;
		siginfo_t info;
		void __user pc = (void __user )instruction_pointer(regs);

		/* check for AArch32 breakpoint instructions */
		if (!aarch32_break_handler(regs))
		return;
		if (compat_thumb_mode(regs)) {
		if (get_user(instr, (u16 __user *)pc))
		goto die_sig;
		if (is_wide_instruction(instr)) {
		u32 instr2;
		if (get_user(instr2, (u16 __user *)pc+1))
		goto die_sig;
		instr <<= 16;
		instr \|= instr2;
		}

		} else if ((get_user(instr, (u32 __user *)pc))) {
		goto die_sig;
		}

		if (call_undef_hook(regs, instr) == 0)
		return;

		die_sig:
		if (show_unhandled_signals && unhandled_signal(current, SIGILL) &&
		printk_ratelimit()) {
		pr_info("%s[%d]: undefined instruction: pc=%p\n",