Merge tag 'trace-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull tracing updates from Steven Rostedt:
 "This pull request has a new feature to ftrace, namely the trace event
  triggers by Tom Zanussi.  A trigger is a way to enable an action when
  an event is hit.  The actions are:

   o  trace on/off - enable or disable tracing
   o  snapshot     - save the current trace buffer in the snapshot
   o  stacktrace   - dump the current stack trace to the ringbuffer
   o  enable/disable events - enable or disable another event

  Namhyung Kim added updates to the tracing uprobes code.  Having the
  uprobes add support for fetch methods.

  The rest are various bug fixes with the new code, and minor ones for
  the old code"

* tag 'trace-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (38 commits)
  tracing: Fix buggered tee(2) on tracing_pipe
  tracing: Have trace buffer point back to trace_array
  ftrace: Fix synchronization location disabling and freeing ftrace_ops
  ftrace: Have function graph only trace based on global_ops filters
  ftrace: Synchronize setting function_trace_op with ftrace_trace_function
  tracing: Show available event triggers when no trigger is set
  tracing: Consolidate event trigger code
  tracing: Fix counter for traceon/off event triggers
  tracing: Remove double-underscore naming in syscall trigger invocations
  tracing/kprobes: Add trace event trigger invocations
  tracing/probes: Fix build break on !CONFIG_KPROBE_EVENT
  tracing/uprobes: Add @+file_offset fetch method
  uprobes: Allocate ->utask before handler_chain() for tracing handlers
  tracing/uprobes: Add support for full argument access methods
  tracing/uprobes: Fetch args before reserving a ring buffer
  tracing/uprobes: Pass 'is_return' to traceprobe_parse_probe_arg()
  tracing/probes: Implement 'memory' fetch method for uprobes
  tracing/probes: Add fetch{,_size} member into deref fetch method
  tracing/probes: Move 'symbol' fetch method to kprobes
  tracing/probes: Implement 'stack' fetch method for uprobes
  ...

1 files changed, 21 insertions, 8 deletions

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 5c38606613d8..1a8b28db3775 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -418,6 +418,8 @@ static inline notrace int ftrace_get_offsets_##call(			\
  *      struct ftrace_event_file *ftrace_file = __data;
  *      struct ftrace_event_call *event_call = ftrace_file->event_call;
  *      struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;
+ *      unsigned long eflags = ftrace_file->flags;
+ *      enum event_trigger_type __tt = ETT_NONE;
  *      struct ring_buffer_event *event;
  *      struct ftrace_raw_<call> *entry; <-- defined in stage 1
  *      struct ring_buffer *buffer;
@@ -425,9 +427,12 @@ static inline notrace int ftrace_get_offsets_##call(			\
  *      int __data_size;
  *      int pc;
  *
- *      if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT,
- *                   &ftrace_file->flags))
- *              return;
+ *      if (!(eflags & FTRACE_EVENT_FL_TRIGGER_COND)) {
+ *              if (eflags & FTRACE_EVENT_FL_TRIGGER_MODE)
+ *                      event_triggers_call(ftrace_file, NULL);
+ *              if (eflags & FTRACE_EVENT_FL_SOFT_DISABLED)
+ *                      return;
+ *      }
  *
  *      local_save_flags(irq_flags);
  *      pc = preempt_count();
@@ -445,8 +450,17 @@ static inline notrace int ftrace_get_offsets_##call(			\
  *      { <assign>; }  <-- Here we assign the entries by the __field and
  *                         __array macros.
  *
- *      if (!filter_check_discard(ftrace_file, entry, buffer, event))
+ *      if (eflags & FTRACE_EVENT_FL_TRIGGER_COND)
+ *              __tt = event_triggers_call(ftrace_file, entry);
+ *
+ *      if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT,
+ *                   &ftrace_file->flags))
+ *              ring_buffer_discard_commit(buffer, event);
+ *      else if (!filter_check_discard(ftrace_file, entry, buffer, event))
  *              trace_buffer_unlock_commit(buffer, event, irq_flags, pc);
+ *
+ *      if (__tt)
+ *              event_triggers_post_call(ftrace_file, __tt);
  * }
  *
  * static struct trace_event ftrace_event_type_<call> = {
@@ -539,8 +553,7 @@ ftrace_raw_event_##call(void *__data, proto)				\
         int __data_size;                                                \
         int pc;                                                         \
                                                                         \
-        if (test_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT,                 \
-                     &ftrace_file->flags))                              \
+        if (ftrace_trigger_soft_disabled(ftrace_file))                  \
                 return;                                                 \
                                                                         \
         local_save_flags(irq_flags);                                    \
@@ -560,8 +573,8 @@ ftrace_raw_event_##call(void *__data, proto)				\
                                                                         \
         { assign; }                                                     \
                                                                         \
-        if (!filter_check_discard(ftrace_file, entry, buffer, event))   \
-                trace_buffer_unlock_commit(buffer, event, irq_flags, pc); \
+        event_trigger_unlock_commit(ftrace_file, buffer, event, entry, \
+                                    irq_flags, pc);                    \
 }
 /*
  * The ftrace_test_probe is compiled out, it is only here as a build time check