Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

Conflicts:
	include/trace/ftrace.h
	kernel/trace/trace_kprobe.c

Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --cc include/linux/ftrace.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc include/trace/ftrace.h
index 4866c10,882c648..e0e8daa
--- 1/include/trace/ftrace.h
--- 2/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@@ -690,18 -757,17 +690,20 @@@ __attribute__((section("_ftrace_events"
  #undef DECLARE_EVENT_CLASS
  #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print)        \
  static notrace void                                                   \
 -perf_trace_templ_##call(struct ftrace_event_call *event_call,         \
 -                      struct pt_regs *__regs, proto)                  \
 +perf_trace_##call(void *__data, proto)                                        \
  {                                                                     \
 +      struct ftrace_event_call *event_call = __data;                  \
        struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
        struct ftrace_raw_##call *entry;                                \
++      struct pt_regs *__regs = &get_cpu_var(perf_trace_regs);         \
        u64 __addr = 0, __count = 1;                                    \
        unsigned long irq_flags;                                        \
-       struct pt_regs *__regs;                                         \
        int __entry_size;                                               \
        int __data_size;                                                \
        int rctx;                                                       \
                                                                        \
++      perf_fetch_caller_regs(__regs, 1);                              \
++                                                                      \
        __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
        __entry_size = ALIGN(__data_size + sizeof(*entry) + sizeof(u32),\
                             sizeof(u64));                              \
@@@ -709,36 -775,33 +711,35 @@@
                                                                        \
        if (WARN_ONCE(__entry_size > PERF_MAX_TRACE_SIZE,               \
                      "profile buffer not large enough"))               \
--              return;                                                 \
++              goto out;                                               \
        entry = (struct ftrace_raw_##call *)perf_trace_buf_prepare(     \
 -              __entry_size, event_call->id, &rctx, &irq_flags);       \
 +              __entry_size, event_call->event.type, &rctx, &irq_flags); \
        if (!entry)                                                     \
--              return;                                                 \
++              goto out;                                               \
        tstruct                                                         \
                                                                        \
        { assign; }                                                     \
                                                                        \
-       __regs = &__get_cpu_var(perf_trace_regs);                       \
-       perf_fetch_caller_regs(__regs, 2);                              \
-                                                                       \
        perf_trace_buf_submit(entry, __entry_size, rctx, __addr,        \
                               __count, irq_flags, __regs);             \
++ out:                                                                 \
++      put_cpu_var(perf_trace_regs);                                   \
  }
  
 +/*
 + * This part is compiled out, it is only here as a build time check
 + * to make sure that if the tracepoint handling changes, the
 + * perf probe will fail to compile unless it too is updated.
 + */
  #undef DEFINE_EVENT
  #define DEFINE_EVENT(template, call, proto, args)                     \
 -static notrace void perf_trace_##call(proto)                          \
 +static inline void perf_test_probe_##call(void)                               \
  {                                                                     \
 -      struct ftrace_event_call *event_call = &event_##call;           \
 -      struct pt_regs *__regs = &get_cpu_var(perf_trace_regs);         \
 -                                                                      \
 -      perf_fetch_caller_regs(__regs, 1);                              \
 +      check_trace_callback_type_##call(perf_trace_##template);        \
                                                                        \
 -      perf_trace_templ_##template(event_call, __regs, args);          \
 -                                                                      \
 -      put_cpu_var(perf_trace_regs);                                   \
  }
  
 +
  #undef DEFINE_EVENT_PRINT
  #define DEFINE_EVENT_PRINT(template, name, proto, args, print)        \
        DEFINE_EVENT(template, name, PARAMS(proto), PARAMS(args))

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_events_filter.c
Simple merge

diff --cc kernel/trace/trace_kprobe.c
index 0e3ded6,a751432..9a082bb
--- 1/kernel/trace/trace_kprobe.c
--- 2/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@@ -202,8 -324,9 +324,9 @@@ struct trace_probe 
        unsigned long           nhit;
        unsigned int            flags;  /* For TP_FLAG_* */
        const char              *symbol;        /* symbol name */
 +      struct ftrace_event_class       class;
        struct ftrace_event_call        call;
 -      struct trace_event              event;
+       ssize_t                 size;           /* trace entry size */
        unsigned int            nr_args;
        struct probe_arg        args[];
  };
@@@ -795,11 -901,10 +902,10 @@@ static void probes_seq_stop(struct seq_
  static int probes_seq_show(struct seq_file *m, void *v)
  {
        struct trace_probe *tp = v;
-       int i, ret;
-       char buf[MAX_ARGSTR_LEN + 1];
+       int i;
  
        seq_printf(m, "%c", probe_is_return(tp) ? 'r' : 'p');
 -      seq_printf(m, ":%s/%s", tp->call.system, tp->call.name);
 +      seq_printf(m, ":%s/%s", tp->call.class->system, tp->call.name);
  
        if (!tp->symbol)
                seq_printf(m, " 0x%p", tp->rp.kp.addr);
@@@ -958,10 -1059,10 +1060,10 @@@ static __kprobes void kprobe_trace_func
        local_save_flags(irq_flags);
        pc = preempt_count();
  
-       size = SIZEOF_KPROBE_TRACE_ENTRY(tp->nr_args);
+       size = sizeof(*entry) + tp->size;
  
 -      event = trace_current_buffer_lock_reserve(&buffer, call->id, size,
 -                                                irq_flags, pc);
 +      event = trace_current_buffer_lock_reserve(&buffer, call->event.type,
 +                                                size, irq_flags, pc);
        if (!event)
                return;
  
@@@ -990,10 -1092,10 +1093,10 @@@ static __kprobes void kretprobe_trace_f
        local_save_flags(irq_flags);
        pc = preempt_count();
  
-       size = SIZEOF_KRETPROBE_TRACE_ENTRY(tp->nr_args);
+       size = sizeof(*entry) + tp->size;
  
 -      event = trace_current_buffer_lock_reserve(&buffer, call->id, size,
 -                                                irq_flags, pc);
 +      event = trace_current_buffer_lock_reserve(&buffer, call->event.type,
 +                                                size, irq_flags, pc);
        if (!event)
                return;
  
@@@ -1010,16 -1112,18 +1113,17 @@@
  
  /* Event entry printers */
  enum print_line_t
 -print_kprobe_event(struct trace_iterator *iter, int flags)
 +print_kprobe_event(struct trace_iterator *iter, int flags,
 +                 struct trace_event *event)
  {
-       struct kprobe_trace_entry *field;
+       struct kprobe_trace_entry_head *field;
        struct trace_seq *s = &iter->seq;
 -      struct trace_event *event;
        struct trace_probe *tp;
+       u8 *data;
        int i;
  
-       field = (struct kprobe_trace_entry *)iter->ent;
+       field = (struct kprobe_trace_entry_head *)iter->ent;
 -      event = ftrace_find_event(field->ent.type);
 -      tp = container_of(event, struct trace_probe, event);
 +      tp = container_of(event, struct trace_probe, call.event);
  
        if (!trace_seq_printf(s, "%s: (", tp->call.name))
                goto partial;
@@@ -1044,16 -1149,18 +1149,17 @@@ partial
  }
  
  enum print_line_t
 -print_kretprobe_event(struct trace_iterator *iter, int flags)
 +print_kretprobe_event(struct trace_iterator *iter, int flags,
 +                    struct trace_event *event)
  {
-       struct kretprobe_trace_entry *field;
+       struct kretprobe_trace_entry_head *field;
        struct trace_seq *s = &iter->seq;
 -      struct trace_event *event;
        struct trace_probe *tp;
+       u8 *data;
        int i;
  
-       field = (struct kretprobe_trace_entry *)iter->ent;
+       field = (struct kretprobe_trace_entry_head *)iter->ent;
 -      event = ftrace_find_event(field->ent.type);
 -      tp = container_of(event, struct trace_probe, event);
 +      tp = container_of(event, struct trace_probe, call.event);
  
        if (!trace_seq_printf(s, "%s: (", tp->call.name))
                goto partial;

diff --cc kernel/trace/trace_selftest.c
Simple merge