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

Pull tracing updates from Steve Rostedt.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --combined kernel/trace/trace.c
index a7fa0702be1cd5b269ed6f15e9624f4b02968b11,b2af14e94c28c7c9bcea9ac72550fe40398be33c..814ff306ae74ff85eb43ab545d5ffcd639d9287c
--- 1/kernel/trace/trace.c
--- 2/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -830,6 -830,8 +830,8 @@@ int register_tracer(struct tracer *type
                current_trace = saved_tracer;
                if (ret) {
                        printk(KERN_CONT "FAILED!\n");
+                       /* Add the warning after printing 'FAILED' */
+                       WARN_ON(1);
                        goto out;
                }
                /* Only reset on passing, to avoid touching corrupted buffers */
@@@ -1708,9 -1710,11 +1710,11 @@@ EXPORT_SYMBOL_GPL(trace_vprintk)
  
  static void trace_iterator_increment(struct trace_iterator *iter)
  {
+       struct ring_buffer_iter *buf_iter = trace_buffer_iter(iter, iter->cpu);
+ 
        iter->idx++;
-       if (iter->buffer_iter[iter->cpu])
-               ring_buffer_read(iter->buffer_iter[iter->cpu], NULL);
+       if (buf_iter)
+               ring_buffer_read(buf_iter, NULL);
  }
  
  static struct trace_entry *
@@@ -1718,7 -1722,7 +1722,7 @@@ peek_next_entry(struct trace_iterator *
                unsigned long *lost_events)
  {
        struct ring_buffer_event *event;
-       struct ring_buffer_iter *buf_iter = iter->buffer_iter[cpu];
+       struct ring_buffer_iter *buf_iter = trace_buffer_iter(iter, cpu);
  
        if (buf_iter)
                event = ring_buffer_iter_peek(buf_iter, ts);
@@@ -1856,10 -1860,10 +1860,10 @@@ void tracing_iter_reset(struct trace_it
  
        tr->data[cpu]->skipped_entries = 0;
  
-       if (!iter->buffer_iter[cpu])
+       buf_iter = trace_buffer_iter(iter, cpu);
+       if (!buf_iter)
                return;
  
-       buf_iter = iter->buffer_iter[cpu];
        ring_buffer_iter_reset(buf_iter);
  
        /*
@@@ -2205,13 -2209,15 +2209,15 @@@ static enum print_line_t print_bin_fmt(
  
  int trace_empty(struct trace_iterator *iter)
  {
+       struct ring_buffer_iter *buf_iter;
        int cpu;
  
        /* If we are looking at one CPU buffer, only check that one */
        if (iter->cpu_file != TRACE_PIPE_ALL_CPU) {
                cpu = iter->cpu_file;
-               if (iter->buffer_iter[cpu]) {
-                       if (!ring_buffer_iter_empty(iter->buffer_iter[cpu]))
+               buf_iter = trace_buffer_iter(iter, cpu);
+               if (buf_iter) {
+                       if (!ring_buffer_iter_empty(buf_iter))
                                return 0;
                } else {
                        if (!ring_buffer_empty_cpu(iter->tr->buffer, cpu))
@@@ -2221,8 -2227,9 +2227,9 @@@
        }
  
        for_each_tracing_cpu(cpu) {
-               if (iter->buffer_iter[cpu]) {
-                       if (!ring_buffer_iter_empty(iter->buffer_iter[cpu]))
+               buf_iter = trace_buffer_iter(iter, cpu);
+               if (buf_iter) {
+                       if (!ring_buffer_iter_empty(buf_iter))
                                return 0;
                } else {
                        if (!ring_buffer_empty_cpu(iter->tr->buffer, cpu))
@@@ -2381,6 -2388,8 +2388,8 @@@ __tracing_open(struct inode *inode, str
        if (!iter)
                return ERR_PTR(-ENOMEM);
  
+       iter->buffer_iter = kzalloc(sizeof(*iter->buffer_iter) * num_possible_cpus(),
+                                   GFP_KERNEL);
        /*
         * We make a copy of the current tracer to avoid concurrent
         * changes on it while we are reading.
@@@ -2441,6 -2450,7 +2450,7 @@@
   fail:
        mutex_unlock(&trace_types_lock);
        kfree(iter->trace);
+       kfree(iter->buffer_iter);
        seq_release_private(inode, file);
        return ERR_PTR(-ENOMEM);
  }
@@@ -2481,6 -2491,7 +2491,7 @@@ static int tracing_release(struct inod
        mutex_destroy(&iter->mutex);
        free_cpumask_var(iter->started);
        kfree(iter->trace);
+       kfree(iter->buffer_iter);
        seq_release_private(inode, file);
        return 0;
  }
@@@ -3609,7 -3620,6 +3620,7 @@@ static ssize_t tracing_splice_read_pipe
                .pages          = pages_def,
                .partial        = partial_def,
                .nr_pages       = 0, /* This gets updated below. */
 +              .nr_pages_max   = PIPE_DEF_BUFFERS,
                .flags          = flags,
                .ops            = &tracing_pipe_buf_ops,
                .spd_release    = tracing_spd_release_pipe,
@@@ -3681,7 -3691,7 +3692,7 @@@
  
        ret = splice_to_pipe(pipe, &spd);
  out:
 -      splice_shrink_spd(pipe, &spd);
 +      splice_shrink_spd(&spd);
        return ret;
  
  out_err:
@@@ -4232,7 -4242,6 +4243,7 @@@ tracing_buffers_splice_read(struct fil
        struct splice_pipe_desc spd = {
                .pages          = pages_def,
                .partial        = partial_def,
 +              .nr_pages_max   = PIPE_DEF_BUFFERS,
                .flags          = flags,
                .ops            = &buffer_pipe_buf_ops,
                .spd_release    = buffer_spd_release,
@@@ -4320,7 -4329,7 +4331,7 @@@
        }
  
        ret = splice_to_pipe(pipe, &spd);
 -      splice_shrink_spd(pipe, &spd);
 +      splice_shrink_spd(&spd);
  out:
        return ret;
  }