kprobes/x86: Move ftrace-based kprobe code into kprobes-ftrace.c

Split ftrace-based kprobes code from kprobes, and introduce
CONFIG_(HAVE_)KPROBES_ON_FTRACE Kconfig flags.
For the cleanup reason, this also moves kprobe_ftrace check
into skip_singlestep.

Link: http://lkml.kernel.org/r/20120928081520.3560.25624.stgit@ltc138.sdl.hitachi.co.jp

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index 7f8f281f2585..97fb7d0365d1 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -76,6 +76,15 @@ config OPTPROBES
         depends on KPROBES && HAVE_OPTPROBES
         depends on !PREEMPT
 
+config KPROBES_ON_FTRACE
+        def_bool y
+        depends on KPROBES && HAVE_KPROBES_ON_FTRACE
+        depends on DYNAMIC_FTRACE_WITH_REGS
+        help
+         If function tracer is enabled and the arch supports full
+         passing of pt_regs to function tracing, then kprobes can
+         optimize on top of function tracing.
+
 config UPROBES
         bool "Transparent user-space probes (EXPERIMENTAL)"
         depends on UPROBE_EVENT && PERF_EVENTS
@@ -158,6 +167,9 @@ config HAVE_KRETPROBES
 config HAVE_OPTPROBES
         bool
 
+config HAVE_KPROBES_ON_FTRACE
+        bool
+
 config HAVE_NMI_WATCHDOG
         bool
 #