| Message ID | 20180223165849.16388-2-alexander.sverdlin@nokia.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
| Series | ARM: Implement MODULE_PLT support in FTRACE | expand |
Hi Alexander,
I love your patch! Yet something to improve:
[auto build test ERROR on tip/perf/core]
[also build test ERROR on v4.16-rc2 next-20180223]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Alexander-Sverdlin/ARM-Implement-MODULE_PLT-support-in-FTRACE/20180225-191957
config: x86_64-randconfig-x011-201808 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All error/warnings (new ones prefixed by >>):
kernel/trace/ftrace.c: In function 'ftrace_module_enable':
>> kernel/trace/ftrace.c:5851:39: error: passing argument 1 of '__ftrace_replace_code' from incompatible pointer type [-Werror=incompatible-pointer-types]
int failed = __ftrace_replace_code(rec, 1);
^~~
kernel/trace/ftrace.c:2424:1: note: expected 'struct module *' but argument is of type 'struct dyn_ftrace *'
__ftrace_replace_code(struct module *mod, struct dyn_ftrace *rec, int enable)
^~~~~~~~~~~~~~~~~~~~~
>> kernel/trace/ftrace.c:5851:44: warning: passing argument 2 of '__ftrace_replace_code' makes pointer from integer without a cast [-Wint-conversion]
int failed = __ftrace_replace_code(rec, 1);
^
kernel/trace/ftrace.c:2424:1: note: expected 'struct dyn_ftrace *' but argument is of type 'int'
__ftrace_replace_code(struct module *mod, struct dyn_ftrace *rec, int enable)
^~~~~~~~~~~~~~~~~~~~~
>> kernel/trace/ftrace.c:5851:17: error: too few arguments to function '__ftrace_replace_code'
int failed = __ftrace_replace_code(rec, 1);
^~~~~~~~~~~~~~~~~~~~~
kernel/trace/ftrace.c:2424:1: note: declared here
__ftrace_replace_code(struct module *mod, struct dyn_ftrace *rec, int enable)
^~~~~~~~~~~~~~~~~~~~~
cc1: some warnings being treated as errors
vim +/__ftrace_replace_code +5851 kernel/trace/ftrace.c
93eb677d Steven Rostedt 2009-04-15 5797
7dcd182b Jessica Yu 2016-02-16 5798 void ftrace_module_enable(struct module *mod)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5799) {
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5800) struct dyn_ftrace *rec;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5801) struct ftrace_page *pg;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5802)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5803) mutex_lock(&ftrace_lock);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5804)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5805) if (ftrace_disabled)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5806) goto out_unlock;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5807)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5808) /*
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5809) * If the tracing is enabled, go ahead and enable the record.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5810) *
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5811) * The reason not to enable the record immediatelly is the
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5812) * inherent check of ftrace_make_nop/ftrace_make_call for
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5813) * correct previous instructions. Making first the NOP
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5814) * conversion puts the module to the correct state, thus
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5815) * passing the ftrace_make_call check.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5816) *
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5817) * We also delay this to after the module code already set the
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5818) * text to read-only, as we now need to set it back to read-write
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5819) * so that we can modify the text.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5820) */
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5821) if (ftrace_start_up)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5822) ftrace_arch_code_modify_prepare();
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5823)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5824) do_for_each_ftrace_rec(pg, rec) {
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5825) int cnt;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5826) /*
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5827) * do_for_each_ftrace_rec() is a double loop.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5828) * module text shares the pg. If a record is
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5829) * not part of this module, then skip this pg,
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5830) * which the "break" will do.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5831) */
3e234289 Steven Rostedt (VMware 2017-03-03 5832) if (!within_module_core(rec->ip, mod) &&
3e234289 Steven Rostedt (VMware 2017-03-03 5833) !within_module_init(rec->ip, mod))
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5834) break;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5835)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5836) cnt = 0;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5837)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5838) /*
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5839) * When adding a module, we need to check if tracers are
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5840) * currently enabled and if they are, and can trace this record,
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5841) * we need to enable the module functions as well as update the
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5842) * reference counts for those function records.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5843) */
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5844) if (ftrace_start_up)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5845) cnt += referenced_filters(rec);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5846)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5847) /* This clears FTRACE_FL_DISABLED */
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5848) rec->flags = cnt;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5849)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5850) if (ftrace_start_up && cnt) {
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 @5851) int failed = __ftrace_replace_code(rec, 1);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5852) if (failed) {
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5853) ftrace_bug(failed, rec);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5854) goto out_loop;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5855) }
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5856) }
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5857)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5858) } while_for_each_ftrace_rec();
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5859)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5860) out_loop:
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5861) if (ftrace_start_up)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5862) ftrace_arch_code_modify_post_process();
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5863)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5864) out_unlock:
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5865) mutex_unlock(&ftrace_lock);
d7fbf8df Steven Rostedt (VMware 2017-06-26 5866)
d7fbf8df Steven Rostedt (VMware 2017-06-26 5867) process_cached_mods(mod->name);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5868) }
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5869)
:::::: The code at line 5851 was first introduced by commit
:::::: b7ffffbb46f205e7727a18bcc7a46c3c2b534f7c ftrace: Add infrastructure for delayed enabling of module functions
:::::: TO: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
:::::: CC: Steven Rostedt <rostedt@goodmis.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Hi Alexander,
I love your patch! Perhaps something to improve:
[auto build test WARNING on tip/perf/core]
[also build test WARNING on v4.16-rc2 next-20180223]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Alexander-Sverdlin/ARM-Implement-MODULE_PLT-support-in-FTRACE/20180225-191957
config: i386-randconfig-h1-02251623 (attached as .config)
compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4
reproduce:
# save the attached .config to linux build tree
make ARCH=i386
All warnings (new ones prefixed by >>):
kernel/trace/ftrace.c: In function 'ftrace_module_enable':
>> kernel/trace/ftrace.c:5851:39: warning: passing argument 1 of '__ftrace_replace_code' from incompatible pointer type
int failed = __ftrace_replace_code(rec, 1);
^
kernel/trace/ftrace.c:2424:1: note: expected 'struct module *' but argument is of type 'struct dyn_ftrace *'
__ftrace_replace_code(struct module *mod, struct dyn_ftrace *rec, int enable)
^
kernel/trace/ftrace.c:5851:44: warning: passing argument 2 of '__ftrace_replace_code' makes pointer from integer without a cast
int failed = __ftrace_replace_code(rec, 1);
^
kernel/trace/ftrace.c:2424:1: note: expected 'struct dyn_ftrace *' but argument is of type 'int'
__ftrace_replace_code(struct module *mod, struct dyn_ftrace *rec, int enable)
^
kernel/trace/ftrace.c:5851:17: error: too few arguments to function '__ftrace_replace_code'
int failed = __ftrace_replace_code(rec, 1);
^
kernel/trace/ftrace.c:2424:1: note: declared here
__ftrace_replace_code(struct module *mod, struct dyn_ftrace *rec, int enable)
^
vim +/__ftrace_replace_code +5851 kernel/trace/ftrace.c
93eb677d Steven Rostedt 2009-04-15 5797
7dcd182b Jessica Yu 2016-02-16 5798 void ftrace_module_enable(struct module *mod)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5799) {
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5800) struct dyn_ftrace *rec;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5801) struct ftrace_page *pg;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5802)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5803) mutex_lock(&ftrace_lock);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5804)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5805) if (ftrace_disabled)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5806) goto out_unlock;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5807)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5808) /*
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5809) * If the tracing is enabled, go ahead and enable the record.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5810) *
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5811) * The reason not to enable the record immediatelly is the
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5812) * inherent check of ftrace_make_nop/ftrace_make_call for
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5813) * correct previous instructions. Making first the NOP
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5814) * conversion puts the module to the correct state, thus
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5815) * passing the ftrace_make_call check.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5816) *
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5817) * We also delay this to after the module code already set the
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5818) * text to read-only, as we now need to set it back to read-write
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5819) * so that we can modify the text.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5820) */
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5821) if (ftrace_start_up)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5822) ftrace_arch_code_modify_prepare();
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5823)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5824) do_for_each_ftrace_rec(pg, rec) {
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5825) int cnt;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5826) /*
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5827) * do_for_each_ftrace_rec() is a double loop.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5828) * module text shares the pg. If a record is
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5829) * not part of this module, then skip this pg,
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5830) * which the "break" will do.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5831) */
3e234289 Steven Rostedt (VMware 2017-03-03 5832) if (!within_module_core(rec->ip, mod) &&
3e234289 Steven Rostedt (VMware 2017-03-03 5833) !within_module_init(rec->ip, mod))
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5834) break;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5835)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5836) cnt = 0;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5837)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5838) /*
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5839) * When adding a module, we need to check if tracers are
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5840) * currently enabled and if they are, and can trace this record,
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5841) * we need to enable the module functions as well as update the
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5842) * reference counts for those function records.
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5843) */
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5844) if (ftrace_start_up)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5845) cnt += referenced_filters(rec);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5846)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5847) /* This clears FTRACE_FL_DISABLED */
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5848) rec->flags = cnt;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5849)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5850) if (ftrace_start_up && cnt) {
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 @5851) int failed = __ftrace_replace_code(rec, 1);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5852) if (failed) {
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5853) ftrace_bug(failed, rec);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5854) goto out_loop;
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5855) }
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5856) }
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5857)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5858) } while_for_each_ftrace_rec();
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5859)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5860) out_loop:
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5861) if (ftrace_start_up)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5862) ftrace_arch_code_modify_post_process();
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5863)
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5864) out_unlock:
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5865) mutex_unlock(&ftrace_lock);
d7fbf8df Steven Rostedt (VMware 2017-06-26 5866)
d7fbf8df Steven Rostedt (VMware 2017-06-26 5867) process_cached_mods(mod->name);
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5868) }
b7ffffbb Steven Rostedt (Red Hat 2016-01-07 5869)
:::::: The code at line 5851 was first introduced by commit
:::::: b7ffffbb46f205e7727a18bcc7a46c3c2b534f7c ftrace: Add infrastructure for delayed enabling of module functions
:::::: TO: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
:::::: CC: Steven Rostedt <rostedt@goodmis.org>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c index 5617932..be20adc 100644 --- a/arch/arm/kernel/ftrace.c +++ b/arch/arm/kernel/ftrace.c @@ -162,7 +162,8 @@ int ftrace_update_ftrace_func(ftrace_func_t func) return ret; } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long new, old; unsigned long ip = rec->ip; diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c index 50986e3..e3a95d3 100644 --- a/arch/arm64/kernel/ftrace.c +++ b/arch/arm64/kernel/ftrace.c @@ -68,7 +68,8 @@ int ftrace_update_ftrace_func(ftrace_func_t func) /* * Turn on the call to ftrace_caller() in instrumented function */ -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long pc = rec->ip; u32 old, new; diff --git a/arch/blackfin/kernel/ftrace.c b/arch/blackfin/kernel/ftrace.c index 8dad758..61ffc99 100644 --- a/arch/blackfin/kernel/ftrace.c +++ b/arch/blackfin/kernel/ftrace.c @@ -45,7 +45,8 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, return ftrace_modify_code(rec->ip, mnop, sizeof(mnop)); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { /* Restore the mcount call site */ unsigned char call[8]; diff --git a/arch/ia64/kernel/ftrace.c b/arch/ia64/kernel/ftrace.c index cee411e..658a011 100644 --- a/arch/ia64/kernel/ftrace.c +++ b/arch/ia64/kernel/ftrace.c @@ -169,7 +169,8 @@ int ftrace_make_nop(struct module *mod, return ftrace_modify_code(rec->ip, NULL, new, 0); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long ip = rec->ip; unsigned char *old, *new; diff --git a/arch/metag/kernel/ftrace.c b/arch/metag/kernel/ftrace.c index f7b23d3..635652a 100644 --- a/arch/metag/kernel/ftrace.c +++ b/arch/metag/kernel/ftrace.c @@ -104,7 +104,8 @@ int ftrace_make_nop(struct module *mod, return ftrace_modify_code(ip, old, new); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned char *new, *old; unsigned long ip = rec->ip; diff --git a/arch/microblaze/kernel/ftrace.c b/arch/microblaze/kernel/ftrace.c index d57563c..01b314a 100644 --- a/arch/microblaze/kernel/ftrace.c +++ b/arch/microblaze/kernel/ftrace.c @@ -161,7 +161,8 @@ int ftrace_make_nop(struct module *mod, } /* I believe that first is called ftrace_make_nop before this function */ -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { int ret; pr_debug("%s: addr:0x%x, rec->ip: 0x%x, imm:0x%x\n", diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c index 7f3dfdb..9dcec19 100644 --- a/arch/mips/kernel/ftrace.c +++ b/arch/mips/kernel/ftrace.c @@ -200,7 +200,8 @@ int ftrace_make_nop(struct module *mod, #endif } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned int new; unsigned long ip = rec->ip; diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c index 4741fe1..b198433 100644 --- a/arch/powerpc/kernel/trace/ftrace.c +++ b/arch/powerpc/kernel/trace/ftrace.c @@ -437,7 +437,8 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) #endif /* CONFIG_PPC64 */ #endif /* CONFIG_MODULES */ -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long ip = rec->ip; unsigned int old, new; diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c index dc76d81..1691d53 100644 --- a/arch/s390/kernel/ftrace.c +++ b/arch/s390/kernel/ftrace.c @@ -136,7 +136,8 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, return 0; } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { struct ftrace_insn orig, new, old; diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c index 96dd9f7..2d3cacd 100644 --- a/arch/sh/kernel/ftrace.c +++ b/arch/sh/kernel/ftrace.c @@ -242,7 +242,8 @@ int ftrace_make_nop(struct module *mod, return ftrace_modify_code(rec->ip, old, new); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned char *new, *old; unsigned long ip = rec->ip; diff --git a/arch/sparc/kernel/ftrace.c b/arch/sparc/kernel/ftrace.c index 915dda4..36117b5 100644 --- a/arch/sparc/kernel/ftrace.c +++ b/arch/sparc/kernel/ftrace.c @@ -63,7 +63,8 @@ int ftrace_make_nop(struct module *mod, struct dyn_ftrace *rec, unsigned long ad return ftrace_modify_code(ip, old, new); } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long ip = rec->ip; u32 old, new; diff --git a/arch/tile/kernel/ftrace.c b/arch/tile/kernel/ftrace.c index b827a41..749e50f 100644 --- a/arch/tile/kernel/ftrace.c +++ b/arch/tile/kernel/ftrace.c @@ -136,7 +136,8 @@ int ftrace_update_ftrace_func(ftrace_func_t func) return ret; } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned long new, old; unsigned long ip = rec->ip; diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 01ebcb6..389f15c 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -162,7 +162,8 @@ int ftrace_make_nop(struct module *mod, return -EINVAL; } -int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) +int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr) { unsigned const char *new, *old; unsigned long ip = rec->ip; diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 9c3c9a3..1e8c421 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -536,6 +536,7 @@ extern int ftrace_make_nop(struct module *mod, /** * ftrace_make_call - convert a nop call site into a call to addr + * @mod: module structure if called by module load initialization * @rec: the mcount call site record * @addr: the address that the call site should call * @@ -554,7 +555,8 @@ extern int ftrace_make_nop(struct module *mod, * -EPERM on error writing to the location * Any other value will be considered a failure. */ -extern int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr); +extern int ftrace_make_call(struct module *mod, struct dyn_ftrace *rec, + unsigned long addr); #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS /** diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index eac9ce2..d32f2f5 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -2421,7 +2421,7 @@ unsigned long ftrace_get_addr_curr(struct dyn_ftrace *rec) } static int -__ftrace_replace_code(struct dyn_ftrace *rec, int enable) +__ftrace_replace_code(struct module *mod, struct dyn_ftrace *rec, int enable) { unsigned long ftrace_old_addr; unsigned long ftrace_addr; @@ -2442,7 +2442,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) case FTRACE_UPDATE_MAKE_CALL: ftrace_bug_type = FTRACE_BUG_CALL; - return ftrace_make_call(rec, ftrace_addr); + return ftrace_make_call(mod, rec, ftrace_addr); case FTRACE_UPDATE_MAKE_NOP: ftrace_bug_type = FTRACE_BUG_NOP; @@ -2470,7 +2470,7 @@ void __weak ftrace_replace_code(int enable) if (rec->flags & FTRACE_FL_DISABLED) continue; - failed = __ftrace_replace_code(rec, enable); + failed = __ftrace_replace_code(NULL, rec, enable); if (failed) { ftrace_bug(failed, rec); /* Stop processing */
ARM support for modules' PLTs will require a module pointer in ftrace_make_call() exactly as ftrace_make_nop() has it. Change the function signature without functional change for now. Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> --- arch/arm/kernel/ftrace.c | 3 ++- arch/arm64/kernel/ftrace.c | 3 ++- arch/blackfin/kernel/ftrace.c | 3 ++- arch/ia64/kernel/ftrace.c | 3 ++- arch/metag/kernel/ftrace.c | 3 ++- arch/microblaze/kernel/ftrace.c | 3 ++- arch/mips/kernel/ftrace.c | 3 ++- arch/powerpc/kernel/trace/ftrace.c | 3 ++- arch/s390/kernel/ftrace.c | 3 ++- arch/sh/kernel/ftrace.c | 3 ++- arch/sparc/kernel/ftrace.c | 3 ++- arch/tile/kernel/ftrace.c | 3 ++- arch/x86/kernel/ftrace.c | 3 ++- include/linux/ftrace.h | 4 +++- kernel/trace/ftrace.c | 6 +++--- 15 files changed, 32 insertions(+), 17 deletions(-)