From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752074AbcFIO2k (ORCPT ); Thu, 9 Jun 2016 10:28:40 -0400 Received: from mail.kernel.org ([198.145.29.136]:56366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751393AbcFIO2i (ORCPT ); Thu, 9 Jun 2016 10:28:38 -0400 Date: Thu, 9 Jun 2016 11:28:28 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: linux-kernel@vger.kernel.org, Namhyung Kim , Peter Zijlstra , Ingo Molnar , Hemant Kumar , Ananth N Mavinakayanahalli , Brendan Gregg Subject: Re: [PATCH perf/core v10 10/23] perf probe: Remove caches when --cache is given Message-ID: <20160609142828.GQ11589@kernel.org> References: <20160608092854.3116.29007.stgit@devbox> <20160608093040.3116.69426.stgit@devbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160608093040.3116.69426.stgit@devbox> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.6.1 (2016-04-27) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Wed, Jun 08, 2016 at 06:30:40PM +0900, Masami Hiramatsu escreveu: > From: Masami Hiramatsu > > 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 > Signed-off-by: Masami Hiramatsu > --- > 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,