diff options
Diffstat (limited to 'kernel/trace/trace_uprobe.c')
-rw-r--r-- | kernel/trace/trace_uprobe.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index e4473367e7a4..930e51462dc8 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c | |||
@@ -294,7 +294,7 @@ static struct trace_uprobe *find_probe_event(const char *event, const char *grou | |||
294 | struct trace_uprobe *tu; | 294 | struct trace_uprobe *tu; |
295 | 295 | ||
296 | list_for_each_entry(tu, &uprobe_list, list) | 296 | list_for_each_entry(tu, &uprobe_list, list) |
297 | if (strcmp(tu->tp.call.name, event) == 0 && | 297 | if (strcmp(ftrace_event_name(&tu->tp.call), event) == 0 && |
298 | strcmp(tu->tp.call.class->system, group) == 0) | 298 | strcmp(tu->tp.call.class->system, group) == 0) |
299 | return tu; | 299 | return tu; |
300 | 300 | ||
@@ -324,7 +324,8 @@ static int register_trace_uprobe(struct trace_uprobe *tu) | |||
324 | mutex_lock(&uprobe_lock); | 324 | mutex_lock(&uprobe_lock); |
325 | 325 | ||
326 | /* register as an event */ | 326 | /* register as an event */ |
327 | old_tu = find_probe_event(tu->tp.call.name, tu->tp.call.class->system); | 327 | old_tu = find_probe_event(ftrace_event_name(&tu->tp.call), |
328 | tu->tp.call.class->system); | ||
328 | if (old_tu) { | 329 | if (old_tu) { |
329 | /* delete old event */ | 330 | /* delete old event */ |
330 | ret = unregister_trace_uprobe(old_tu); | 331 | ret = unregister_trace_uprobe(old_tu); |
@@ -599,7 +600,8 @@ static int probes_seq_show(struct seq_file *m, void *v) | |||
599 | char c = is_ret_probe(tu) ? 'r' : 'p'; | 600 | char c = is_ret_probe(tu) ? 'r' : 'p'; |
600 | int i; | 601 | int i; |
601 | 602 | ||
602 | seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system, tu->tp.call.name); | 603 | seq_printf(m, "%c:%s/%s", c, tu->tp.call.class->system, |
604 | ftrace_event_name(&tu->tp.call)); | ||
603 | seq_printf(m, " %s:0x%p", tu->filename, (void *)tu->offset); | 605 | seq_printf(m, " %s:0x%p", tu->filename, (void *)tu->offset); |
604 | 606 | ||
605 | for (i = 0; i < tu->tp.nr_args; i++) | 607 | for (i = 0; i < tu->tp.nr_args; i++) |
@@ -649,7 +651,8 @@ static int probes_profile_seq_show(struct seq_file *m, void *v) | |||
649 | { | 651 | { |
650 | struct trace_uprobe *tu = v; | 652 | struct trace_uprobe *tu = v; |
651 | 653 | ||
652 | seq_printf(m, " %s %-44s %15lu\n", tu->filename, tu->tp.call.name, tu->nhit); | 654 | seq_printf(m, " %s %-44s %15lu\n", tu->filename, |
655 | ftrace_event_name(&tu->tp.call), tu->nhit); | ||
653 | return 0; | 656 | return 0; |
654 | } | 657 | } |
655 | 658 | ||
@@ -844,12 +847,14 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e | |||
844 | tu = container_of(event, struct trace_uprobe, tp.call.event); | 847 | tu = container_of(event, struct trace_uprobe, tp.call.event); |
845 | 848 | ||
846 | if (is_ret_probe(tu)) { | 849 | if (is_ret_probe(tu)) { |
847 | if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)", tu->tp.call.name, | 850 | if (!trace_seq_printf(s, "%s: (0x%lx <- 0x%lx)", |
851 | ftrace_event_name(&tu->tp.call), | ||
848 | entry->vaddr[1], entry->vaddr[0])) | 852 | entry->vaddr[1], entry->vaddr[0])) |
849 | goto partial; | 853 | goto partial; |
850 | data = DATAOF_TRACE_ENTRY(entry, true); | 854 | data = DATAOF_TRACE_ENTRY(entry, true); |
851 | } else { | 855 | } else { |
852 | if (!trace_seq_printf(s, "%s: (0x%lx)", tu->tp.call.name, | 856 | if (!trace_seq_printf(s, "%s: (0x%lx)", |
857 | ftrace_event_name(&tu->tp.call), | ||
853 | entry->vaddr[0])) | 858 | entry->vaddr[0])) |
854 | goto partial; | 859 | goto partial; |
855 | data = DATAOF_TRACE_ENTRY(entry, false); | 860 | data = DATAOF_TRACE_ENTRY(entry, false); |
@@ -1275,7 +1280,8 @@ static int register_uprobe_event(struct trace_uprobe *tu) | |||
1275 | ret = trace_add_event_call(call); | 1280 | ret = trace_add_event_call(call); |
1276 | 1281 | ||
1277 | if (ret) { | 1282 | if (ret) { |
1278 | pr_info("Failed to register uprobe event: %s\n", call->name); | 1283 | pr_info("Failed to register uprobe event: %s\n", |
1284 | ftrace_event_name(call)); | ||
1279 | kfree(call->print_fmt); | 1285 | kfree(call->print_fmt); |
1280 | unregister_ftrace_event(&call->event); | 1286 | unregister_ftrace_event(&call->event); |
1281 | } | 1287 | } |