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

Pull tracing updates from Steven Rostedt:
 "Most of the changes were largely clean ups, and some documentation.
  But there were a few features that were added:

  Uprobes now work with event triggers and multi buffers and have
  support under ftrace and perf.

  The big feature is that the function tracer can now be used within the
  multi buffer instances.  That is, you can now trace some functions in
  one buffer, others in another buffer, all functions in a third buffer
  and so on.  They are basically agnostic from each other.  This only
  works for the function tracer and not for the function graph trace,
  although you can have the function graph tracer running in the top
  level buffer (or any tracer for that matter) and have different
  function tracing going on in the sub buffers"

* tag 'trace-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (45 commits)
  tracing: Add BUG_ON when stack end location is over written
  tracepoint: Remove unused API functions
  Revert "tracing: Move event storage for array from macro to standalone function"
  ftrace: Constify ftrace_text_reserved
  tracepoints: API doc update to tracepoint_probe_register() return value
  tracepoints: API doc update to data argument
  ftrace: Fix compilation warning about control_ops_free
  ftrace/x86: BUG when ftrace recovery fails
  ftrace: Warn on error when modifying ftrace function
  ftrace: Remove freelist from struct dyn_ftrace
  ftrace: Do not pass data to ftrace_dyn_arch_init
  ftrace: Pass retval through return in ftrace_dyn_arch_init()
  ftrace: Inline the code from ftrace_dyn_table_alloc()
  ftrace: Cleanup of global variables ftrace_new_pgs and ftrace_update_cnt
  tracing: Evaluate len expression only once in __dynamic_array macro
  tracing: Correctly expand len expressions from __dynamic_array macro
  tracing/module: Replace include of tracepoint.h with jump_label.h in module.h
  tracing: Fix event header migrate.h to include tracepoint.h
  tracing: Fix event header writeback.h to include tracepoint.h
  tracing: Warn if a tracepoint is not set via debugfs
  ...

3 files changed, 14 insertions, 27 deletions

diff --git a/include/trace/events/migrate.h b/include/trace/events/migrate.h
index 3075ffbb9a83..4e4f2f8b1ac2 100644
--- a/include/trace/events/migrate.h
+++ b/include/trace/events/migrate.h
@@ -4,6 +4,8 @@
 #if !defined(_TRACE_MIGRATE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_MIGRATE_H
 
+#include <linux/tracepoint.h>
+
 #define MIGRATE_MODE                                            \
         {MIGRATE_ASYNC,         "MIGRATE_ASYNC"},               \
         {MIGRATE_SYNC_LIGHT,    "MIGRATE_SYNC_LIGHT"},          \
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 464ea82e10db..cee02d65ab3f 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -4,6 +4,7 @@
 #if !defined(_TRACE_WRITEBACK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_WRITEBACK_H
 
+#include <linux/tracepoint.h>
 #include <linux/backing-dev.h>
 #include <linux/writeback.h>
 
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index 1ee19a24cc5f..8765126b328c 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -265,11 +265,9 @@ static notrace enum print_line_t					\
 ftrace_raw_output_##call(struct trace_iterator *iter, int flags,        \
                          struct trace_event *event)                     \
 {                                                                       \
-        struct trace_seq *s = &iter->seq;                               \
         struct ftrace_raw_##template *field;                            \
         struct trace_entry *entry;                                      \
         struct trace_seq *p = &iter->tmp_seq;                           \
-        int ret;                                                        \
                                                                         \
         entry = iter->ent;                                              \
                                                                         \
@@ -281,13 +279,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags,	\
         field = (typeof(field))entry;                                   \
                                                                         \
         trace_seq_init(p);                                              \
-        ret = trace_seq_printf(s, "%s: ", #call);                       \
-        if (ret)                                                        \
-                ret = trace_seq_printf(s, print);                       \
-        if (!ret)                                                       \
-                return TRACE_TYPE_PARTIAL_LINE;                         \
-                                                                        \
-        return TRACE_TYPE_HANDLED;                                      \
+        return ftrace_output_call(iter, #call, print);                  \
 }                                                                       \
 static struct trace_event_functions ftrace_event_type_funcs_##call = {  \
         .trace                  = ftrace_raw_output_##call,             \
@@ -370,10 +362,11 @@ ftrace_define_fields_##call(struct ftrace_event_call *event_call)	\
 
 #undef __dynamic_array
 #define __dynamic_array(type, item, len)                                \
+        __item_length = (len) * sizeof(type);                           \
         __data_offsets->item = __data_size +                            \
                                offsetof(typeof(*entry), __data);        \
-        __data_offsets->item |= (len * sizeof(type)) << 16;             \
-        __data_size += (len) * sizeof(type);
+        __data_offsets->item |= __item_length << 16;                    \
+        __data_size += __item_length;
 
 #undef __string
 #define __string(item, src) __dynamic_array(char, item,                 \
@@ -385,6 +378,7 @@ static inline notrace int ftrace_get_offsets_##call(			\
         struct ftrace_data_offsets_##call *__data_offsets, proto)       \
 {                                                                       \
         int __data_size = 0;                                            \
+        int __maybe_unused __item_length;                               \
         struct ftrace_raw_##call __maybe_unused *entry;                 \
                                                                         \
         tstruct;                                                        \
@@ -541,37 +535,27 @@ static notrace void							\
 ftrace_raw_event_##call(void *__data, proto)                            \
 {                                                                       \
         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;\
-        struct ring_buffer_event *event;                                \
+        struct ftrace_event_buffer fbuffer;                             \
         struct ftrace_raw_##call *entry;                                \
-        struct ring_buffer *buffer;                                     \
-        unsigned long irq_flags;                                        \
         int __data_size;                                                \
-        int pc;                                                         \
                                                                         \
         if (ftrace_trigger_soft_disabled(ftrace_file))                  \
                 return;                                                 \
                                                                         \
-        local_save_flags(irq_flags);                                    \
-        pc = preempt_count();                                           \
-                                                                        \
         __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
                                                                         \
-        event = trace_event_buffer_lock_reserve(&buffer, ftrace_file,   \
-                                 event_call->event.type,                \
-                                 sizeof(*entry) + __data_size,          \
-                                 irq_flags, pc);                        \
-        if (!event)                                                     \
+        entry = ftrace_event_buffer_reserve(&fbuffer, ftrace_file,      \
+                                 sizeof(*entry) + __data_size);         \
+                                                                        \
+        if (!entry)                                                     \
                 return;                                                 \
-        entry   = ring_buffer_event_data(event);                        \
                                                                         \
         tstruct                                                         \
                                                                         \
         { assign; }                                                     \
                                                                         \
-        event_trigger_unlock_commit(ftrace_file, buffer, event, entry, \
-                                    irq_flags, pc);                    \
+        ftrace_event_buffer_commit(&fbuffer);                           \
 }
 /*
  * The ftrace_test_probe is compiled out, it is only here as a build time check