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

Commit cf3bb032 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

ia64/kprobes: Don't call the ->break_handler() in ia64 kprobes code 



Don't call the ->break_handler() from the ia64 kprobes code,
because it was only used by jprobes which got removed.

Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: linux-arch@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Link: https://lore.kernel.org/lkml/152942480045.15209.10715901482832337704.stgit@devbox


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 6e5fd3a2

arch/ia64/include/uapi/asm/break.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 */

#define __IA64_BREAK_KDB		0x80100

#define __IA64_BREAK_KPROBE		0x81000 /* .. 0x81fff */

#define __IA64_BREAK_JPROBE		0x82000



/*

 * OS-specific break numbers:

arch/ia64/kernel/kprobes.c

+0 −10
Original line number Diff line number Diff line
@@ -817,14 +817,6 @@ static int __kprobes pre_kprobes_handler(struct die_args *args) 
			prepare_ss(p, regs);

			kcb->kprobe_status = KPROBE_REENTER;

			return 1;

		} else if (args->err == __IA64_BREAK_JPROBE) {

			/*

			 * jprobe instrumented function just completed

			 */

			p = __this_cpu_read(current_kprobe);

			if (p->break_handler && p->break_handler(p, regs)) {

				goto ss_probe;

			}

		} else if (!is_ia64_break_inst(regs)) {

			/* The breakpoint instruction was removed by

			 * another cpu right after we hit, no further
@@ -867,7 +859,6 @@ static int __kprobes pre_kprobes_handler(struct die_args *args) 
		 */

		return 1;



ss_probe:

#if !defined(CONFIG_PREEMPT)

	if (p->ainsn.inst_flag == INST_FLAG_BOOSTABLE && !p->post_handler) {

		/* Boost up -- we can execute copied instructions directly */
@@ -990,7 +981,6 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, 
	case DIE_BREAK:

		/* err is break number from ia64_bad_break() */

		if ((args->err >> 12) == (__IA64_BREAK_KPROBE >> 12)

			|| args->err == __IA64_BREAK_JPROBE

			|| args->err == 0)

			if (pre_kprobes_handler(args))

				ret = NOTIFY_STOP;