2009-08-12 17:07:25 +08:00
|
|
|
#include "symbol.h"
|
2010-03-26 23:11:06 +08:00
|
|
|
#include <errno.h>
|
2011-01-23 06:37:02 +08:00
|
|
|
#include <inttypes.h>
|
2010-03-26 06:58:58 +08:00
|
|
|
#include <limits.h>
|
2009-08-12 17:07:25 +08:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
2010-04-19 13:32:50 +08:00
|
|
|
#include <unistd.h>
|
2010-03-26 06:58:58 +08:00
|
|
|
#include "map.h"
|
2012-07-21 07:25:47 +08:00
|
|
|
#include "thread.h"
|
2009-08-12 17:07:25 +08:00
|
|
|
|
2010-02-23 03:15:39 +08:00
|
|
|
const char *map_type__name[MAP__NR_TYPES] = {
|
|
|
|
[MAP__FUNCTION] = "Functions",
|
|
|
|
[MAP__VARIABLE] = "Variables",
|
|
|
|
};
|
|
|
|
|
2009-08-12 17:07:25 +08:00
|
|
|
static inline int is_anon_memory(const char *filename)
|
|
|
|
{
|
|
|
|
return strcmp(filename, "//anon") == 0;
|
|
|
|
}
|
|
|
|
|
2011-08-24 21:18:34 +08:00
|
|
|
static inline int is_no_dso_memory(const char *filename)
|
|
|
|
{
|
|
|
|
return !strcmp(filename, "[stack]") ||
|
|
|
|
!strcmp(filename, "[vdso]") ||
|
|
|
|
!strcmp(filename, "[heap]");
|
|
|
|
}
|
|
|
|
|
2009-11-28 02:29:16 +08:00
|
|
|
void map__init(struct map *self, enum map_type type,
|
|
|
|
u64 start, u64 end, u64 pgoff, struct dso *dso)
|
2009-10-31 02:28:23 +08:00
|
|
|
{
|
2009-11-28 02:29:16 +08:00
|
|
|
self->type = type;
|
2009-10-31 02:28:23 +08:00
|
|
|
self->start = start;
|
|
|
|
self->end = end;
|
|
|
|
self->pgoff = pgoff;
|
|
|
|
self->dso = dso;
|
|
|
|
self->map_ip = map__map_ip;
|
|
|
|
self->unmap_ip = map__unmap_ip;
|
|
|
|
RB_CLEAR_NODE(&self->rb_node);
|
2010-04-19 13:32:50 +08:00
|
|
|
self->groups = NULL;
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
self->referenced = false;
|
2012-03-27 23:55:57 +08:00
|
|
|
self->erange_warned = false;
|
2009-10-31 02:28:23 +08:00
|
|
|
}
|
|
|
|
|
2010-04-19 13:32:50 +08:00
|
|
|
struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
|
|
|
|
u64 pgoff, u32 pid, char *filename,
|
2010-07-27 23:40:02 +08:00
|
|
|
enum map_type type)
|
2009-08-12 17:07:25 +08:00
|
|
|
{
|
|
|
|
struct map *self = malloc(sizeof(*self));
|
|
|
|
|
|
|
|
if (self != NULL) {
|
|
|
|
char newfilename[PATH_MAX];
|
2009-10-31 02:28:23 +08:00
|
|
|
struct dso *dso;
|
2011-08-24 21:18:34 +08:00
|
|
|
int anon, no_dso;
|
2009-08-12 17:07:25 +08:00
|
|
|
|
|
|
|
anon = is_anon_memory(filename);
|
2011-08-24 21:18:34 +08:00
|
|
|
no_dso = is_no_dso_memory(filename);
|
2009-08-12 17:07:25 +08:00
|
|
|
|
|
|
|
if (anon) {
|
2010-03-26 06:58:57 +08:00
|
|
|
snprintf(newfilename, sizeof(newfilename), "/tmp/perf-%d.map", pid);
|
2009-08-12 17:07:25 +08:00
|
|
|
filename = newfilename;
|
|
|
|
}
|
|
|
|
|
2010-04-19 13:32:50 +08:00
|
|
|
dso = __dsos__findnew(dsos__list, filename);
|
2009-10-31 02:28:23 +08:00
|
|
|
if (dso == NULL)
|
2009-08-12 17:07:25 +08:00
|
|
|
goto out_delete;
|
|
|
|
|
2010-03-26 06:58:57 +08:00
|
|
|
map__init(self, type, start, start + len, pgoff, dso);
|
2009-10-31 02:28:23 +08:00
|
|
|
|
2011-08-24 21:18:34 +08:00
|
|
|
if (anon || no_dso) {
|
2009-10-20 03:17:57 +08:00
|
|
|
self->map_ip = self->unmap_ip = identity__map_ip;
|
2011-08-24 21:18:34 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Set memory without DSO as loaded. All map__find_*
|
|
|
|
* functions still return NULL, and we avoid the
|
|
|
|
* unnecessary map__load warning.
|
|
|
|
*/
|
|
|
|
if (no_dso)
|
|
|
|
dso__set_loaded(dso, self->type);
|
2010-02-04 02:52:02 +08:00
|
|
|
}
|
2009-08-12 17:07:25 +08:00
|
|
|
}
|
|
|
|
return self;
|
|
|
|
out_delete:
|
|
|
|
free(self);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2009-11-21 06:51:27 +08:00
|
|
|
void map__delete(struct map *self)
|
|
|
|
{
|
|
|
|
free(self);
|
|
|
|
}
|
|
|
|
|
2009-11-28 02:29:17 +08:00
|
|
|
void map__fixup_start(struct map *self)
|
2009-11-21 06:51:27 +08:00
|
|
|
{
|
2009-11-28 02:29:17 +08:00
|
|
|
struct rb_root *symbols = &self->dso->symbols[self->type];
|
2009-11-24 23:01:52 +08:00
|
|
|
struct rb_node *nd = rb_first(symbols);
|
2009-11-21 06:51:27 +08:00
|
|
|
if (nd != NULL) {
|
|
|
|
struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
|
|
|
|
self->start = sym->start;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-28 02:29:17 +08:00
|
|
|
void map__fixup_end(struct map *self)
|
2009-11-21 06:51:27 +08:00
|
|
|
{
|
2009-11-28 02:29:17 +08:00
|
|
|
struct rb_root *symbols = &self->dso->symbols[self->type];
|
2009-11-24 23:01:52 +08:00
|
|
|
struct rb_node *nd = rb_last(symbols);
|
2009-11-21 06:51:27 +08:00
|
|
|
if (nd != NULL) {
|
|
|
|
struct symbol *sym = rb_entry(nd, struct symbol, rb_node);
|
|
|
|
self->end = sym->end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-10-31 02:28:25 +08:00
|
|
|
#define DSO__DELETED "(deleted)"
|
|
|
|
|
2010-02-04 02:52:00 +08:00
|
|
|
int map__load(struct map *self, symbol_filter_t filter)
|
2009-10-29 07:51:21 +08:00
|
|
|
{
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
const char *name = self->dso->long_name;
|
2009-12-15 23:32:33 +08:00
|
|
|
int nr;
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
|
2009-12-15 23:32:33 +08:00
|
|
|
if (dso__loaded(self->dso, self->type))
|
|
|
|
return 0;
|
|
|
|
|
2010-02-04 02:52:00 +08:00
|
|
|
nr = dso__load(self->dso, self, filter);
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
if (nr < 0) {
|
|
|
|
if (self->dso->has_build_id) {
|
|
|
|
char sbuild_id[BUILD_ID_SIZE * 2 + 1];
|
|
|
|
|
|
|
|
build_id__sprintf(self->dso->build_id,
|
|
|
|
sizeof(self->dso->build_id),
|
|
|
|
sbuild_id);
|
|
|
|
pr_warning("%s with build id %s not found",
|
|
|
|
name, sbuild_id);
|
|
|
|
} else
|
|
|
|
pr_warning("Failed to open %s", name);
|
|
|
|
|
|
|
|
pr_warning(", continuing without symbols\n");
|
|
|
|
return -1;
|
|
|
|
} else if (nr == 0) {
|
|
|
|
const size_t len = strlen(name);
|
|
|
|
const size_t real_len = len - sizeof(DSO__DELETED);
|
|
|
|
|
|
|
|
if (len > sizeof(DSO__DELETED) &&
|
|
|
|
strcmp(name + real_len + 1, DSO__DELETED) == 0) {
|
2011-10-19 08:44:45 +08:00
|
|
|
pr_warning("%.*s was updated (is prelink enabled?). "
|
|
|
|
"Restart the long running apps that use it!\n",
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
(int)real_len, name);
|
|
|
|
} else {
|
|
|
|
pr_warning("no symbols found in %s, maybe install "
|
|
|
|
"a debug package?\n", name);
|
2009-10-29 07:51:21 +08:00
|
|
|
}
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
|
|
|
|
return -1;
|
2009-10-29 07:51:21 +08:00
|
|
|
}
|
2010-02-04 02:52:00 +08:00
|
|
|
/*
|
|
|
|
* Only applies to the kernel, as its symtabs aren't relative like the
|
|
|
|
* module ones.
|
|
|
|
*/
|
|
|
|
if (self->dso->kernel)
|
|
|
|
map__reloc_vmlinux(self);
|
2009-10-29 07:51:21 +08:00
|
|
|
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-02-04 02:52:00 +08:00
|
|
|
struct symbol *map__find_symbol(struct map *self, u64 addr,
|
|
|
|
symbol_filter_t filter)
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
{
|
2010-02-04 02:52:00 +08:00
|
|
|
if (map__load(self, filter) < 0)
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
return NULL;
|
|
|
|
|
2009-12-12 04:56:39 +08:00
|
|
|
return dso__find_symbol(self->dso, self->type, addr);
|
2009-10-29 07:51:21 +08:00
|
|
|
}
|
|
|
|
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
struct symbol *map__find_symbol_by_name(struct map *self, const char *name,
|
|
|
|
symbol_filter_t filter)
|
|
|
|
{
|
2010-02-04 02:52:00 +08:00
|
|
|
if (map__load(self, filter) < 0)
|
perf symbols: Allow lookups by symbol name too
Configurable via symbol_conf.sort_by_name, so that the cost of an
extra rb_node on all 'struct symbol' instances is not paid by tools
that only want to decode addresses.
How to use it:
symbol_conf.sort_by_name = true;
symbol_init(&symbol_conf);
struct map *map = map_groups__find_by_name(kmaps, MAP__VARIABLE, "[kernel.kallsyms]");
if (map == NULL) {
pr_err("couldn't find map!\n");
kernel_maps__fprintf(stdout);
} else {
struct symbol *sym = map__find_symbol_by_name(map, sym_filter, NULL);
if (sym == NULL)
pr_err("couldn't find symbol %s!\n", sym_filter);
else
pr_info("symbol %s: %#Lx-%#Lx \n", sym_filter, sym->start, sym->end);
}
Looking over the vmlinux/kallsyms is common enough that I'll add a
variable to the upcoming struct perf_session to avoid the need to
use map_groups__find_by_name to get the main vmlinux/kallsyms map.
The above example looks on the 'variable' symtab, but it is just
like that for the functions one.
Also the sort operation is done when we first use
map__find_symbol_by_name, in a lazy way.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1260564622-12392-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-12 04:50:22 +08:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!dso__sorted_by_name(self->dso, self->type))
|
|
|
|
dso__sort_by_name(self->dso, self->type);
|
|
|
|
|
|
|
|
return dso__find_symbol_by_name(self->dso, self->type, name);
|
|
|
|
}
|
|
|
|
|
2009-08-12 17:07:25 +08:00
|
|
|
struct map *map__clone(struct map *self)
|
|
|
|
{
|
|
|
|
struct map *map = malloc(sizeof(*self));
|
|
|
|
|
|
|
|
if (!map)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
memcpy(map, self, sizeof(*self));
|
|
|
|
|
|
|
|
return map;
|
|
|
|
}
|
|
|
|
|
|
|
|
int map__overlap(struct map *l, struct map *r)
|
|
|
|
{
|
|
|
|
if (l->start > r->start) {
|
|
|
|
struct map *t = l;
|
|
|
|
l = r;
|
|
|
|
r = t;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (l->end > r->start)
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t map__fprintf(struct map *self, FILE *fp)
|
|
|
|
{
|
2011-01-23 06:37:02 +08:00
|
|
|
return fprintf(fp, " %" PRIx64 "-%" PRIx64 " %" PRIx64 " %s\n",
|
2009-08-12 17:07:25 +08:00
|
|
|
self->start, self->end, self->pgoff, self->dso->name);
|
|
|
|
}
|
perf annotate: Fix it for non-prelinked *.so
The problem was we were incorrectly calculating objdump
addresses for sym->start and sym->end, look:
For simple ET_DYN type DSO (*.so) with one function, objdump -dS
output is something like this:
000004ac <my_strlen>:
int my_strlen(const char *s)
4ac: 55 push %ebp
4ad: 89 e5 mov %esp,%ebp
4af: 83 ec 10 sub $0x10,%esp
{
i.e. we have relative-to-dso-mapping IPs (=RIP) there.
For ET_EXEC type and probably for prelinked libs as well (sorry
can't test - I don't use prelink) objdump outputs absolute IPs,
e.g.
08048604 <zz_strlen>:
extern "C"
int zz_strlen(const char *s)
8048604: 55 push %ebp
8048605: 89 e5 mov %esp,%ebp
8048607: 83 ec 10 sub $0x10,%esp
{
So, if sym->start is always relative to dso mapping(*), we'll
have to unmap it for ET_EXEC like cases, and leave as is for
ET_DYN cases.
(*) and it is - we've explicitely made it relative. Look for
adjust_symbols handling in dso__load_sym()
Previously we were always unmapping sym->start and for ET_DYN
dsos resulting addresses were wrong, and so objdump output was
empty.
The end result was that perf annotate output for symbols from
non-prelinked *.so had always 0.00% percents only, which is
wrong.
To fix it, let's introduce a helper for converting rip to
objdump address, and also let's document what map_ip() and
unmap_ip() do -- I had to study sources for several hours to
understand it.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1265223128-11786-8-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-02-04 02:52:07 +08:00
|
|
|
|
2012-01-30 12:42:57 +08:00
|
|
|
size_t map__fprintf_dsoname(struct map *map, FILE *fp)
|
|
|
|
{
|
|
|
|
const char *dsoname;
|
|
|
|
|
2012-01-30 12:43:20 +08:00
|
|
|
if (map && map->dso && (map->dso->name || map->dso->long_name)) {
|
|
|
|
if (symbol_conf.show_kernel_path && map->dso->long_name)
|
|
|
|
dsoname = map->dso->long_name;
|
|
|
|
else if (map->dso->name)
|
|
|
|
dsoname = map->dso->name;
|
|
|
|
} else
|
2012-01-30 12:42:57 +08:00
|
|
|
dsoname = "[unknown]";
|
|
|
|
|
|
|
|
return fprintf(fp, "%s", dsoname);
|
|
|
|
}
|
|
|
|
|
perf annotate: Fix it for non-prelinked *.so
The problem was we were incorrectly calculating objdump
addresses for sym->start and sym->end, look:
For simple ET_DYN type DSO (*.so) with one function, objdump -dS
output is something like this:
000004ac <my_strlen>:
int my_strlen(const char *s)
4ac: 55 push %ebp
4ad: 89 e5 mov %esp,%ebp
4af: 83 ec 10 sub $0x10,%esp
{
i.e. we have relative-to-dso-mapping IPs (=RIP) there.
For ET_EXEC type and probably for prelinked libs as well (sorry
can't test - I don't use prelink) objdump outputs absolute IPs,
e.g.
08048604 <zz_strlen>:
extern "C"
int zz_strlen(const char *s)
8048604: 55 push %ebp
8048605: 89 e5 mov %esp,%ebp
8048607: 83 ec 10 sub $0x10,%esp
{
So, if sym->start is always relative to dso mapping(*), we'll
have to unmap it for ET_EXEC like cases, and leave as is for
ET_DYN cases.
(*) and it is - we've explicitely made it relative. Look for
adjust_symbols handling in dso__load_sym()
Previously we were always unmapping sym->start and for ET_DYN
dsos resulting addresses were wrong, and so objdump output was
empty.
The end result was that perf annotate output for symbols from
non-prelinked *.so had always 0.00% percents only, which is
wrong.
To fix it, let's introduce a helper for converting rip to
objdump address, and also let's document what map_ip() and
unmap_ip() do -- I had to study sources for several hours to
understand it.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1265223128-11786-8-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-02-04 02:52:07 +08:00
|
|
|
/*
|
|
|
|
* objdump wants/reports absolute IPs for ET_EXEC, and RIPs for ET_DYN.
|
|
|
|
* map->dso->adjust_symbols==1 for ET_EXEC-like cases.
|
|
|
|
*/
|
|
|
|
u64 map__rip_2objdump(struct map *map, u64 rip)
|
|
|
|
{
|
|
|
|
u64 addr = map->dso->adjust_symbols ?
|
|
|
|
map->unmap_ip(map, rip) : /* RIP -> IP */
|
|
|
|
rip;
|
|
|
|
return addr;
|
|
|
|
}
|
perf top: Fix annotate for userspace
First, for programs and prelinked libraries, annotate code was
fooled by objdump output IPs (src->eip in the code) being
wrongly converted to absolute IPs. In such case there were no
conversion needed, but in
src->eip = strtoull(src->line, NULL, 16);
src->eip = map->unmap_ip(map, src->eip); // = eip + map->start - map->pgoff
we were reading absolute address from objdump (e.g. 8048604) and
then almost doubling it, because eip & map->start are
approximately close for small programs.
Needless to say, that later, in record_precise_ip() there was no
matching with real runtime IPs.
And second, like with `perf annotate` the problem with
non-prelinked *.so was that we were doing rip -> objdump address
conversion wrong.
Also, because unlike `perf annotate`, `perf top` code does
annotation based on absolute IPs for performance reasons(*), new
helper for mapping objdump addresse to IP is introduced.
(*) we get samples info in absolute IPs, and since we do lots of
hit-testing on absolute IPs at runtime in record_precise_ip(), it's
better to convert objdump addresses to IPs once and do no conversion
at runtime.
I also had to fix how objdump output is parsed (with hardcoded
8/16 characters format, which was inappropriate for ET_DYN dsos
with small addresses like '4ac')
Also note, that not all objdump output lines has associtated
IPs, e.g. look at source lines here:
000004ac <my_strlen>:
extern "C"
int my_strlen(const char *s)
4ac: 55 push %ebp
4ad: 89 e5 mov %esp,%ebp
4af: 83 ec 10 sub $0x10,%esp
{
int len = 0;
4b2: c7 45 fc 00 00 00 00 movl $0x0,-0x4(%ebp)
4b9: eb 08 jmp 4c3 <my_strlen+0x17>
while (*s) {
++len;
4bb: 83 45 fc 01 addl $0x1,-0x4(%ebp)
++s;
4bf: 83 45 08 01 addl $0x1,0x8(%ebp)
So we mark them with eip=0, and ignore such lines in annotate
lookup code.
Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru>
[ Note: one hunk of this patch was applied by Mike in 57d8188 ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
LKML-Reference: <1265550376-12665-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-02-07 21:46:15 +08:00
|
|
|
|
|
|
|
u64 map__objdump_2ip(struct map *map, u64 addr)
|
|
|
|
{
|
|
|
|
u64 ip = map->dso->adjust_symbols ?
|
|
|
|
addr :
|
|
|
|
map->unmap_ip(map, addr); /* RIP -> IP */
|
|
|
|
return ip;
|
|
|
|
}
|
2010-03-26 06:58:58 +08:00
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
void map_groups__init(struct map_groups *mg)
|
2010-03-26 23:11:06 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i) {
|
2011-08-24 01:31:30 +08:00
|
|
|
mg->maps[i] = RB_ROOT;
|
|
|
|
INIT_LIST_HEAD(&mg->removed_maps[i]);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
2011-08-24 01:31:30 +08:00
|
|
|
mg->machine = NULL;
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
static void maps__delete(struct rb_root *maps)
|
2010-07-31 05:28:42 +08:00
|
|
|
{
|
2011-08-24 01:31:30 +08:00
|
|
|
struct rb_node *next = rb_first(maps);
|
2010-07-31 05:28:42 +08:00
|
|
|
|
|
|
|
while (next) {
|
|
|
|
struct map *pos = rb_entry(next, struct map, rb_node);
|
|
|
|
|
|
|
|
next = rb_next(&pos->rb_node);
|
2011-08-24 01:31:30 +08:00
|
|
|
rb_erase(&pos->rb_node, maps);
|
2010-07-31 05:28:42 +08:00
|
|
|
map__delete(pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
static void maps__delete_removed(struct list_head *maps)
|
2010-07-31 05:28:42 +08:00
|
|
|
{
|
|
|
|
struct map *pos, *n;
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
list_for_each_entry_safe(pos, n, maps, node) {
|
2010-07-31 05:28:42 +08:00
|
|
|
list_del(&pos->node);
|
|
|
|
map__delete(pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
void map_groups__exit(struct map_groups *mg)
|
2010-07-31 05:28:42 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i) {
|
2011-08-24 01:31:30 +08:00
|
|
|
maps__delete(&mg->maps[i]);
|
|
|
|
maps__delete_removed(&mg->removed_maps[i]);
|
2010-07-31 05:28:42 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
void map_groups__flush(struct map_groups *mg)
|
2010-03-26 23:11:06 +08:00
|
|
|
{
|
|
|
|
int type;
|
|
|
|
|
|
|
|
for (type = 0; type < MAP__NR_TYPES; type++) {
|
2011-08-24 01:31:30 +08:00
|
|
|
struct rb_root *root = &mg->maps[type];
|
2010-03-26 23:11:06 +08:00
|
|
|
struct rb_node *next = rb_first(root);
|
|
|
|
|
|
|
|
while (next) {
|
|
|
|
struct map *pos = rb_entry(next, struct map, rb_node);
|
|
|
|
next = rb_next(&pos->rb_node);
|
|
|
|
rb_erase(&pos->rb_node, root);
|
|
|
|
/*
|
|
|
|
* We may have references to this map, for
|
|
|
|
* instance in some hist_entry instances, so
|
|
|
|
* just move them to a separate list.
|
|
|
|
*/
|
2011-08-24 01:31:30 +08:00
|
|
|
list_add_tail(&pos->node, &mg->removed_maps[pos->type]);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
struct symbol *map_groups__find_symbol(struct map_groups *mg,
|
2010-03-26 06:58:58 +08:00
|
|
|
enum map_type type, u64 addr,
|
2010-03-26 23:30:40 +08:00
|
|
|
struct map **mapp,
|
2010-03-26 06:58:58 +08:00
|
|
|
symbol_filter_t filter)
|
|
|
|
{
|
2011-08-24 01:31:30 +08:00
|
|
|
struct map *map = map_groups__find(mg, type, addr);
|
2010-03-26 06:58:58 +08:00
|
|
|
|
2010-03-26 23:30:40 +08:00
|
|
|
if (map != NULL) {
|
|
|
|
if (mapp != NULL)
|
|
|
|
*mapp = map;
|
2010-03-26 06:58:58 +08:00
|
|
|
return map__find_symbol(map, map->map_ip(map, addr), filter);
|
2010-03-26 23:30:40 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
struct symbol *map_groups__find_symbol_by_name(struct map_groups *mg,
|
2010-03-26 23:30:40 +08:00
|
|
|
enum map_type type,
|
|
|
|
const char *name,
|
|
|
|
struct map **mapp,
|
|
|
|
symbol_filter_t filter)
|
|
|
|
{
|
|
|
|
struct rb_node *nd;
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
for (nd = rb_first(&mg->maps[type]); nd; nd = rb_next(nd)) {
|
2010-03-26 23:30:40 +08:00
|
|
|
struct map *pos = rb_entry(nd, struct map, rb_node);
|
|
|
|
struct symbol *sym = map__find_symbol_by_name(pos, name, filter);
|
|
|
|
|
|
|
|
if (sym == NULL)
|
|
|
|
continue;
|
|
|
|
if (mapp != NULL)
|
|
|
|
*mapp = pos;
|
|
|
|
return sym;
|
|
|
|
}
|
2010-03-26 06:58:58 +08:00
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
size_t __map_groups__fprintf_maps(struct map_groups *mg,
|
2010-03-26 23:11:06 +08:00
|
|
|
enum map_type type, int verbose, FILE *fp)
|
|
|
|
{
|
|
|
|
size_t printed = fprintf(fp, "%s:\n", map_type__name[type]);
|
|
|
|
struct rb_node *nd;
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
for (nd = rb_first(&mg->maps[type]); nd; nd = rb_next(nd)) {
|
2010-03-26 23:11:06 +08:00
|
|
|
struct map *pos = rb_entry(nd, struct map, rb_node);
|
|
|
|
printed += fprintf(fp, "Map:");
|
|
|
|
printed += map__fprintf(pos, fp);
|
|
|
|
if (verbose > 2) {
|
|
|
|
printed += dso__fprintf(pos->dso, type, fp);
|
|
|
|
printed += fprintf(fp, "--\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
size_t map_groups__fprintf_maps(struct map_groups *mg, int verbose, FILE *fp)
|
2010-03-26 23:11:06 +08:00
|
|
|
{
|
|
|
|
size_t printed = 0, i;
|
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i)
|
2011-08-24 01:31:30 +08:00
|
|
|
printed += __map_groups__fprintf_maps(mg, i, verbose, fp);
|
2010-03-26 23:11:06 +08:00
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
static size_t __map_groups__fprintf_removed_maps(struct map_groups *mg,
|
2010-03-26 23:11:06 +08:00
|
|
|
enum map_type type,
|
|
|
|
int verbose, FILE *fp)
|
|
|
|
{
|
|
|
|
struct map *pos;
|
|
|
|
size_t printed = 0;
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
list_for_each_entry(pos, &mg->removed_maps[type], node) {
|
2010-03-26 23:11:06 +08:00
|
|
|
printed += fprintf(fp, "Map:");
|
|
|
|
printed += map__fprintf(pos, fp);
|
|
|
|
if (verbose > 1) {
|
|
|
|
printed += dso__fprintf(pos->dso, type, fp);
|
|
|
|
printed += fprintf(fp, "--\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
static size_t map_groups__fprintf_removed_maps(struct map_groups *mg,
|
2010-03-26 23:11:06 +08:00
|
|
|
int verbose, FILE *fp)
|
|
|
|
{
|
|
|
|
size_t printed = 0, i;
|
|
|
|
for (i = 0; i < MAP__NR_TYPES; ++i)
|
2011-08-24 01:31:30 +08:00
|
|
|
printed += __map_groups__fprintf_removed_maps(mg, i, verbose, fp);
|
2010-03-26 23:11:06 +08:00
|
|
|
return printed;
|
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
size_t map_groups__fprintf(struct map_groups *mg, int verbose, FILE *fp)
|
2010-03-26 23:11:06 +08:00
|
|
|
{
|
2011-08-24 01:31:30 +08:00
|
|
|
size_t printed = map_groups__fprintf_maps(mg, verbose, fp);
|
2010-03-26 23:11:06 +08:00
|
|
|
printed += fprintf(fp, "Removed maps:\n");
|
2011-08-24 01:31:30 +08:00
|
|
|
return printed + map_groups__fprintf_removed_maps(mg, verbose, fp);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
2011-08-24 01:31:30 +08:00
|
|
|
int map_groups__fixup_overlappings(struct map_groups *mg, struct map *map,
|
2010-03-26 23:11:06 +08:00
|
|
|
int verbose, FILE *fp)
|
|
|
|
{
|
2011-08-24 01:31:30 +08:00
|
|
|
struct rb_root *root = &mg->maps[map->type];
|
2010-03-26 23:11:06 +08:00
|
|
|
struct rb_node *next = rb_first(root);
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
int err = 0;
|
2010-03-26 23:11:06 +08:00
|
|
|
|
|
|
|
while (next) {
|
|
|
|
struct map *pos = rb_entry(next, struct map, rb_node);
|
|
|
|
next = rb_next(&pos->rb_node);
|
|
|
|
|
|
|
|
if (!map__overlap(pos, map))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (verbose >= 2) {
|
|
|
|
fputs("overlapping maps:\n", fp);
|
|
|
|
map__fprintf(map, fp);
|
|
|
|
map__fprintf(pos, fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
rb_erase(&pos->rb_node, root);
|
|
|
|
/*
|
|
|
|
* Now check if we need to create new maps for areas not
|
|
|
|
* overlapped by the new map:
|
|
|
|
*/
|
|
|
|
if (map->start > pos->start) {
|
|
|
|
struct map *before = map__clone(pos);
|
|
|
|
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
if (before == NULL) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto move_map;
|
|
|
|
}
|
2010-03-26 23:11:06 +08:00
|
|
|
|
|
|
|
before->end = map->start - 1;
|
2011-08-24 01:31:30 +08:00
|
|
|
map_groups__insert(mg, before);
|
2010-03-26 23:11:06 +08:00
|
|
|
if (verbose >= 2)
|
|
|
|
map__fprintf(before, fp);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (map->end < pos->end) {
|
|
|
|
struct map *after = map__clone(pos);
|
|
|
|
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
if (after == NULL) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto move_map;
|
|
|
|
}
|
2010-03-26 23:11:06 +08:00
|
|
|
|
|
|
|
after->start = map->end + 1;
|
2011-08-24 01:31:30 +08:00
|
|
|
map_groups__insert(mg, after);
|
2010-03-26 23:11:06 +08:00
|
|
|
if (verbose >= 2)
|
|
|
|
map__fprintf(after, fp);
|
|
|
|
}
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
move_map:
|
|
|
|
/*
|
|
|
|
* If we have references, just move them to a separate list.
|
|
|
|
*/
|
|
|
|
if (pos->referenced)
|
2011-08-24 01:31:30 +08:00
|
|
|
list_add_tail(&pos->node, &mg->removed_maps[map->type]);
|
perf tools: Don't keep unreferenced maps when unmaps are detected
For a file with:
[root@emilia linux-2.6-tip]# perf report -D -fi allmodconfig-j32.perf.data | grep events:
TOTAL events: 36933
MMAP events: 9056
LOST events: 0
COMM events: 1702
EXIT events: 1887
THROTTLE events: 8
UNTHROTTLE events: 8
FORK events: 1894
READ events: 0
SAMPLE events: 22378
ATTR events: 0
EVENT_TYPE events: 0
TRACING_DATA events: 0
BUILD_ID events: 0
[root@emilia linux-2.6-tip]#
Testing with valgrind and making perf_session__delete() a nop, so that
we can notice how many maps were actually deleted due to not having any
samples on it:
==== HEAP SUMMARY:
Before:
==10339== in use at exit: 8,909,997 bytes in 68,690 blocks
==10339== total heap usage: 78,696 allocs, 10,007 frees, 11,925,853 bytes allocated
After:
==10506== in use at exit: 8,902,605 bytes in 68,606 blocks
==10506== total heap usage: 78,696 allocs, 10,091 frees, 11,925,853 bytes allocated
I.e. just 84 detected unmaps with no hits out of 9056 for this workload,
not much, but in some other long running workload this may save more
bytes.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 06:45:23 +08:00
|
|
|
else
|
|
|
|
map__delete(pos);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
return err;
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX This should not really _copy_ te maps, but refcount them.
|
|
|
|
*/
|
2011-08-24 01:31:30 +08:00
|
|
|
int map_groups__clone(struct map_groups *mg,
|
2010-03-26 23:11:06 +08:00
|
|
|
struct map_groups *parent, enum map_type type)
|
|
|
|
{
|
|
|
|
struct rb_node *nd;
|
|
|
|
for (nd = rb_first(&parent->maps[type]); nd; nd = rb_next(nd)) {
|
|
|
|
struct map *map = rb_entry(nd, struct map, rb_node);
|
|
|
|
struct map *new = map__clone(map);
|
|
|
|
if (new == NULL)
|
|
|
|
return -ENOMEM;
|
2011-08-24 01:31:30 +08:00
|
|
|
map_groups__insert(mg, new);
|
2010-03-26 23:11:06 +08:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-03-26 06:58:58 +08:00
|
|
|
static u64 map__reloc_map_ip(struct map *map, u64 ip)
|
|
|
|
{
|
|
|
|
return ip + (s64)map->pgoff;
|
|
|
|
}
|
|
|
|
|
|
|
|
static u64 map__reloc_unmap_ip(struct map *map, u64 ip)
|
|
|
|
{
|
|
|
|
return ip - (s64)map->pgoff;
|
|
|
|
}
|
|
|
|
|
|
|
|
void map__reloc_vmlinux(struct map *self)
|
|
|
|
{
|
|
|
|
struct kmap *kmap = map__kmap(self);
|
|
|
|
s64 reloc;
|
|
|
|
|
|
|
|
if (!kmap->ref_reloc_sym || !kmap->ref_reloc_sym->unrelocated_addr)
|
|
|
|
return;
|
|
|
|
|
|
|
|
reloc = (kmap->ref_reloc_sym->unrelocated_addr -
|
|
|
|
kmap->ref_reloc_sym->addr);
|
|
|
|
|
|
|
|
if (!reloc)
|
|
|
|
return;
|
|
|
|
|
|
|
|
self->map_ip = map__reloc_map_ip;
|
|
|
|
self->unmap_ip = map__reloc_unmap_ip;
|
|
|
|
self->pgoff = reloc;
|
|
|
|
}
|
|
|
|
|
|
|
|
void maps__insert(struct rb_root *maps, struct map *map)
|
|
|
|
{
|
|
|
|
struct rb_node **p = &maps->rb_node;
|
|
|
|
struct rb_node *parent = NULL;
|
|
|
|
const u64 ip = map->start;
|
|
|
|
struct map *m;
|
|
|
|
|
|
|
|
while (*p != NULL) {
|
|
|
|
parent = *p;
|
|
|
|
m = rb_entry(parent, struct map, rb_node);
|
|
|
|
if (ip < m->start)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
}
|
|
|
|
|
|
|
|
rb_link_node(&map->rb_node, parent, p);
|
|
|
|
rb_insert_color(&map->rb_node, maps);
|
|
|
|
}
|
|
|
|
|
perf session: Free the ref_reloc_sym memory at the right place
Which is at perf_session__destroy_kernel_maps, counterpart to the
perf_session__create_kernel_maps where the kmap structure is located, just
after the vmlinux_maps.
Make it also check if the kernel maps were actually created, which may not
be the case if, for instance, perf_session__new can't complete due to
permission problems in, for instance, a 'perf report' case, when a
segfault will take place, that is how this was noticed.
The problem was introduced in d65a458, thus post .35.
This also adds code to release guest machines as them are also created
in perf_session__create_kernel_maps, so should be deleted on this newly
introduced counterpart, perf_session__destroy_kernel_maps.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 05:18:28 +08:00
|
|
|
void maps__remove(struct rb_root *self, struct map *map)
|
|
|
|
{
|
|
|
|
rb_erase(&map->rb_node, self);
|
|
|
|
}
|
|
|
|
|
2010-03-26 06:58:58 +08:00
|
|
|
struct map *maps__find(struct rb_root *maps, u64 ip)
|
|
|
|
{
|
|
|
|
struct rb_node **p = &maps->rb_node;
|
|
|
|
struct rb_node *parent = NULL;
|
|
|
|
struct map *m;
|
|
|
|
|
|
|
|
while (*p != NULL) {
|
|
|
|
parent = *p;
|
|
|
|
m = rb_entry(parent, struct map, rb_node);
|
|
|
|
if (ip < m->start)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else if (ip > m->end)
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
else
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-04-19 13:32:50 +08:00
|
|
|
|
2010-04-28 08:20:43 +08:00
|
|
|
int machine__init(struct machine *self, const char *root_dir, pid_t pid)
|
|
|
|
{
|
|
|
|
map_groups__init(&self->kmaps);
|
|
|
|
RB_CLEAR_NODE(&self->rb_node);
|
|
|
|
INIT_LIST_HEAD(&self->user_dsos);
|
|
|
|
INIT_LIST_HEAD(&self->kernel_dsos);
|
|
|
|
|
2011-11-09 23:24:25 +08:00
|
|
|
self->threads = RB_ROOT;
|
|
|
|
INIT_LIST_HEAD(&self->dead_threads);
|
|
|
|
self->last_match = NULL;
|
|
|
|
|
2010-04-28 08:20:43 +08:00
|
|
|
self->kmaps.machine = self;
|
|
|
|
self->pid = pid;
|
|
|
|
self->root_dir = strdup(root_dir);
|
2012-07-21 07:25:47 +08:00
|
|
|
if (self->root_dir == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
if (pid != HOST_KERNEL_ID) {
|
|
|
|
struct thread *thread = machine__findnew_thread(self, pid);
|
|
|
|
char comm[64];
|
|
|
|
|
|
|
|
if (thread == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
snprintf(comm, sizeof(comm), "[guest/%d]", pid);
|
|
|
|
thread__set_comm(thread, comm);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2010-04-28 08:20:43 +08:00
|
|
|
}
|
|
|
|
|
2010-07-31 05:31:28 +08:00
|
|
|
static void dsos__delete(struct list_head *self)
|
|
|
|
{
|
|
|
|
struct dso *pos, *n;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(pos, n, self, node) {
|
|
|
|
list_del(&pos->node);
|
|
|
|
dso__delete(pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void machine__exit(struct machine *self)
|
|
|
|
{
|
|
|
|
map_groups__exit(&self->kmaps);
|
|
|
|
dsos__delete(&self->user_dsos);
|
|
|
|
dsos__delete(&self->kernel_dsos);
|
|
|
|
free(self->root_dir);
|
|
|
|
self->root_dir = NULL;
|
|
|
|
}
|
|
|
|
|
perf session: Free the ref_reloc_sym memory at the right place
Which is at perf_session__destroy_kernel_maps, counterpart to the
perf_session__create_kernel_maps where the kmap structure is located, just
after the vmlinux_maps.
Make it also check if the kernel maps were actually created, which may not
be the case if, for instance, perf_session__new can't complete due to
permission problems in, for instance, a 'perf report' case, when a
segfault will take place, that is how this was noticed.
The problem was introduced in d65a458, thus post .35.
This also adds code to release guest machines as them are also created
in perf_session__create_kernel_maps, so should be deleted on this newly
introduced counterpart, perf_session__destroy_kernel_maps.
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2010-08-03 05:18:28 +08:00
|
|
|
void machine__delete(struct machine *self)
|
|
|
|
{
|
|
|
|
machine__exit(self);
|
|
|
|
free(self);
|
|
|
|
}
|
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
struct machine *machines__add(struct rb_root *self, pid_t pid,
|
|
|
|
const char *root_dir)
|
2010-04-19 13:32:50 +08:00
|
|
|
{
|
2010-04-28 08:17:50 +08:00
|
|
|
struct rb_node **p = &self->rb_node;
|
2010-04-19 13:32:50 +08:00
|
|
|
struct rb_node *parent = NULL;
|
2010-04-28 08:17:50 +08:00
|
|
|
struct machine *pos, *machine = malloc(sizeof(*machine));
|
2010-04-19 13:32:50 +08:00
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
if (!machine)
|
2010-04-19 13:32:50 +08:00
|
|
|
return NULL;
|
|
|
|
|
2010-04-28 08:20:43 +08:00
|
|
|
if (machine__init(machine, root_dir, pid) != 0) {
|
|
|
|
free(machine);
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-04-19 13:32:50 +08:00
|
|
|
|
|
|
|
while (*p != NULL) {
|
|
|
|
parent = *p;
|
2010-04-28 08:17:50 +08:00
|
|
|
pos = rb_entry(parent, struct machine, rb_node);
|
2010-04-19 13:32:50 +08:00
|
|
|
if (pid < pos->pid)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
}
|
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
rb_link_node(&machine->rb_node, parent, p);
|
|
|
|
rb_insert_color(&machine->rb_node, self);
|
2010-04-19 13:32:50 +08:00
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
return machine;
|
2010-04-19 13:32:50 +08:00
|
|
|
}
|
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
struct machine *machines__find(struct rb_root *self, pid_t pid)
|
2010-04-19 13:32:50 +08:00
|
|
|
{
|
2010-04-28 08:17:50 +08:00
|
|
|
struct rb_node **p = &self->rb_node;
|
2010-04-19 13:32:50 +08:00
|
|
|
struct rb_node *parent = NULL;
|
2010-04-28 08:17:50 +08:00
|
|
|
struct machine *machine;
|
|
|
|
struct machine *default_machine = NULL;
|
2010-04-19 13:32:50 +08:00
|
|
|
|
|
|
|
while (*p != NULL) {
|
|
|
|
parent = *p;
|
2010-04-28 08:17:50 +08:00
|
|
|
machine = rb_entry(parent, struct machine, rb_node);
|
|
|
|
if (pid < machine->pid)
|
2010-04-19 13:32:50 +08:00
|
|
|
p = &(*p)->rb_left;
|
2010-04-28 08:17:50 +08:00
|
|
|
else if (pid > machine->pid)
|
2010-04-19 13:32:50 +08:00
|
|
|
p = &(*p)->rb_right;
|
|
|
|
else
|
2010-04-28 08:17:50 +08:00
|
|
|
return machine;
|
|
|
|
if (!machine->pid)
|
|
|
|
default_machine = machine;
|
2010-04-19 13:32:50 +08:00
|
|
|
}
|
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
return default_machine;
|
2010-04-19 13:32:50 +08:00
|
|
|
}
|
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
struct machine *machines__findnew(struct rb_root *self, pid_t pid)
|
2010-04-19 13:32:50 +08:00
|
|
|
{
|
|
|
|
char path[PATH_MAX];
|
perf kvm: Fix segfault with report and mixed guestmount use
Using the guestmount option on record:
$ perf kvm --guest --host --guestmount=/tmp/guest-mount record -ag
But not the subsequent report:
$ perf kvm report
causes a SEGFAULT in the usual place:
(gdb) bt
0 0x0000000000470356 in machine__mmap_name (self=0x0, bf=0x7fffffffbdb0 " z\370\367\377\177", size=
4096) at util/map.c:712
1 0x00000000004453e8 in perf_event__process_kernel_mmap (tool=0x7fffffffde10, event=0x7ffff7f87e38,
machine=0x0) at util/event.c:550
2 0x00000000004458c9 in perf_event__process_mmap (tool=0x7fffffffde10, event=0x7ffff7f87e38, sample=
0x7fffffffd2a0, machine=0x0) at util/event.c:656
3 0x00000000004733e0 in perf_session_deliver_event (session=0x91aca0, event=0x7ffff7f87e38, sample=
0x7fffffffd2a0, tool=0x7fffffffde10, file_offset=7736) at util/session.c:979
...
The MMAP events in this case already contain the full path to the
module. No need to require it for the report path to.
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1341241977-71535-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2012-07-02 23:12:57 +08:00
|
|
|
const char *root_dir = "";
|
2010-04-28 08:17:50 +08:00
|
|
|
struct machine *machine = machines__find(self, pid);
|
2010-04-19 13:32:50 +08:00
|
|
|
|
perf kvm: Fix segfault with report and mixed guestmount use
Using the guestmount option on record:
$ perf kvm --guest --host --guestmount=/tmp/guest-mount record -ag
But not the subsequent report:
$ perf kvm report
causes a SEGFAULT in the usual place:
(gdb) bt
0 0x0000000000470356 in machine__mmap_name (self=0x0, bf=0x7fffffffbdb0 " z\370\367\377\177", size=
4096) at util/map.c:712
1 0x00000000004453e8 in perf_event__process_kernel_mmap (tool=0x7fffffffde10, event=0x7ffff7f87e38,
machine=0x0) at util/event.c:550
2 0x00000000004458c9 in perf_event__process_mmap (tool=0x7fffffffde10, event=0x7ffff7f87e38, sample=
0x7fffffffd2a0, machine=0x0) at util/event.c:656
3 0x00000000004733e0 in perf_session_deliver_event (session=0x91aca0, event=0x7ffff7f87e38, sample=
0x7fffffffd2a0, tool=0x7fffffffde10, file_offset=7736) at util/session.c:979
...
The MMAP events in this case already contain the full path to the
module. No need to require it for the report path to.
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1341241977-71535-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2012-07-02 23:12:57 +08:00
|
|
|
if (machine && (machine->pid == pid))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if ((pid != HOST_KERNEL_ID) &&
|
|
|
|
(pid != DEFAULT_GUEST_KERNEL_ID) &&
|
|
|
|
(symbol_conf.guestmount)) {
|
|
|
|
sprintf(path, "%s/%d", symbol_conf.guestmount, pid);
|
|
|
|
if (access(path, R_OK)) {
|
|
|
|
pr_err("Can't access file %s\n", path);
|
|
|
|
machine = NULL;
|
|
|
|
goto out;
|
2010-04-19 13:32:50 +08:00
|
|
|
}
|
perf kvm: Fix segfault with report and mixed guestmount use
Using the guestmount option on record:
$ perf kvm --guest --host --guestmount=/tmp/guest-mount record -ag
But not the subsequent report:
$ perf kvm report
causes a SEGFAULT in the usual place:
(gdb) bt
0 0x0000000000470356 in machine__mmap_name (self=0x0, bf=0x7fffffffbdb0 " z\370\367\377\177", size=
4096) at util/map.c:712
1 0x00000000004453e8 in perf_event__process_kernel_mmap (tool=0x7fffffffde10, event=0x7ffff7f87e38,
machine=0x0) at util/event.c:550
2 0x00000000004458c9 in perf_event__process_mmap (tool=0x7fffffffde10, event=0x7ffff7f87e38, sample=
0x7fffffffd2a0, machine=0x0) at util/event.c:656
3 0x00000000004733e0 in perf_session_deliver_event (session=0x91aca0, event=0x7ffff7f87e38, sample=
0x7fffffffd2a0, tool=0x7fffffffde10, file_offset=7736) at util/session.c:979
...
The MMAP events in this case already contain the full path to the
module. No need to require it for the report path to.
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1341241977-71535-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2012-07-02 23:12:57 +08:00
|
|
|
root_dir = path;
|
2010-04-19 13:32:50 +08:00
|
|
|
}
|
|
|
|
|
perf kvm: Fix segfault with report and mixed guestmount use
Using the guestmount option on record:
$ perf kvm --guest --host --guestmount=/tmp/guest-mount record -ag
But not the subsequent report:
$ perf kvm report
causes a SEGFAULT in the usual place:
(gdb) bt
0 0x0000000000470356 in machine__mmap_name (self=0x0, bf=0x7fffffffbdb0 " z\370\367\377\177", size=
4096) at util/map.c:712
1 0x00000000004453e8 in perf_event__process_kernel_mmap (tool=0x7fffffffde10, event=0x7ffff7f87e38,
machine=0x0) at util/event.c:550
2 0x00000000004458c9 in perf_event__process_mmap (tool=0x7fffffffde10, event=0x7ffff7f87e38, sample=
0x7fffffffd2a0, machine=0x0) at util/event.c:656
3 0x00000000004733e0 in perf_session_deliver_event (session=0x91aca0, event=0x7ffff7f87e38, sample=
0x7fffffffd2a0, tool=0x7fffffffde10, file_offset=7736) at util/session.c:979
...
The MMAP events in this case already contain the full path to the
module. No need to require it for the report path to.
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1341241977-71535-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
2012-07-02 23:12:57 +08:00
|
|
|
machine = machines__add(self, pid, root_dir);
|
|
|
|
|
2010-04-19 13:32:50 +08:00
|
|
|
out:
|
2010-04-28 08:17:50 +08:00
|
|
|
return machine;
|
2010-04-19 13:32:50 +08:00
|
|
|
}
|
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
void machines__process(struct rb_root *self, machine__process_t process, void *data)
|
2010-04-19 13:32:50 +08:00
|
|
|
{
|
|
|
|
struct rb_node *nd;
|
|
|
|
|
2010-04-28 08:17:50 +08:00
|
|
|
for (nd = rb_first(self); nd; nd = rb_next(nd)) {
|
|
|
|
struct machine *pos = rb_entry(nd, struct machine, rb_node);
|
2010-04-19 13:32:50 +08:00
|
|
|
process(pos, data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-04-28 08:19:05 +08:00
|
|
|
char *machine__mmap_name(struct machine *self, char *bf, size_t size)
|
2010-04-19 13:32:50 +08:00
|
|
|
{
|
2010-04-28 08:17:50 +08:00
|
|
|
if (machine__is_host(self))
|
2010-04-28 08:19:05 +08:00
|
|
|
snprintf(bf, size, "[%s]", "kernel.kallsyms");
|
2010-04-28 08:17:50 +08:00
|
|
|
else if (machine__is_default_guest(self))
|
2010-04-28 08:19:05 +08:00
|
|
|
snprintf(bf, size, "[%s]", "guest.kernel.kallsyms");
|
2010-04-19 13:32:50 +08:00
|
|
|
else
|
2010-04-28 08:19:05 +08:00
|
|
|
snprintf(bf, size, "[%s.%d]", "guest.kernel.kallsyms", self->pid);
|
2010-04-19 13:32:50 +08:00
|
|
|
|
2010-04-28 08:19:05 +08:00
|
|
|
return bf;
|
2010-04-19 13:32:50 +08:00
|
|
|
}
|