Commit b6a89643 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Accept filter argument for --list 



Currently, perf-probe --list option ignores given event filter.
  ----
  # ./perf probe -l vfs\*
    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.so)
  ----

This changes --list option to accept the event filter argument as below.
  ----
  # ./perf probe -l vfs\*
    probe:vfs_read       (on vfs_read@ksrc/linux-3/fs/read_write.c)
  # ./perf probe -l \*libc:\*
    probe_libc:malloc    (on __libc_malloc@malloc/malloc.c in /usr/lib64/libc-2.17.so)
  ----

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Tested-by: default avatarArnaldo 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/20150424094750.23967.53868.stgit@localhost.localdomain


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 96b55e39

tools/perf/Documentation/perf-probe.txt

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ or 
or

'perf probe' [options] --del='[GROUP:]EVENT' [...]

or

'perf probe' --list

'perf probe' --list[=[GROUP:]EVENT]

or

'perf probe' [options] --line='LINE'

or
@@ -66,8 +66,8 @@ OPTIONS 
	classes(e.g. [a-z], [!A-Z]).



-l::

--list::

	List up current probe events.

--list[=[GROUP:]EVENT]::

	List up current probe events. This can also accept filtering patterns of event names.



-L::

--line=::

tools/perf/builtin-probe.c

+46 −24
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 


#define DEFAULT_VAR_FILTER "!__k???tab_* & !__crc_*"

#define DEFAULT_FUNC_FILTER "!_*"

#define DEFAULT_LIST_FILTER "*:*"



/* Session management structure */

static struct {
@@ -93,6 +94,28 @@ static int parse_probe_event(const char *str) 
	return ret;

}



static int params_add_filter(const char *str)

{

	const char *err = NULL;

	int ret = 0;



	pr_debug2("Add filter: %s\n", str);

	if (!params.filter) {

		params.filter = strfilter__new(str, &err);

		if (!params.filter)

			ret = err ? -EINVAL : -ENOMEM;

	} else

		ret = strfilter__or(params.filter, str, &err);



	if (ret == -EINVAL) {

		pr_err("Filter parse error at %td.\n", err - str + 1);

		pr_err("Source: \"%s\"\n", str);

		pr_err("         %*c\n", (int)(err - str + 1), '^');

	}



	return ret;

}



static int set_target(const char *ptr)

{

	int found = 0;
@@ -180,6 +203,18 @@ static int opt_del_probe_event(const struct option *opt __maybe_unused, 
	return 0;

}



static int opt_list_probe_event(const struct option *opt __maybe_unused,

				const char *str, int unset)

{

	if (!unset)

		params.list_events = true;



	if (str)

		return params_add_filter(str);



	return 0;

}



static int opt_set_target(const struct option *opt, const char *str,

			int unset __maybe_unused)

{
@@ -261,26 +296,10 @@ static int opt_show_vars(const struct option *opt __maybe_unused, 
static int opt_set_filter(const struct option *opt __maybe_unused,

			  const char *str, int unset __maybe_unused)

{

	const char *err;

	int ret = 0;



	if (str) {

		pr_debug2("Set filter: %s\n", str);

		if (!params.filter) {

			params.filter = strfilter__new(str, &err);

			if (!params.filter)

				ret = err ? -EINVAL : -ENOMEM;

		} else

			ret = strfilter__or(params.filter, str, &err);

	if (str)

		return params_add_filter(str);



		if (ret == -EINVAL) {

			pr_err("Filter parse error at %td.\n", err - str + 1);

			pr_err("Source: \"%s\"\n", str);

			pr_err("         %*c\n", (int)(err - str + 1), '^');

		}

	}



	return ret;

	return 0;

}



static int init_params(void)
@@ -320,7 +339,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) 
		"perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]",

		"perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]",

		"perf probe [<options>] --del '[GROUP:]EVENT' ...",

		"perf probe --list",

		"perf probe --list [GROUP:]EVENT ...",

#ifdef HAVE_DWARF_SUPPORT

		"perf probe [<options>] --line 'LINEDESC'",

		"perf probe [<options>] --vars 'PROBEPOINT'",
@@ -333,8 +352,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) 
		    "be more verbose (show parsed arguments, etc)"),

	OPT_BOOLEAN('q', "quiet", &params.quiet,

		    "be quiet (do not show any mesages)"),

	OPT_BOOLEAN('l', "list", &params.list_events,

		    "list up current probe events"),

	OPT_CALLBACK_DEFAULT('l', "list", NULL, "[GROUP:]EVENT",

			     "list up probe events", opt_list_probe_event,

			     DEFAULT_LIST_FILTER),

	OPT_CALLBACK('d', "del", NULL, "[GROUP:]EVENT", "delete a probe event.",

		opt_del_probe_event),

	OPT_CALLBACK('a', "add", NULL,
@@ -448,7 +468,9 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) 
			pr_warning("  Error: Don't use --list with --exec.\n");

			usage_with_options(probe_usage, options);

		}

		ret = show_perf_probe_events();

		ret = show_perf_probe_events(params.filter);

		strfilter__delete(params.filter);

		params.filter = NULL;

		if (ret < 0)

			pr_err_with_code("  Error: Failed to show event list.", ret);

		return ret;

tools/perf/util/probe-event.c

+23 −4
Original line number Diff line number Diff line
@@ -2146,7 +2146,23 @@ static int show_perf_probe_event(struct perf_probe_event *pev, 
	return ret;

}



static int __show_perf_probe_events(int fd, bool is_kprobe)

static bool filter_probe_trace_event(struct probe_trace_event *tev,

				     struct strfilter *filter)

{

	char tmp[128];



	/* At first, check the event name itself */

	if (strfilter__compare(filter, tev->event))

		return true;



	/* Next, check the combination of name and group */

	if (e_snprintf(tmp, 128, "%s:%s", tev->group, tev->event) < 0)

		return false;

	return strfilter__compare(filter, tmp);

}



static int __show_perf_probe_events(int fd, bool is_kprobe,

				    struct strfilter *filter)

{

	int ret = 0;

	struct probe_trace_event tev;
@@ -2164,12 +2180,15 @@ static int __show_perf_probe_events(int fd, bool is_kprobe) 
	strlist__for_each(ent, rawlist) {

		ret = parse_probe_trace_command(ent->s, &tev);

		if (ret >= 0) {

			if (!filter_probe_trace_event(&tev, filter))

				goto next;

			ret = convert_to_perf_probe_event(&tev, &pev,

								is_kprobe);

			if (ret >= 0)

				ret = show_perf_probe_event(&pev,

							    tev.point.module);

		}

next:

		clear_perf_probe_event(&pev);

		clear_probe_trace_event(&tev);

		if (ret < 0)
@@ -2181,7 +2200,7 @@ static int __show_perf_probe_events(int fd, bool is_kprobe) 
}



/* List up current perf-probe events */

int show_perf_probe_events(void)

int show_perf_probe_events(struct strfilter *filter)

{

	int kp_fd, up_fd, ret;
@@ -2193,7 +2212,7 @@ int show_perf_probe_events(void) 


	kp_fd = open_kprobe_events(false);

	if (kp_fd >= 0) {

		ret = __show_perf_probe_events(kp_fd, true);

		ret = __show_perf_probe_events(kp_fd, true, filter);

		close(kp_fd);

		if (ret < 0)

			goto out;
@@ -2207,7 +2226,7 @@ int show_perf_probe_events(void) 
	}



	if (up_fd >= 0) {

		ret = __show_perf_probe_events(up_fd, false);

		ret = __show_perf_probe_events(up_fd, false, filter);

		close(up_fd);

	}

out:

tools/perf/util/probe-event.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ extern const char *kernel_get_module_path(const char *module); 
extern int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,

				 int max_probe_points, bool force_add);

extern int del_perf_probe_events(struct strlist *dellist);

extern int show_perf_probe_events(void);

extern int show_perf_probe_events(struct strfilter *filter);

extern int show_line_range(struct line_range *lr, const char *module,

			   bool user);

extern int show_available_vars(struct perf_probe_event *pevs, int npevs,

CRA Git | Maintained and supported by SUSTech CRA and CCSE