[GIT PULL][v3.7] (was: Re: [PATCH 00/19] [GIT PULL][v3.6]) ftrace: Allow kprobes to work with ftace

[Steven Rostedt <rostedt@goodmis.org>]

On Mon, 2012-07-30 at 11:51 -0400, Steven Rostedt wrote:

> As the merge window opened the day after I sent this (which was also the
> same day I left for vacation :-p ), I recommend that this goes in v3.7.
> 
> Can you pull this in for 3.7, or do you want me to post another pull
> request after the merge window closes?

Hi Ingo,

I just rebased the branch to include Masami's reviewed by tag that he
posted for Uros Bizjak's patch. No code has changed.


Please pull the latest tip/perf/core tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
tip/perf/core

Head SHA1: e52538965119319447c0800c534da73142c27be2


Masami Hiramatsu (5):
      ftrace: add ftrace_set_filter_ip() for address based filter
      kprobes: cleanup to separate probe-able check
      kprobes: Move locks into appropriate functions
      kprobes: introduce ftrace based optimization
      kprobes/x86: ftrace based optimization for x86

Steven Rostedt (13):
      ftrace: Pass ftrace_ops as third parameter to function trace callback
      ftrace: Consolidate arch dependent functions with 'list' function
      ftrace: Return pt_regs to function trace callback
      ftrace/x86_32: Push ftrace_ops in as 3rd parameter to function tracer
      ftrace/x86: Add separate function to save regs
      ftrace/x86: Add save_regs for i386 function calls
      ftrace/x86: Remove function_trace_stop check from graph caller
      ftrace: Add default recursion protection for function tracing
      ftrace: Only compile ftrace selftest if selftests are enabled
      ftrace: Add selftest to test function trace recursion protection
      ftrace: Add selftest to test function save-regs support
      kprobes: Inverse taking of module_mutex with kprobe_mutex
      ftrace: Make ftrace_location() a nop on !DYNAMIC_FTRACE

Uros Bizjak (1):
      ftrace/x86_32: Simplify parameter setup for ftrace_regs_caller

----
 arch/x86/include/asm/ftrace.h     |   49 +++---
 arch/x86/include/asm/kprobes.h    |    1 +
 arch/x86/kernel/entry_32.S        |   75 ++++++++-
 arch/x86/kernel/entry_64.S        |   96 +++++++++--
 arch/x86/kernel/ftrace.c          |   73 ++++++++-
 arch/x86/kernel/kprobes.c         |   48 ++++++
 include/linux/ftrace.h            |  158 ++++++++++++++++--
 include/linux/kprobes.h           |   27 ++++
 kernel/kprobes.c                  |  250 ++++++++++++++++++++--------
 kernel/trace/Makefile             |    2 +
 kernel/trace/ftrace.c             |  322 ++++++++++++++++++++++++++++---------
 kernel/trace/trace.h              |    2 +-
 kernel/trace/trace_event_perf.c   |    3 +-
 kernel/trace/trace_events.c       |    4 +-
 kernel/trace/trace_functions.c    |   14 +-
 kernel/trace/trace_irqsoff.c      |    5 +-
 kernel/trace/trace_sched_wakeup.c |    5 +-
 kernel/trace/trace_selftest.c     |  277 ++++++++++++++++++++++++++++++-
 kernel/trace/trace_stack.c        |    4 +-
 19 files changed, 1199 insertions(+), 216 deletions(-)