[PATCH 04/11] ftrace/hash: add private data field

[Changbin Du]

We will reuse ftrace_hash to lookup function prototype information. So
we need an additional field to bind ftrace_func_entry to prototype
information.

Signed-off-by: Changbin Du <changbin...@gmail.com>
---
 kernel/trace/ftrace.c | 17 +++++++----------
 kernel/trace/trace.h  |  6 ++++++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index eca34503f178..a314f0768b2c 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1017,11 +1017,6 @@ static bool update_all_ops;
 # error Dynamic ftrace depends on MCOUNT_RECORD
 #endif
 
-struct ftrace_func_entry {
-       struct hlist_node hlist;
-       unsigned long ip;
-};
-
 struct ftrace_func_probe {
        struct ftrace_probe_ops *probe_ops;
        struct ftrace_ops       ops;
@@ -1169,7 +1164,8 @@ static void __add_hash_entry(struct ftrace_hash *hash,
        hash->count++;
 }
 
-static int add_hash_entry(struct ftrace_hash *hash, unsigned long ip)
+static int add_hash_entry(struct ftrace_hash *hash, unsigned long ip,
+                         void *priv)
 {
        struct ftrace_func_entry *entry;
 
@@ -1178,6 +1174,7 @@ static int add_hash_entry(struct ftrace_hash *hash, 
unsigned long ip)
                return -ENOMEM;
 
        entry->ip = ip;
+       entry->priv = priv;
        __add_hash_entry(hash, entry);
 
        return 0;
@@ -1346,7 +1343,7 @@ alloc_and_copy_ftrace_hash(int size_bits, struct 
ftrace_hash *hash)
        size = 1 << hash->size_bits;
        for (i = 0; i < size; i++) {
                hlist_for_each_entry(entry, &hash->buckets[i], hlist) {
-                       ret = add_hash_entry(new_hash, entry->ip);
+                       ret = add_hash_entry(new_hash, entry->ip, NULL);
                        if (ret < 0)
                                goto free_hash;
                }
@@ -3694,7 +3691,7 @@ enter_record(struct ftrace_hash *hash, struct dyn_ftrace 
*rec, int clear_filter)
                if (entry)
                        return 0;
 
-               ret = add_hash_entry(hash, rec->ip);
+               ret = add_hash_entry(hash, rec->ip, NULL);
        }
        return ret;
 }
@@ -4700,7 +4697,7 @@ ftrace_match_addr(struct ftrace_hash *hash, unsigned long 
ip, int remove)
                return 0;
        }
 
-       return add_hash_entry(hash, ip);
+       return add_hash_entry(hash, ip, NULL);
 }
 
 static int
@@ -5380,7 +5377,7 @@ ftrace_graph_set_hash(struct ftrace_hash *hash, char 
*buffer)
 
                                if (entry)
                                        continue;
-                               if (add_hash_entry(hash, rec->ip) < 0)
+                               if (add_hash_entry(hash, rec->ip, NULL) < 0)
                                        goto out;
                        } else {
                                if (entry) {
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 005f08629b8b..ad619c73a505 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -882,6 +882,12 @@ struct ftrace_hash {
        struct rcu_head         rcu;
 };
 
+struct ftrace_func_entry {
+       struct hlist_node hlist;
+       unsigned long ip;
+       void *priv;
+};
+
 struct ftrace_func_entry *
 ftrace_lookup_ip(struct ftrace_hash *hash, unsigned long ip);
 
-- 
2.20.1