Merge tag 'trace-v6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...

[sfrench/cifs-2.6.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 08155f6525540b518af973c1927a039993c23c8c..76466846715588c304bc9f14c17c7d341f7a6b21 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -45,6 +45,10 @@
 #include "trace_output.h"
 #include "trace_stat.h"
 
+/* Flags that do not get reset */
+#define FTRACE_NOCLEAR_FLAGS   (FTRACE_FL_DISABLED | FTRACE_FL_TOUCHED | \
+                                FTRACE_FL_MODIFIED)
+
 #define FTRACE_INVALID_FUNCTION                "__ftrace_invalid_address__"
 
 #define FTRACE_WARN_ON(cond)                   \
@@ -2256,7 +2260,7 @@ static int ftrace_check_record(struct dyn_ftrace *rec, bool enable, bool update)
                flag ^= rec->flags & FTRACE_FL_ENABLED;
 
                if (update) {
-                       rec->flags |= FTRACE_FL_ENABLED;
+                       rec->flags |= FTRACE_FL_ENABLED | FTRACE_FL_TOUCHED;
                        if (flag & FTRACE_FL_REGS) {
                                if (rec->flags & FTRACE_FL_REGS)
                                        rec->flags |= FTRACE_FL_REGS_EN;
@@ -2270,6 +2274,10 @@ static int ftrace_check_record(struct dyn_ftrace *rec, bool enable, bool update)
                                        rec->flags &= ~FTRACE_FL_TRAMP_EN;
                        }
 
+                       /* Keep track of anything that modifies the function */
+                       if (rec->flags & (FTRACE_FL_DIRECT | FTRACE_FL_IPMODIFY))
+                               rec->flags |= FTRACE_FL_MODIFIED;
+
                        if (flag & FTRACE_FL_DIRECT) {
                                /*
                                 * If there's only one user (direct_ops helper)
@@ -2326,7 +2334,7 @@ static int ftrace_check_record(struct dyn_ftrace *rec, bool enable, bool update)
        if (update) {
                /* If there's no more users, clear all flags */
                if (!ftrace_rec_count(rec))
-                       rec->flags &= FTRACE_FL_DISABLED;
+                       rec->flags &= FTRACE_NOCLEAR_FLAGS;
                else
                        /*
                         * Just disable the record, but keep the ops TRAMP
@@ -3147,7 +3155,7 @@ int ftrace_shutdown(struct ftrace_ops *ops, int command)
                struct dyn_ftrace *rec;
 
                do_for_each_ftrace_rec(pg, rec) {
-                       if (FTRACE_WARN_ON_ONCE(rec->flags & ~FTRACE_FL_DISABLED))
+                       if (FTRACE_WARN_ON_ONCE(rec->flags & ~FTRACE_NOCLEAR_FLAGS))
                                pr_warn("  %pS flags:%lx\n",
                                        (void *)rec->ip, rec->flags);
                } while_for_each_ftrace_rec();
@@ -3598,7 +3606,10 @@ t_func_next(struct seq_file *m, loff_t *pos)
                     !ftrace_lookup_ip(iter->hash, rec->ip)) ||
 
                    ((iter->flags & FTRACE_ITER_ENABLED) &&
-                    !(rec->flags & FTRACE_FL_ENABLED))) {
+                    !(rec->flags & FTRACE_FL_ENABLED)) ||
+
+                   ((iter->flags & FTRACE_ITER_TOUCHED) &&
+                    !(rec->flags & FTRACE_FL_TOUCHED))) {
 
                        rec = NULL;
                        goto retry;
@@ -3857,15 +3868,16 @@ static int t_show(struct seq_file *m, void *v)
                return 0;
        }
 
-       if (iter->flags & FTRACE_ITER_ENABLED) {
+       if (iter->flags & (FTRACE_ITER_ENABLED | FTRACE_ITER_TOUCHED)) {
                struct ftrace_ops *ops;
 
-               seq_printf(m, " (%ld)%s%s%s%s",
+               seq_printf(m, " (%ld)%s%s%s%s%s",
                           ftrace_rec_count(rec),
                           rec->flags & FTRACE_FL_REGS ? " R" : "  ",
                           rec->flags & FTRACE_FL_IPMODIFY ? " I" : "  ",
                           rec->flags & FTRACE_FL_DIRECT ? " D" : "  ",
-                          rec->flags & FTRACE_FL_CALL_OPS ? " O" : "  ");
+                          rec->flags & FTRACE_FL_CALL_OPS ? " O" : "  ",
+                          rec->flags & FTRACE_FL_MODIFIED ? " M " : "   ");
                if (rec->flags & FTRACE_FL_TRAMP_EN) {
                        ops = ftrace_find_tramp_ops_any(rec);
                        if (ops) {
@@ -3959,6 +3971,31 @@ ftrace_enabled_open(struct inode *inode, struct file *file)
        return 0;
 }
 
+static int
+ftrace_touched_open(struct inode *inode, struct file *file)
+{
+       struct ftrace_iterator *iter;
+
+       /*
+        * This shows us what functions have ever been enabled
+        * (traced, direct, patched, etc). Not sure if we want lockdown
+        * to hide such critical information for an admin.
+        * Although, perhaps it can show information we don't
+        * want people to see, but if something had traced
+        * something, we probably want to know about it.
+        */
+
+       iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
+       if (!iter)
+               return -ENOMEM;
+
+       iter->pg = ftrace_pages_start;
+       iter->flags = FTRACE_ITER_TOUCHED;
+       iter->ops = &global_ops;
+
+       return 0;
+}
+
 /**
  * ftrace_regex_open - initialize function tracer filter files
  * @ops: The ftrace_ops that hold the hash filters
@@ -5872,6 +5909,13 @@ static const struct file_operations ftrace_enabled_fops = {
        .release = seq_release_private,
 };
 
+static const struct file_operations ftrace_touched_fops = {
+       .open = ftrace_touched_open,
+       .read = seq_read,
+       .llseek = seq_lseek,
+       .release = seq_release_private,
+};
+
 static const struct file_operations ftrace_filter_fops = {
        .open = ftrace_filter_open,
        .read = seq_read,
@@ -6336,6 +6380,9 @@ static __init int ftrace_init_dyn_tracefs(struct dentry *d_tracer)
        trace_create_file("enabled_functions", TRACE_MODE_READ,
                        d_tracer, NULL, &ftrace_enabled_fops);
 
+       trace_create_file("touched_functions", TRACE_MODE_READ,
+                       d_tracer, NULL, &ftrace_touched_fops);
+
        ftrace_create_filter_files(&global_ops, d_tracer);
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER