1 files changed, 155 insertions, 72 deletions

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 0efa00d80623..a3bddbfd0874 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -267,10 +267,14 @@ static struct tracer function_trace __tracer_data =
 };
 
 #ifdef CONFIG_DYNAMIC_FTRACE
-static void update_traceon_count(void **data, bool on)
+static void update_traceon_count(struct ftrace_probe_ops *ops,
+                                 unsigned long ip,
+                                 struct trace_array *tr, bool on,
+                                 void *data)
 {
-        long *count = (long *)data;
-        long old_count = *count;
+        struct ftrace_func_mapper *mapper = data;
+        long *count;
+        long old_count;
 
         /*
          * Tracing gets disabled (or enabled) once per count.
@@ -301,23 +305,22 @@ static void update_traceon_count(void **data, bool on)
          * setting the tracing_on file. But we currently don't care
          * about that.
          */
-        if (!old_count)
+        count = (long *)ftrace_func_mapper_find_ip(mapper, ip);
+        old_count = *count;
+
+        if (old_count <= 0)
                 return;
 
         /* Make sure we see count before checking tracing state */
         smp_rmb();
 
-        if (on == !!tracing_is_on())
+        if (on == !!tracer_tracing_is_on(tr))
                 return;
 
         if (on)
-                tracing_on();
+                tracer_tracing_on(tr);
         else
-                tracing_off();
-
-        /* unlimited? */
-        if (old_count == -1)
-                return;
+                tracer_tracing_off(tr);
 
         /* Make sure tracing state is visible before updating count */
         smp_wmb();
@@ -326,33 +329,41 @@ static void update_traceon_count(void **data, bool on)
 }
 
 static void
-ftrace_traceon_count(unsigned long ip, unsigned long parent_ip, void **data)
+ftrace_traceon_count(unsigned long ip, unsigned long parent_ip,
+                     struct trace_array *tr, struct ftrace_probe_ops *ops,
+                     void *data)
 {
-        update_traceon_count(data, 1);
+        update_traceon_count(ops, ip, tr, 1, data);
 }
 
 static void
-ftrace_traceoff_count(unsigned long ip, unsigned long parent_ip, void **data)
+ftrace_traceoff_count(unsigned long ip, unsigned long parent_ip,
+                      struct trace_array *tr, struct ftrace_probe_ops *ops,
+                      void *data)
 {
-        update_traceon_count(data, 0);
+        update_traceon_count(ops, ip, tr, 0, data);
 }
 
 static void
-ftrace_traceon(unsigned long ip, unsigned long parent_ip, void **data)
+ftrace_traceon(unsigned long ip, unsigned long parent_ip,
+               struct trace_array *tr, struct ftrace_probe_ops *ops,
+               void *data)
 {
-        if (tracing_is_on())
+        if (tracer_tracing_is_on(tr))
                 return;
 
-        tracing_on();
+        tracer_tracing_on(tr);
 }
 
 static void
-ftrace_traceoff(unsigned long ip, unsigned long parent_ip, void **data)
+ftrace_traceoff(unsigned long ip, unsigned long parent_ip,
+                struct trace_array *tr, struct ftrace_probe_ops *ops,
+                void *data)
 {
-        if (!tracing_is_on())
+        if (!tracer_tracing_is_on(tr))
                 return;
 
-        tracing_off();
+        tracer_tracing_off(tr);
 }
 
 /*
@@ -364,144 +375,218 @@ ftrace_traceoff(unsigned long ip, unsigned long parent_ip, void **data)
  */
 #define STACK_SKIP 4
 
+static __always_inline void trace_stack(struct trace_array *tr)
+{
+        unsigned long flags;
+        int pc;
+
+        local_save_flags(flags);
+        pc = preempt_count();
+
+        __trace_stack(tr, flags, STACK_SKIP, pc);
+}
+
 static void
-ftrace_stacktrace(unsigned long ip, unsigned long parent_ip, void **data)
+ftrace_stacktrace(unsigned long ip, unsigned long parent_ip,
+                  struct trace_array *tr, struct ftrace_probe_ops *ops,
+                  void *data)
 {
-        trace_dump_stack(STACK_SKIP);
+        trace_stack(tr);
 }
 
 static void
-ftrace_stacktrace_count(unsigned long ip, unsigned long parent_ip, void **data)
+ftrace_stacktrace_count(unsigned long ip, unsigned long parent_ip,
+                        struct trace_array *tr, struct ftrace_probe_ops *ops,
+                        void *data)
 {
-        long *count = (long *)data;
+        struct ftrace_func_mapper *mapper = data;
+        long *count;
         long old_count;
         long new_count;
 
+        if (!tracing_is_on())
+                return;
+
+        /* unlimited? */
+        if (!mapper) {
+                trace_stack(tr);
+                return;
+        }
+
+        count = (long *)ftrace_func_mapper_find_ip(mapper, ip);
+
         /*
          * Stack traces should only execute the number of times the
          * user specified in the counter.
          */
         do {
-
-                if (!tracing_is_on())
-                        return;
-
                 old_count = *count;
 
                 if (!old_count)
                         return;
 
-                /* unlimited? */
-                if (old_count == -1) {
-                        trace_dump_stack(STACK_SKIP);
-                        return;
-                }
-
                 new_count = old_count - 1;
                 new_count = cmpxchg(count, old_count, new_count);
                 if (new_count == old_count)
-                        trace_dump_stack(STACK_SKIP);
+                        trace_stack(tr);
+
+                if (!tracing_is_on())
+                        return;
 
         } while (new_count != old_count);
 }
 
-static int update_count(void **data)
+static int update_count(struct ftrace_probe_ops *ops, unsigned long ip,
+                        void *data)
 {
-        unsigned long *count = (long *)data;
+        struct ftrace_func_mapper *mapper = data;
+        long *count = NULL;
 
-        if (!*count)
-                return 0;
+        if (mapper)
+                count = (long *)ftrace_func_mapper_find_ip(mapper, ip);
 
-        if (*count != -1)
+        if (count) {
+                if (*count <= 0)
+                        return 0;
                 (*count)--;
+        }
 
         return 1;
 }
 
 static void
-ftrace_dump_probe(unsigned long ip, unsigned long parent_ip, void **data)
+ftrace_dump_probe(unsigned long ip, unsigned long parent_ip,
+                  struct trace_array *tr, struct ftrace_probe_ops *ops,
+                  void *data)
 {
-        if (update_count(data))
+        if (update_count(ops, ip, data))
                 ftrace_dump(DUMP_ALL);
 }
 
 /* Only dump the current CPU buffer. */
 static void
-ftrace_cpudump_probe(unsigned long ip, unsigned long parent_ip, void **data)
+ftrace_cpudump_probe(unsigned long ip, unsigned long parent_ip,
+                     struct trace_array *tr, struct ftrace_probe_ops *ops,
+                     void *data)
 {
-        if (update_count(data))
+        if (update_count(ops, ip, data))
                 ftrace_dump(DUMP_ORIG);
 }
 
 static int
 ftrace_probe_print(const char *name, struct seq_file *m,
-                   unsigned long ip, void *data)
+                   unsigned long ip, struct ftrace_probe_ops *ops,
+                   void *data)
 {
-        long count = (long)data;
+        struct ftrace_func_mapper *mapper = data;
+        long *count = NULL;
 
         seq_printf(m, "%ps:%s", (void *)ip, name);
 
-        if (count == -1)
-                seq_puts(m, ":unlimited\n");
+        if (mapper)
+                count = (long *)ftrace_func_mapper_find_ip(mapper, ip);
+
+        if (count)
+                seq_printf(m, ":count=%ld\n", *count);
         else
-                seq_printf(m, ":count=%ld\n", count);
+                seq_puts(m, ":unlimited\n");
 
         return 0;
 }
 
 static int
 ftrace_traceon_print(struct seq_file *m, unsigned long ip,
-                         struct ftrace_probe_ops *ops, void *data)
+                     struct ftrace_probe_ops *ops,
+                     void *data)
 {
-        return ftrace_probe_print("traceon", m, ip, data);
+        return ftrace_probe_print("traceon", m, ip, ops, data);
 }
 
 static int
 ftrace_traceoff_print(struct seq_file *m, unsigned long ip,
                          struct ftrace_probe_ops *ops, void *data)
 {
-        return ftrace_probe_print("traceoff", m, ip, data);
+        return ftrace_probe_print("traceoff", m, ip, ops, data);
 }
 
 static int
 ftrace_stacktrace_print(struct seq_file *m, unsigned long ip,
                         struct ftrace_probe_ops *ops, void *data)
 {
-        return ftrace_probe_print("stacktrace", m, ip, data);
+        return ftrace_probe_print("stacktrace", m, ip, ops, data);
 }
 
 static int
 ftrace_dump_print(struct seq_file *m, unsigned long ip,
                         struct ftrace_probe_ops *ops, void *data)
 {
-        return ftrace_probe_print("dump", m, ip, data);
+        return ftrace_probe_print("dump", m, ip, ops, data);
 }
 
 static int
 ftrace_cpudump_print(struct seq_file *m, unsigned long ip,
                         struct ftrace_probe_ops *ops, void *data)
 {
-        return ftrace_probe_print("cpudump", m, ip, data);
+        return ftrace_probe_print("cpudump", m, ip, ops, data);
+}
+
+
+static int
+ftrace_count_init(struct ftrace_probe_ops *ops, struct trace_array *tr,
+                  unsigned long ip, void *init_data, void **data)
+{
+        struct ftrace_func_mapper *mapper = *data;
+
+        if (!mapper) {
+                mapper = allocate_ftrace_func_mapper();
+                if (!mapper)
+                        return -ENOMEM;
+                *data = mapper;
+        }
+
+        return ftrace_func_mapper_add_ip(mapper, ip, init_data);
+}
+
+static void
+ftrace_count_free(struct ftrace_probe_ops *ops, struct trace_array *tr,
+                  unsigned long ip, void *data)
+{
+        struct ftrace_func_mapper *mapper = data;
+
+        if (!ip) {
+                free_ftrace_func_mapper(mapper, NULL);
+                return;
+        }
+
+        ftrace_func_mapper_remove_ip(mapper, ip);
 }
 
 static struct ftrace_probe_ops traceon_count_probe_ops = {
         .func                   = ftrace_traceon_count,
         .print                  = ftrace_traceon_print,
+        .init                   = ftrace_count_init,
+        .free                   = ftrace_count_free,
 };
 
 static struct ftrace_probe_ops traceoff_count_probe_ops = {
         .func                   = ftrace_traceoff_count,
         .print                  = ftrace_traceoff_print,
+        .init                   = ftrace_count_init,
+        .free                   = ftrace_count_free,
 };
 
 static struct ftrace_probe_ops stacktrace_count_probe_ops = {
         .func                   = ftrace_stacktrace_count,
         .print                  = ftrace_stacktrace_print,
+        .init                   = ftrace_count_init,
+        .free                   = ftrace_count_free,
 };
 
 static struct ftrace_probe_ops dump_probe_ops = {
         .func                   = ftrace_dump_probe,
         .print                  = ftrace_dump_print,
+        .init                   = ftrace_count_init,
+        .free                   = ftrace_count_free,
 };
 
 static struct ftrace_probe_ops cpudump_probe_ops = {
@@ -525,7 +610,8 @@ static struct ftrace_probe_ops stacktrace_probe_ops = {
 };
 
 static int
-ftrace_trace_probe_callback(struct ftrace_probe_ops *ops,
+ftrace_trace_probe_callback(struct trace_array *tr,
+                            struct ftrace_probe_ops *ops,
                             struct ftrace_hash *hash, char *glob,
                             char *cmd, char *param, int enable)
 {
@@ -537,10 +623,8 @@ ftrace_trace_probe_callback(struct ftrace_probe_ops *ops,
         if (!enable)
                 return -EINVAL;
 
-        if (glob[0] == '!') {
-                unregister_ftrace_function_probe_func(glob+1, ops);
-                return 0;
-        }
+        if (glob[0] == '!')
+                return unregister_ftrace_function_probe_func(glob+1, tr, ops);
 
         if (!param)
                 goto out_reg;
@@ -559,13 +643,13 @@ ftrace_trace_probe_callback(struct ftrace_probe_ops *ops,
                 return ret;
 
  out_reg:
-        ret = register_ftrace_function_probe(glob, ops, count);
+        ret = register_ftrace_function_probe(glob, tr, ops, count);
 
         return ret < 0 ? ret : 0;
 }
 
 static int
-ftrace_trace_onoff_callback(struct ftrace_hash *hash,
+ftrace_trace_onoff_callback(struct trace_array *tr, struct ftrace_hash *hash,
                             char *glob, char *cmd, char *param, int enable)
 {
         struct ftrace_probe_ops *ops;
@@ -576,24 +660,24 @@ ftrace_trace_onoff_callback(struct ftrace_hash *hash,
         else
                 ops = param ? &traceoff_count_probe_ops : &traceoff_probe_ops;
 
-        return ftrace_trace_probe_callback(ops, hash, glob, cmd,
+        return ftrace_trace_probe_callback(tr, ops, hash, glob, cmd,
                                            param, enable);
 }
 
 static int
-ftrace_stacktrace_callback(struct ftrace_hash *hash,
+ftrace_stacktrace_callback(struct trace_array *tr, struct ftrace_hash *hash,
                            char *glob, char *cmd, char *param, int enable)
 {
         struct ftrace_probe_ops *ops;
 
         ops = param ? &stacktrace_count_probe_ops : &stacktrace_probe_ops;
 
-        return ftrace_trace_probe_callback(ops, hash, glob, cmd,
+        return ftrace_trace_probe_callback(tr, ops, hash, glob, cmd,
                                            param, enable);
 }
 
 static int
-ftrace_dump_callback(struct ftrace_hash *hash,
+ftrace_dump_callback(struct trace_array *tr, struct ftrace_hash *hash,
                            char *glob, char *cmd, char *param, int enable)
 {
         struct ftrace_probe_ops *ops;
@@ -601,12 +685,12 @@ ftrace_dump_callback(struct ftrace_hash *hash,
         ops = &dump_probe_ops;
 
         /* Only dump once. */
-        return ftrace_trace_probe_callback(ops, hash, glob, cmd,
+        return ftrace_trace_probe_callback(tr, ops, hash, glob, cmd,
                                            "1", enable);
 }
 
 static int
-ftrace_cpudump_callback(struct ftrace_hash *hash,
+ftrace_cpudump_callback(struct trace_array *tr, struct ftrace_hash *hash,
                            char *glob, char *cmd, char *param, int enable)
 {
         struct ftrace_probe_ops *ops;
@@ -614,7 +698,7 @@ ftrace_cpudump_callback(struct ftrace_hash *hash,
         ops = &cpudump_probe_ops;
 
         /* Only dump once. */
-        return ftrace_trace_probe_callback(ops, hash, glob, cmd,
+        return ftrace_trace_probe_callback(tr, ops, hash, glob, cmd,
                                            "1", enable);
 }
 
@@ -687,9 +771,8 @@ static inline int init_func_cmd_traceon(void)
 }
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
-static __init int init_function_trace(void)
+__init int init_function_trace(void)
 {
         init_func_cmd_traceon();
         return register_tracer(&function_trace);
 }
-core_initcall(init_function_trace);