lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ftrace: prevent ftrace modifications while being kprobe'd, v2

Browse Source 
add two missing chunks for ftrace+kprobe.

Signed-off-by: Abhishek Sagar <sagar.abhishek@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Abhishek Sagar
2008-06-26 22:51:51 +05:30
committed by Ingo Molnar
parent 760378e149
commit 98a05ed4bd
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/trace/ftrace.c
View File

@@ -502,8 +502,12 @@ static void ftrace_replace_code(int enable)
continue; continue;
/* ignore updates to this record's mcount site */ /* ignore updates to this record's mcount site */
if (get_kprobe((void *)rec->ip)) if (get_kprobe((void *)rec->ip)) {
freeze_record(rec);
continue; continue;
} else {
unfreeze_record(rec);
}
failed = __ftrace_replace_code(rec, old, new, enable); failed = __ftrace_replace_code(rec, old, new, enable);
if (failed && (rec->flags & FTRACE_FL_CONVERTED)) { if (failed && (rec->flags & FTRACE_FL_CONVERTED)) {
@@ -740,7 +744,10 @@ static int __ftrace_update_code(void *ignore)
ftrace_del_hash(p); ftrace_del_hash(p);
INIT_HLIST_NODE(&p->node); INIT_HLIST_NODE(&p->node);
hlist_add_head(&p->node, &temp_list); hlist_add_head(&p->node, &temp_list);
freeze_record(p);
continue; continue;
} else {
unfreeze_record(p);
} }
/* convert record (i.e, patch mcount-call with NOP) */ /* convert record (i.e, patch mcount-call with NOP) */