iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf probe: Remove all probes matches given pattern at once

Browse Source 
Fix perf-probe --del option to delete all matched probes in both
of kprobes and uprobes at once.

When we have 2 or more events on different binaries as below,

  ----
  # ./perf probe -l
  probe:vfs_read       (on vfs_read@ksrc/linux-3/fs/read_write.c)
  probe_libc:malloc    (on __libc_malloc@malloc/malloc.c in /usr/lib64/libc-2.17
  ----

Trying to remove all event with '*' just removes kprobe events at first.
  ----
  # ./perf probe -d \*
  Removed event: probe:vfs_read
  ----

And in 2nd try, it removes all uprobe events.
  ----
  # ./perf probe -d \*
  Removed event: probe_libc:malloc
  ----

This fixes to remove all event at once as below.
  ----
  # ./perf probe -d \*
  Removed event: probe:vfs_read
  Removed event: probe_libc:malloc
  ----

Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20150423134614.26128.18106.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Masami Hiramatsu 2015-04-23 22:46:14 +09:00 committed by Arnaldo Carvalho de Melo
parent b3ac032b7a
commit 6dbe31f7ba
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/perf/util/probe-event.c
View File

@ -2686,7 +2686,7 @@ static int del_trace_probe_event(int fd, const char *buf,
struct strlist *namelist) struct strlist *namelist)
{ {
struct str_node *ent, *n; struct str_node *ent, *n;
int ret = -1; int ret = -ENOENT;
if (strpbrk(buf, "*?")) { /* Glob-exp */ if (strpbrk(buf, "*?")) { /* Glob-exp */
strlist__for_each_safe(ent, n, namelist) strlist__for_each_safe(ent, n, namelist)
@ -2710,7 +2710,7 @@ static int del_trace_probe_event(int fd, const char *buf,
int del_perf_probe_events(struct strlist *dellist) int del_perf_probe_events(struct strlist *dellist)
{ {
int ret = -1, ufd = -1, kfd = -1; int ret = -1, ret2, ufd = -1, kfd = -1;
char buf[128]; char buf[128];
const char *group, *event; const char *group, *event;
char *p, *str; char *p, *str;
@ -2731,8 +2731,10 @@ int del_perf_probe_events(struct strlist *dellist)
goto error; goto error;
} }
if (namelist == NULL && unamelist == NULL) if (namelist == NULL && unamelist == NULL) {
ret = -ENOENT;
goto error; goto error;
}
strlist__for_each(ent, dellist) { strlist__for_each(ent, dellist) {
str = strdup(ent->s); str = strdup(ent->s);
@ -2759,17 +2761,23 @@ int del_perf_probe_events(struct strlist *dellist)
} }
pr_debug("Group: %s, Event: %s\n", group, event); pr_debug("Group: %s, Event: %s\n", group, event);
free(str);
ret = ret2 = -ENOENT;
if (namelist) if (namelist)
ret = del_trace_probe_event(kfd, buf, namelist); ret = del_trace_probe_event(kfd, buf, namelist);
if (unamelist && ret != 0) if ((ret >= 0 || ret == -ENOENT) && unamelist)
ret = del_trace_probe_event(ufd, buf, unamelist); ret2 = del_trace_probe_event(ufd, buf, unamelist);
if (ret != 0) /* Since we can remove probes which already removed, don't check it */
pr_info("Info: Event \"%s\" does not exist.\n", buf); if (ret == -ENOENT && ret2 == -ENOENT)
pr_debug("Event \"%s\" does not exist.\n", buf);
free(str); else if (ret < 0 || ret2 < 0) {
if (ret >= 0)
ret = ret2;
break;
}
} }
error: error: