diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-03-03 18:00:22 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-10-05 17:57:30 -0400 |
| commit | 3e234289f86b12985ef8909cd34525fcb66c4efb (patch) | |
| tree | f72cbdc94ec14dd0504314fb4d316bf03b13367f /kernel | |
| parent | 6cafbe159416822f6d3dfd711bf4c39050c650ba (diff) | |
| download | op-kernel-dev-3e234289f86b12985ef8909cd34525fcb66c4efb.zip op-kernel-dev-3e234289f86b12985ef8909cd34525fcb66c4efb.tar.gz | |
ftrace: Allow module init functions to be traced
Allow for module init sections to be traced as well as core kernel init
sections. Now that filtering modules functions can be stored, for when they
are loaded, it makes sense to be able to trace them.
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 2 | ||||
| -rw-r--r-- | kernel/trace/ftrace.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index de66ec8..58bca42 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3473,6 +3473,8 @@ static noinline int do_init_module(struct module *mod) if (!mod->async_probe_requested && (current->flags & PF_USED_ASYNC)) async_synchronize_full(); + ftrace_free_mem(mod->init_layout.base, mod->init_layout.base + + mod->init_layout.size); mutex_lock(&module_mutex); /* Drop initial reference. */ module_put(mod); diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 84cb592..d7297e8 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -5752,7 +5752,8 @@ void ftrace_release_mod(struct module *mod) last_pg = &ftrace_pages_start; for (pg = ftrace_pages_start; pg; pg = *last_pg) { rec = &pg->records[0]; - if (within_module_core(rec->ip, mod)) { + if (within_module_core(rec->ip, mod) || + within_module_init(rec->ip, mod)) { /* * As core pages are first, the first * page should never be a module page. @@ -5821,7 +5822,8 @@ void ftrace_module_enable(struct module *mod) * not part of this module, then skip this pg, * which the "break" will do. */ - if (!within_module_core(rec->ip, mod)) + if (!within_module_core(rec->ip, mod) && + !within_module_init(rec->ip, mod)) break; cnt = 0; |
