Re: [PATCH perf/core v5 05/15] perf probe: Use cache entry if possible
Hi Masami,
On Fri, Apr 29, 2016 at 08:52:29AM +0900, Masami Hiramatsu wrote:
> On Thu, 28 Apr 2016 11:47:53 +0900
> Namhyung Kim wrote:
>
> > On Thu, Apr 28, 2016 at 03:37:52AM +0900, Masami Hiramatsu wrote:
> > > From: Masami Hiramatsu
> > >
> > > Before analyzing debuginfo, try to find a corresponding entry
> > > from probe cache always. This does not depend on --cache,
> > > the --cache enables to store/update cache, but looking up
> > > the cache is always enabled.
> > >
> > > Signed-off-by: Masami Hiramatsu
> > > Signed-off-by: Masami Hiramatsu
> > > ---
> >
> > [SNIP]
> > > +static int find_probe_trace_events_from_cache(struct perf_probe_event
> > > *pev,
> > > + struct probe_trace_event **tevs)
> > > +{
> > > + struct probe_cache *cache;
> > > + struct probe_cache_entry *entry;
> > > + struct probe_trace_event *tev;
> > > + struct str_node *node;
> > > + int ret, i;
> > > +
> > > + cache = probe_cache__new(pev->target);
> > > + if (!cache)
> > > + return 0;
> > > +
> > > + entry = probe_cache__find(cache, pev);
> > > +
> > > + if (!entry && !pev->event &&
> > > + (!pev->point.file && pev->point.function && !pev->point.retprobe &&
> > > + !pev->point.line && !pev->point.offset && !pev->point.lazy_line)) {
> > > + entry = probe_cache__find_by_name(cache, pev->group,
> > > + pev->point.function);
> > > + }
> >
> > What about arguments? It seems that it only checks group and event
> > names of the given pev and use the cached entry's tev if found. What
> > if they have different argument spec?
>
> Indeed. I think this is for reusing cached event by using event name.
> however, with 11/15 ("perf probe: Accept %sdt and %cached event name"),
> we don't need this anymore.
>
> So, I'll remove this fallback code.
Let's think about the following case: if user added an event to cache
with argument XXX earlier and she tries to add the same event but with
different argument YYY later. But the event is in the cache so it'll
reuse the cached event with XXX, no?
Thanks,
Namhyung
> >
> >
> > > + if (!entry) {
> > > + ret = 0;
> > > + goto out;
> > > + }
> > > +
> > > + ret = strlist__nr_entries(entry->tevlist);
> > > + if (ret > probe_conf.max_probes) {
> > > + pr_debug("Too many entries matched in the cache of %s\n",
> > > + pev->target ? : "kernel");
> > > + ret = -E2BIG;
> > > + goto out;
> > > + }
> > > +
> > > + *tevs = zalloc(ret * sizeof(*tev));
> > > + if (!*tevs) {
> > > + ret = -ENOMEM;
> > > + goto out;
> > > + }
> > > +
> > > + i = 0;
> > > + strlist__for_each(node, entry->tevlist) {
> > > + tev = &(*tevs)[i++];
> > > + ret = parse_probe_trace_command(node->s, tev);
> > > + if (ret < 0)
> > > + goto out;
> > > + /* Set the uprobes attribute as same as original */
> > > + tev->uprobes = pev->uprobes;
> > > + }
> > > + ret = i;
> > > +
> > > +out:
> > > + probe_cache__delete(cache);
> > > + return ret;
> > > +}
>
>
> --
> Masami Hiramatsu
Re: [PATCH perf/core v5 05/15] perf probe: Use cache entry if possible
On Thu, 28 Apr 2016 11:47:53 +0900
Namhyung Kim wrote:
> On Thu, Apr 28, 2016 at 03:37:52AM +0900, Masami Hiramatsu wrote:
> > From: Masami Hiramatsu
> >
> > Before analyzing debuginfo, try to find a corresponding entry
> > from probe cache always. This does not depend on --cache,
> > the --cache enables to store/update cache, but looking up
> > the cache is always enabled.
> >
> > Signed-off-by: Masami Hiramatsu
> > Signed-off-by: Masami Hiramatsu
> > ---
>
> [SNIP]
> > +static int find_probe_trace_events_from_cache(struct perf_probe_event *pev,
> > + struct probe_trace_event **tevs)
> > +{
> > + struct probe_cache *cache;
> > + struct probe_cache_entry *entry;
> > + struct probe_trace_event *tev;
> > + struct str_node *node;
> > + int ret, i;
> > +
> > + cache = probe_cache__new(pev->target);
> > + if (!cache)
> > + return 0;
> > +
> > + entry = probe_cache__find(cache, pev);
> > +
> > + if (!entry && !pev->event &&
> > + (!pev->point.file && pev->point.function && !pev->point.retprobe &&
> > +!pev->point.line && !pev->point.offset && !pev->point.lazy_line)) {
> > + entry = probe_cache__find_by_name(cache, pev->group,
> > + pev->point.function);
> > + }
>
> What about arguments? It seems that it only checks group and event
> names of the given pev and use the cached entry's tev if found. What
> if they have different argument spec?
Indeed. I think this is for reusing cached event by using event name.
however, with 11/15 ("perf probe: Accept %sdt and %cached event name"),
we don't need this anymore.
So, I'll remove this fallback code.
Thank you!
>
> Thanks,
> Namhyung
>
>
> > + if (!entry) {
> > + ret = 0;
> > + goto out;
> > + }
> > +
> > + ret = strlist__nr_entries(entry->tevlist);
> > + if (ret > probe_conf.max_probes) {
> > + pr_debug("Too many entries matched in the cache of %s\n",
> > +pev->target ? : "kernel");
> > + ret = -E2BIG;
> > + goto out;
> > + }
> > +
> > + *tevs = zalloc(ret * sizeof(*tev));
> > + if (!*tevs) {
> > + ret = -ENOMEM;
> > + goto out;
> > + }
> > +
> > + i = 0;
> > + strlist__for_each(node, entry->tevlist) {
> > + tev = &(*tevs)[i++];
> > + ret = parse_probe_trace_command(node->s, tev);
> > + if (ret < 0)
> > + goto out;
> > + /* Set the uprobes attribute as same as original */
> > + tev->uprobes = pev->uprobes;
> > + }
> > + ret = i;
> > +
> > +out:
> > + probe_cache__delete(cache);
> > + return ret;
> > +}
--
Masami Hiramatsu
Re: [PATCH perf/core v5 05/15] perf probe: Use cache entry if possible
On Thu, Apr 28, 2016 at 03:37:52AM +0900, Masami Hiramatsu wrote:
> From: Masami Hiramatsu
>
> Before analyzing debuginfo, try to find a corresponding entry
> from probe cache always. This does not depend on --cache,
> the --cache enables to store/update cache, but looking up
> the cache is always enabled.
>
> Signed-off-by: Masami Hiramatsu
> Signed-off-by: Masami Hiramatsu
> ---
[SNIP]
> +static int find_probe_trace_events_from_cache(struct perf_probe_event *pev,
> + struct probe_trace_event **tevs)
> +{
> + struct probe_cache *cache;
> + struct probe_cache_entry *entry;
> + struct probe_trace_event *tev;
> + struct str_node *node;
> + int ret, i;
> +
> + cache = probe_cache__new(pev->target);
> + if (!cache)
> + return 0;
> +
> + entry = probe_cache__find(cache, pev);
> +
> + if (!entry && !pev->event &&
> + (!pev->point.file && pev->point.function && !pev->point.retprobe &&
> + !pev->point.line && !pev->point.offset && !pev->point.lazy_line)) {
> + entry = probe_cache__find_by_name(cache, pev->group,
> + pev->point.function);
> + }
What about arguments? It seems that it only checks group and event
names of the given pev and use the cached entry's tev if found. What
if they have different argument spec?
Thanks,
Namhyung
> + if (!entry) {
> + ret = 0;
> + goto out;
> + }
> +
> + ret = strlist__nr_entries(entry->tevlist);
> + if (ret > probe_conf.max_probes) {
> + pr_debug("Too many entries matched in the cache of %s\n",
> + pev->target ? : "kernel");
> + ret = -E2BIG;
> + goto out;
> + }
> +
> + *tevs = zalloc(ret * sizeof(*tev));
> + if (!*tevs) {
> + ret = -ENOMEM;
> + goto out;
> + }
> +
> + i = 0;
> + strlist__for_each(node, entry->tevlist) {
> + tev = &(*tevs)[i++];
> + ret = parse_probe_trace_command(node->s, tev);
> + if (ret < 0)
> + goto out;
> + /* Set the uprobes attribute as same as original */
> + tev->uprobes = pev->uprobes;
> + }
> + ret = i;
> +
> +out:
> + probe_cache__delete(cache);
> + return ret;
> +}
[PATCH perf/core v5 05/15] perf probe: Use cache entry if possible
From: Masami Hiramatsu
Before analyzing debuginfo, try to find a corresponding entry
from probe cache always. This does not depend on --cache,
the --cache enables to store/update cache, but looking up
the cache is always enabled.
Signed-off-by: Masami Hiramatsu
Signed-off-by: Masami Hiramatsu
---
tools/perf/util/probe-event.c | 72 -
tools/perf/util/probe-file.c | 20 +++
tools/perf/util/probe-file.h |5 ++-
3 files changed, 93 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index dc0265e..0cd709e 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2443,17 +2443,24 @@ static int probe_trace_event__set_name(struct
probe_trace_event *tev,
char buf[64];
int ret;
+ /* If probe_event or trace_event already have the name, reuse it */
if (pev->event)
event = pev->event;
- else
+ else if (tev->event)
+ event = tev->event;
+ else {
+ /* Or generate new one from probe point */
if (pev->point.function &&
(strncmp(pev->point.function, "0x", 2) != 0) &&
!strisglob(pev->point.function))
event = pev->point.function;
else
event = tev->point.realname;
+ }
if (pev->group)
group = pev->group;
+ else if (tev->group)
+ group = tev->group;
else
group = PERFPROBE_GROUP;
@@ -2500,7 +2507,7 @@ static int __add_probe_trace_events(struct
perf_probe_event *pev,
for (i = 0; i < ntevs; i++) {
tev = &tevs[i];
/* Skip if the symbol is out of .text or blacklisted */
- if (!tev->point.symbol)
+ if (!tev->point.symbol && !pev->uprobes)
continue;
/* Set new name for tev (and update namelist) */
@@ -2812,6 +2819,62 @@ errout:
bool __weak arch__prefers_symtab(void) { return false; }
+static int find_probe_trace_events_from_cache(struct perf_probe_event *pev,
+ struct probe_trace_event **tevs)
+{
+ struct probe_cache *cache;
+ struct probe_cache_entry *entry;
+ struct probe_trace_event *tev;
+ struct str_node *node;
+ int ret, i;
+
+ cache = probe_cache__new(pev->target);
+ if (!cache)
+ return 0;
+
+ entry = probe_cache__find(cache, pev);
+
+ if (!entry && !pev->event &&
+ (!pev->point.file && pev->point.function && !pev->point.retprobe &&
+!pev->point.line && !pev->point.offset && !pev->point.lazy_line)) {
+ entry = probe_cache__find_by_name(cache, pev->group,
+ pev->point.function);
+ }
+ if (!entry) {
+ ret = 0;
+ goto out;
+ }
+
+ ret = strlist__nr_entries(entry->tevlist);
+ if (ret > probe_conf.max_probes) {
+ pr_debug("Too many entries matched in the cache of %s\n",
+pev->target ? : "kernel");
+ ret = -E2BIG;
+ goto out;
+ }
+
+ *tevs = zalloc(ret * sizeof(*tev));
+ if (!*tevs) {
+ ret = -ENOMEM;
+ goto out;
+ }
+
+ i = 0;
+ strlist__for_each(node, entry->tevlist) {
+ tev = &(*tevs)[i++];
+ ret = parse_probe_trace_command(node->s, tev);
+ if (ret < 0)
+ goto out;
+ /* Set the uprobes attribute as same as original */
+ tev->uprobes = pev->uprobes;
+ }
+ ret = i;
+
+out:
+ probe_cache__delete(cache);
+ return ret;
+}
+
static int convert_to_probe_trace_events(struct perf_probe_event *pev,
struct probe_trace_event **tevs)
{
@@ -2834,6 +2897,11 @@ static int convert_to_probe_trace_events(struct
perf_probe_event *pev,
if (ret > 0)
return ret;
+ /* At first, we need to lookup cache entry */
+ ret = find_probe_trace_events_from_cache(pev, tevs);
+ if (ret > 0)
+ return ret; /* Found in probe cache */
+
if (arch__prefers_symtab() && !perf_probe_event_need_dwarf(pev)) {
ret = find_probe_trace_events_from_map(pev, tevs);
if (ret > 0)
diff --git a/tools/perf/util/probe-file.c b/tools/perf/util/probe-file.c
index bb849c9..0d1298f 100644
--- a/tools/perf/util/probe-file.c
+++ b/tools/perf/util/probe-file.c
@@ -506,7 +506,7 @@ static bool streql(const char *a, const char *b)
return !strcmp(a, b);
}
-static struct probe_cache_entry *
+struct probe_cache_entry *
probe_cache__find(struct probe_cache *pcache, struct perf_probe_event *pev)
{
str
