ring-buffer: Move the add_timestamp into its own function

Make a helper function rb_add_timestamp() that moves the adding of the
extended time stamps into its own function. Also, remove the noinline and
inline for the functions it calls, as recent benchmarks appear they do not
make a difference (just let gcc decide).

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index ce125cbe98a5df9665485e887b13fe3f77665475..a30ca7ec22005cac74dfd3d63e3a45fde8784d4c 100644 (file)
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2596,8 +2596,8 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
        return NULL;
 }
 
-/* Slow path, do not inline */
-static noinline struct ring_buffer_event *
+/* Slow path */
+static struct ring_buffer_event *
 rb_add_time_stamp(struct ring_buffer_event *event, u64 delta, bool abs)
 {
        if (abs)
@@ -2628,7 +2628,7 @@ static inline bool sched_clock_stable(void)
 }
 #endif
 
-static noinline void
+static void
 rb_check_timestamp(struct ring_buffer_per_cpu *cpu_buffer,
                   struct rb_event_info *info)
 {
@@ -2648,6 +2648,21 @@ rb_check_timestamp(struct ring_buffer_per_cpu *cpu_buffer,
                  "or add trace_clock=global to the kernel command line\n");
 }
 
+static void rb_add_timestamp(struct ring_buffer_per_cpu *cpu_buffer,
+                                     struct ring_buffer_event **event,
+                                     struct rb_event_info *info,
+                                     u64 *delta,
+                                     unsigned int *length)
+{
+       bool abs = info->add_timestamp &
+               (RB_ADD_STAMP_FORCE | RB_ADD_STAMP_ABSOLUTE);
+
+       rb_check_timestamp(cpu_buffer, info);
+       *event = rb_add_time_stamp(*event, info->delta, abs);
+       *length -= RB_LEN_TIME_EXTEND;
+       *delta = 0;
+}
+
 /**
  * rb_update_event - update event type and data
  * @cpu_buffer: The per cpu buffer of the @event
@@ -2671,15 +2686,8 @@ rb_update_event(struct ring_buffer_per_cpu *cpu_buffer,
         * If we need to add a timestamp, then we
         * add it to the start of the reserved space.
         */
-       if (unlikely(info->add_timestamp)) {
-               bool abs = info->add_timestamp &
-                       (RB_ADD_STAMP_FORCE | RB_ADD_STAMP_ABSOLUTE);
-
-               rb_check_timestamp(cpu_buffer, info);
-               event = rb_add_time_stamp(event, abs ? info->delta : delta, abs);
-               length -= RB_LEN_TIME_EXTEND;
-               delta = 0;
-       }
+       if (unlikely(info->add_timestamp))
+               rb_add_timestamp(cpu_buffer, &event, info, &delta, &length);
 
        event->time_delta = delta;
        length -= RB_EVNT_HDR_SIZE;