tracing - enable records during the module load
PATCH 1/1 tracing - enable records during the module load
I was debuging some module using "function" and "function_graph" tracers and noticed, that if you load module after you enabled tracing, the module's hooks will convert only to NOP instructions.
The attached patch enables modules' hooks if there's function trace allready on, thus allowing to trace module functions.
wbr,
jirka
--- kernel/trace/ftrace.c | 38 ++++++++++++++++++++++++++++++-------- 1 files changed, 30 insertions(+), 8 deletions(-)
kernel/trace/ftrace.c +30 -8
@@ -1261,12 +1261,34 @@ static int ftrace_update_code(struct module *mod) ftrace_new_addrs = p->newlist; p->flags =0L ; -/* convert record (i.e, patch mcount-call with NOP) */ -if (ftrace_code_disable (mod, p)) { - p->flags |=FTRACE_FL_CONVERTED ; - ftrace_update_cnt++; - }else +/* +* Do the initial record convertion from mcount jump +* to the NOP instructions. +*/ +if (!ftrace_code_disable (mod, p)) {ftrace_free_rec (p); +continue ; + } + + p->flags |=FTRACE_FL_CONVERTED ; + ftrace_update_cnt++; + +/* +* If the tracing is enabled, go ahead and enable the record. +* +* The reason not to enable the record immediatelly is the +* inherent check of ftrace_make_nop/ftrace_make_call for +* correct previous instructions. Making first the NOP +* conversion puts the module to the correct state, thus +* passing the ftrace_make_call check. +*/ +if (ftrace_start_up) { +int failed =__ftrace_replace_code (p,1 ); +if (failed) { +ftrace_bug (failed, p->ip); +ftrace_free_rec (p); + } + } } stop =ftrace_now (raw_smp_processor_id ());
@@ -2570,7 +2592,7 @@ static __init int ftrace_init_dyn_debugfs(struct dentry *d_tracer)return 0 ; } -static int ftrace_convert_nops (struct module *mod, +static int ftrace_process_locs (struct module *mod,unsigned long *start,unsigned long *end) {
@@ -2630,7 +2652,7 @@ static void ftrace_init_module(struct module *mod, {if (ftrace_disabled || start == end)return ; -ftrace_convert_nops (mod, start, end); +ftrace_process_locs (mod, start, end); } static int ftrace_module_notify(struct notifier_block *self,
@@ -2691,7 +2713,7 @@ void __init ftrace_init(void) last_ftrace_enabled = ftrace_enabled =1 ; - ret =ftrace_convert_nops (NULL , + ret =ftrace_process_locs (NULL , __start_mcount_loc, __stop_mcount_loc);
Steven Rostedt
maintainerQuoted 3 lines · On Sat, 2009-10-10 at 16:00 +0200, [email protected] wrote:
I was debuging some module using "function" and "
function_graph" tracers and noticed, that if you load module after you enabled tracing, the module's hooks will convert only to NOP instructions.
Yeah, I knew when I wrote this that new modules loaded during tracing would just be initialized as nops, and not become part of that trace. They will become part of later traces if the function tracing is stopped and started again.
Actually, I took that as a safety feature, since most bad things can happen when modules load and unload. But, I think your patch is still safe. I'll apply it, play with it a bit, then queue it up for 2.6.33.
Thanks,
-- Steve
Quoted 3 lines
The attached patch enables modules' hooks if there's function trace allready on, thus allowing to trace module functions.
Steven Rostedt
maintainerOn Sat, 2009-10-10 at 16:00 +0200, [email protected] wrote:
As a side note. Can you change your mailer to have your "From:" line have "Jiri Olsa <[email protected]>" instead of just "[email protected]". Unless you like just your email address set up as the author of the code. The "git am" uses the From: line to assign authorship.
-- Steve