Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ftrace: Clean up function probe methods

Browse Source 
When a function probe is created, each function that the probe is
attached to, a "callback" method is called. On release of the probe,
each function entry calls the "free" method.

First, "callback" is a confusing name and does not really match what
it does. Callback sounds like it will be called when the probe
triggers. But that's not the case. This is really an "init" function,
so lets rename it as such.

Secondly, both "init" and "free" do not pass enough information back
to the handlers. Pass back the ops, ip and data for each time the
method is called. We have the information, might as well use it.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2013-03-12 15:07:59 -04:00 committed by Steven Rostedt
parent 57d01ad097
commit e67efb93f0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/ftrace.h
View File

@ -259,8 +259,10 @@ struct ftrace_probe_ops {
void (*func)(unsigned long ip, void (*func)(unsigned long ip,
unsigned long parent_ip, unsigned long parent_ip,
void **data); void **data);
int (*callback)(unsigned long ip, void **data); int (*init)(struct ftrace_probe_ops *ops,
void (*free)(void **data); unsigned long ip, void **data);
void (*free)(struct ftrace_probe_ops *ops,
unsigned long ip, void **data);
int (*print)(struct seq_file *m, int (*print)(struct seq_file *m,
unsigned long ip, unsigned long ip,
struct ftrace_probe_ops *ops, struct ftrace_probe_ops *ops,

6
kernel/trace/ftrace.c
View File

@ -2984,7 +2984,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
container_of(rhp, struct ftrace_func_probe, rcu); container_of(rhp, struct ftrace_func_probe, rcu);
if (entry->ops->free) if (entry->ops->free)
entry->ops->free(&entry->data); entry->ops->free(entry->ops, entry->ip, &entry->data);
kfree(entry); kfree(entry);
} }
@ -3045,8 +3045,8 @@ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
* for each function we find. We call the callback * for each function we find. We call the callback
* to give the caller an opportunity to do so. * to give the caller an opportunity to do so.
*/ */
if (ops->callback) { if (ops->init) {
if (ops->callback(rec->ip, &entry->data) < 0) { if (ops->init(ops, rec->ip, &entry->data) < 0) {
/* caller does not like this func */ /* caller does not like this func */
kfree(entry); kfree(entry);
continue; continue;