linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Masami Hiramatsu <mhiramat@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@redhat.com>,
	Hemant Kumar <hemant@linux.vnet.ibm.com>,
	Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>,
	Brendan Gregg <brendan.d.gregg@gmail.com>
Subject: Re: [PATCH perf/core v10 10/23] perf probe: Remove caches when --cache is given
Date: Thu, 9 Jun 2016 11:28:28 -0300	[thread overview]
Message-ID: <20160609142828.GQ11589@kernel.org> (raw)
In-Reply-To: <20160608093040.3116.69426.stgit@devbox>

Em Wed, Jun 08, 2016 at 06:30:40PM +0900, Masami Hiramatsu escreveu:
> From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> 
> perf-probe --del removes caches when --cache is given.
> Note that the delete pattern is not same as normal events.
> 
> If you cached probes with event name, --del "eventname"
> works as expected. However, if you skipped it, the cached
> probes doesn't have actual event name. In that case
>  --del "probe-desc" is required (wildcard is acceptable).
> For example a cache entry has the probe-desc "vfs_read $params",
> you can remove it with --del 'vfs_read*'.
> 
>   -----
>   # perf probe --cache --list
>   /[kernel.kallsyms] (1466a0a250b5d0070c6d0f03c5fed30b237970a1):
>   vfs_read $params
>   /usr/lib64/libc-2.17.so (c31ffe7942bfd77b2fca8f9bd5709d387a86d3bc):
>   getaddrinfo $params
> 
>   # perf probe --cache --del vfs_read\*
>   Removed cached event: probe:vfs_read
> 
>   # perf probe --cache --list
>   /[kernel.kallsyms] (1466a0a250b5d0070c6d0f03c5fed30b237970a1):
>   /usr/lib64/libc-2.17.so (c31ffe7942bfd77b2fca8f9bd5709d387a86d3bc):
>   getaddrinfo $params
>   -----
> 
> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
>  Changes in v9:
>   - Fix to show which event is deleted (Thanks Hemant!)
>  Changes in v4:
>   - move del_perf_probe_caches() into builtin-probe.c since
>     command-line related delete procedure is there now.
> ---
>  tools/perf/Documentation/perf-probe.txt |    1 +
>  tools/perf/builtin-probe.c              |   27 +++++++++++++++++++++++++
>  tools/perf/util/probe-file.c            |   34 +++++++++++++++++++++++++------
>  tools/perf/util/probe-file.h            |    2 ++
>  4 files changed, 57 insertions(+), 7 deletions(-)
> 
> diff --git a/tools/perf/Documentation/perf-probe.txt b/tools/perf/Documentation/perf-probe.txt
> index 5a70d45..8d09173 100644
> --- a/tools/perf/Documentation/perf-probe.txt
> +++ b/tools/perf/Documentation/perf-probe.txt
> @@ -116,6 +116,7 @@ OPTIONS
>  	(With --add) Cache the probes. Any events which successfully added
>  	are also stored in the cache file.
>  	(With --list) Show cached probes.
> +	(With --del) Remove cached probes.
>  
>  --max-probes=NUM::
>  	Set the maximum number of probe points for an event. Default is 128.
> diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
> index 53e380c0e..8f61525 100644
> --- a/tools/perf/builtin-probe.c
> +++ b/tools/perf/builtin-probe.c
> @@ -363,6 +363,30 @@ out_cleanup:
>  	return ret;
>  }
>  
> +static int del_perf_probe_caches(struct strfilter *filter)
> +{
> +	struct probe_cache *cache;
> +	struct strlist *bidlist;
> +	struct str_node *nd;
> +	int ret;
> +
> +	ret = build_id_cache__list_all(&bidlist);
> +	if (ret < 0) {
> +		pr_debug("Failed to get buildids: %d\n", ret);
> +		return ret;
> +	}
> +
> +	strlist__for_each(nd, bidlist) {
> +		cache = probe_cache__new(nd->s);
> +		if (!cache)
> +			continue;
> +		probe_cache__remove_entries(cache, filter);
> +		probe_cache__commit(cache);



> +		probe_cache__delete(cache);
> +	}
> +	return 0;
> +}
> +
>  static int perf_del_probe_events(struct strfilter *filter)
>  {
>  	int ret, ret2, ufd = -1, kfd = -1;
> @@ -375,6 +399,9 @@ static int perf_del_probe_events(struct strfilter *filter)
>  
>  	pr_debug("Delete filter: \'%s\'\n", str);
>  
> +	if (probe_conf.cache)
> +		return del_perf_probe_caches(filter);
> +
>  	/* Get current event names */
>  	ret = probe_file__open_both(&kfd, &ufd, PF_FL_RW);
>  	if (ret < 0)
> diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c
> index a6d4a67..f687607 100644
> --- a/tools/perf/util/probe-file.c
> +++ b/tools/perf/util/probe-file.c
> @@ -660,19 +660,39 @@ out:
>  	return ret;
>  }
>  
> +static bool probe_cache_entry__compare(struct probe_cache_entry *entry,
> +				       struct strfilter *filter)
> +{
> +	char buf[128], *ptr = entry->spev;
> +
> +	if (entry->pev.event) {
> +		snprintf(buf, 128, "%s:%s", entry->pev.group, entry->pev.event);
> +		ptr = buf;
> +	}
> +	return strfilter__compare(filter, ptr);
> +}
> +
> +int probe_cache__remove_entries(struct probe_cache *pcache,
> +				struct strfilter *filter)
> +{
> +	struct probe_cache_entry *entry, *tmp;
> +
> +	list_for_each_entry_safe(entry, tmp, &pcache->list, list) {

so here you used the preferred idiom, i.e. using
list_for_each_entry_safe(), once you stop doing the list removal at the
list entry destructor, it gets the good old boring usual idiom, please
do that.

Also please consider renaming perf_cache__remove_entries() to
perf_cache__filter_purge(), as it doesn't simply remove entries, it
purges them (that is, remove an entry and delete it), and only if the
entry got filtered.

> +		if (probe_cache_entry__compare(entry, filter)) {
> +			pr_info("Removed cached event: %s\n", entry->spev);
> +			probe_cache_entry__delete(entry);
> +		}
> +	}
> +	return 0;
> +}
> +
>  static int probe_cache__show_entries(struct probe_cache *pcache,
>  				     struct strfilter *filter)
>  {
>  	struct probe_cache_entry *entry;
> -	char buf[128], *ptr;
>  
>  	list_for_each_entry(entry, &pcache->list, list) {
> -		if (entry->pev.event) {
> -			ptr = buf;
> -			snprintf(buf, 128, "%s:%s", entry->pev.group, entry->pev.event);
> -		} else
> -			ptr = entry->spev;
> -		if (strfilter__compare(filter, ptr))
> +		if (probe_cache_entry__compare(entry, filter))
>  			printf("%s\n", entry->spev);
>  	}
>  	return 0;
> diff --git a/tools/perf/util/probe-file.h b/tools/perf/util/probe-file.h
> index ac70446..e6fd9b9 100644
> --- a/tools/perf/util/probe-file.h
> +++ b/tools/perf/util/probe-file.h
> @@ -37,6 +37,8 @@ int probe_cache__add_entry(struct probe_cache *pcache,
>  			   struct probe_trace_event *tevs, int ntevs);
>  int probe_cache__commit(struct probe_cache *pcache);
>  void probe_cache__delete(struct probe_cache *pcache);
> +int probe_cache__remove_entries(struct probe_cache *pcache,
> +				struct strfilter *filter);
>  struct probe_cache_entry *probe_cache__find(struct probe_cache *pcache,
>  					    struct perf_probe_event *pev);
>  struct probe_cache_entry *probe_cache__find_by_name(struct probe_cache *pcache,

  reply	other threads:[~2016-06-09 14:28 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-08  9:29 [PATCH perf/core v10 00/23] perf-probe --cache and SDT support Masami Hiramatsu
2016-06-08  9:29 ` [PATCH perf/core v10 01/23] perf: util: Fix rm_rf() to handle non-regular files correctly Masami Hiramatsu
2016-06-16  8:31   ` [tip:perf/core] perf tools: " tip-bot for Masami Hiramatsu
2016-06-08  9:29 ` [PATCH perf/core v10 02/23] perf-probe: Fix to add NULL check for strndup Masami Hiramatsu
2016-06-16  8:32   ` [tip:perf/core] perf probe: " tip-bot for Masami Hiramatsu
2016-06-08  9:29 ` [PATCH perf/core v10 03/23] perf-buildid: Rename and export build_id_cache__cachedir() Masami Hiramatsu
2016-06-16  8:32   ` [tip:perf/core] perf buildid: " tip-bot for Masami Hiramatsu
2016-06-08  9:29 ` [PATCH perf/core v10 04/23] perf probe: Add perf_probe_event__copy() Masami Hiramatsu
2016-06-16  8:33   ` [tip:perf/core] " tip-bot for Masami Hiramatsu
2016-06-08  9:29 ` [PATCH perf/core v10 05/23] perf probe: Recover and export synthesize_perf_probe_point() Masami Hiramatsu
2016-06-16  8:33   ` [tip:perf/core] perf probe: Uncomment " tip-bot for Masami Hiramatsu
2016-06-08  9:29 ` [PATCH perf/core v10 06/23] perf probe-file: Introduce perf_cache interfaces Masami Hiramatsu
2016-06-09 14:16   ` Arnaldo Carvalho de Melo
2016-06-10 22:18     ` Masami Hiramatsu
2016-06-08  9:30 ` [PATCH perf/core v10 07/23] perf probe: Add --cache option to cache the probe definitions Masami Hiramatsu
2016-06-09 14:18   ` Arnaldo Carvalho de Melo
2016-06-10 23:32     ` Masami Hiramatsu
2016-06-08  9:30 ` [PATCH perf/core v10 08/23] perf probe: Use cache entry if possible Masami Hiramatsu
2016-06-08  9:30 ` [PATCH perf/core v10 09/23] perf probe: Show all cached probes Masami Hiramatsu
2016-06-09 14:22   ` Arnaldo Carvalho de Melo
2016-06-11  0:28     ` Masami Hiramatsu
2016-06-12  3:20       ` Masami Hiramatsu
2016-06-08  9:30 ` [PATCH perf/core v10 10/23] perf probe: Remove caches when --cache is given Masami Hiramatsu
2016-06-09 14:28   ` Arnaldo Carvalho de Melo [this message]
2016-06-11  1:17     ` Masami Hiramatsu
2016-06-08  9:30 ` [PATCH perf/core v10 11/23] perf/sdt: ELF support for SDT Masami Hiramatsu
2016-06-08  9:31 ` [PATCH perf/core v10 12/23] perf probe: Add group name support Masami Hiramatsu
2016-06-08  9:31 ` [PATCH perf/core v10 13/23] perf buildid-cache: Scan and import user SDT events to probe cache Masami Hiramatsu
2016-06-08  9:31 ` [PATCH perf/core v10 14/23] perf probe: Accept %sdt and %cached event name Masami Hiramatsu
2016-06-08  9:31 ` [PATCH perf/core v10 15/23] perf-list: Show SDT and pre-cached events Masami Hiramatsu
2016-06-08  9:31 ` [PATCH perf/core v10 16/23] perf-list: Skip SDTs placed in invalid binaries Masami Hiramatsu
2016-06-08  9:31 ` [PATCH perf/core v10 17/23] perf: probe-cache: Add for_each_probe_cache_entry() wrapper Masami Hiramatsu
2016-06-08  9:31 ` [PATCH perf/core v10 18/23] perf probe: Allow wildcard for cached events Masami Hiramatsu
2016-06-08  9:32 ` [PATCH perf/core v10 19/23] perf probe: Search SDT/cached event from all probe caches Masami Hiramatsu
2016-06-08  9:32 ` [PATCH perf/core v10 20/23] perf probe: Support @BUILDID or @FILE suffix for SDT events Masami Hiramatsu
2016-06-08  9:32 ` [PATCH perf/core v10 21/23] perf probe: Support a special SDT probe format Masami Hiramatsu
2016-06-08  9:32 ` [PATCH perf/core v10 22/23] perf build: Add sdt feature detection Masami Hiramatsu
2016-06-08  9:32 ` [PATCH perf/core v10 23/23] perf-test: Add a test case for SDT event Masami Hiramatsu
2016-06-08 11:13 ` [PATCH perf/core v10 00/23] perf-probe --cache and SDT support Masami Hiramatsu
2016-06-08 11:15 ` [PATCH perf/core v10 22/23] perf build: Add sdt feature detection Masami Hiramatsu
2016-06-08 11:16 ` [PATCH perf/core v10 23/23] perf-test: Add a test case for SDT event Masami Hiramatsu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160609142828.GQ11589@kernel.org \
    --to=acme@kernel.org \
    --cc=ananth@linux.vnet.ibm.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=hemant@linux.vnet.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --subject='Re: [PATCH perf/core v10 10/23] perf probe: Remove caches when --cache is given' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox