ftrace: Decouple hash items from showing filtered functions

The set_ftrace_filter shows "hashed" functions, which are functions
that are added with operations to them (like traceon and traceoff).

As other subsystems may be able to show what functions they are
using for function tracing, the hash items should no longer
be shown just because the FILTER flag is set. As they have nothing
to do with other subsystems filters.

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

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index aa7559f0a2244205fff7abb63d5c77fd1ddfeefb..d1ff0de18970132e25ea1258f036057f84441267 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -206,8 +206,9 @@ enum {
        FTRACE_ITER_FILTER      = (1 << 0),
        FTRACE_ITER_NOTRACE     = (1 << 1),
        FTRACE_ITER_PRINTALL    = (1 << 2),
-       FTRACE_ITER_HASH        = (1 << 3),
-       FTRACE_ITER_ENABLED     = (1 << 4),
+       FTRACE_ITER_DO_HASH     = (1 << 3),
+       FTRACE_ITER_HASH        = (1 << 4),
+       FTRACE_ITER_ENABLED     = (1 << 5),
 };
 
 void arch_ftrace_update_code(int command);

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 5b105c5ddc0c8f946c71c0896af4f72a7a2ffbf4..5728d9aa632e3c47aafe1869311a98a0743b96fa 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2198,6 +2198,9 @@ static void *t_hash_start(struct seq_file *m, loff_t *pos)
        void *p = NULL;
        loff_t l;
 
+       if (!(iter->flags & FTRACE_ITER_DO_HASH))
+               return NULL;
+
        if (iter->func_pos > *pos)
                return NULL;
 
@@ -2343,12 +2346,8 @@ static void *t_start(struct seq_file *m, loff_t *pos)
                        break;
        }
 
-       if (!p) {
-               if (iter->flags & FTRACE_ITER_FILTER)
-                       return t_hash_start(m, pos);
-
-               return NULL;
-       }
+       if (!p)
+               return t_hash_start(m, pos);
 
        return iter;
 }
@@ -2541,8 +2540,9 @@ ftrace_regex_open(struct ftrace_ops *ops, int flag,
 static int
 ftrace_filter_open(struct inode *inode, struct file *file)
 {
-       return ftrace_regex_open(&global_ops, FTRACE_ITER_FILTER,
-                                inode, file);
+       return ftrace_regex_open(&global_ops,
+                       FTRACE_ITER_FILTER | FTRACE_ITER_DO_HASH,
+                       inode, file);
 }
 
 static int