ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code()

To remove duplicate code, have the ftrace arch_ftrace_update_code()
use the generic ftrace_modify_all_code(). This requires that the
default ftrace_replace_code() becomes a weak function so that an
arch may override it.

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

diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 4243e8bbdcb1b9f836f0a2927f2403ded6417019..32ff36596ab10d65d8d5050402eb8d24a5f3fb6f 100644 (file)
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -435,7 +435,7 @@ static void run_sync(void)
                local_irq_disable();
 }
 
                local_irq_disable();
 }
 

-static void ftrace_replace_code(int enable)
+void ftrace_replace_code(int enable)

 {
        struct ftrace_rec_iter *iter;
        struct dyn_ftrace *rec;
 {
        struct ftrace_rec_iter *iter;
        struct dyn_ftrace *rec;


@@ -493,18 +493,7 @@ void arch_ftrace_update_code(int command)
 {
        modifying_ftrace_code++;
 
 {
        modifying_ftrace_code++;
 

-       if (command & FTRACE_UPDATE_CALLS)
-               ftrace_replace_code(1);
-       else if (command & FTRACE_DISABLE_CALLS)
-               ftrace_replace_code(0);
-
-       if (command & FTRACE_UPDATE_TRACE_FUNC)
-               ftrace_update_ftrace_func(ftrace_trace_function);
-
-       if (command & FTRACE_START_FUNC_RET)
-               ftrace_enable_ftrace_graph_caller();
-       else if (command & FTRACE_STOP_FUNC_RET)
-               ftrace_disable_ftrace_graph_caller();
+       ftrace_modify_all_code(command);

 
        modifying_ftrace_code--;
 }
 
        modifying_ftrace_code--;
 }

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index cd72ace7ade3bab132c0e24a48672e357ebf06f4..55e6d63d46d0e6593d3753dcd6c572a64cca728d 100644 (file)
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -314,6 +314,7 @@ ftrace_set_early_filter(struct ftrace_ops *ops, char *buf, int enable);
 /* defined in arch */
 extern int ftrace_ip_converted(unsigned long ip);
 extern int ftrace_dyn_arch_init(void *data);
 /* defined in arch */
 extern int ftrace_ip_converted(unsigned long ip);
 extern int ftrace_dyn_arch_init(void *data);

+extern void ftrace_replace_code(int enable);

 extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
 extern void ftrace_call(void);
 extern int ftrace_update_ftrace_func(ftrace_func_t func);
 extern void ftrace_caller(void);
 extern void ftrace_call(void);

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 3c345825cc23de01344463bfcdbf8a5529cffd06..a008663d86c8e740c64c1cc26977a7a199917b9b 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1683,7 +1683,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)
        return -1; /* unknow ftrace bug */
 }
 
        return -1; /* unknow ftrace bug */
 }
 

-static void ftrace_replace_code(int update)
+void __weak ftrace_replace_code(int enable)

 {
        struct dyn_ftrace *rec;
        struct ftrace_page *pg;
 {
        struct dyn_ftrace *rec;
        struct ftrace_page *pg;


@@ -1693,7 +1693,7 @@ static void ftrace_replace_code(int update)
                return;
 
        do_for_each_ftrace_rec(pg, rec) {
                return;
 
        do_for_each_ftrace_rec(pg, rec) {

-               failed = __ftrace_replace_code(rec, update);
+               failed = __ftrace_replace_code(rec, enable);

                if (failed) {
                        ftrace_bug(failed, rec->ip);
                        /* Stop processing */
                if (failed) {
                        ftrace_bug(failed, rec->ip);
                        /* Stop processing */