2009-12-27 23:37:00 +00:00
|
|
|
#ifndef __PERF_MAP_H
|
|
|
|
#define __PERF_MAP_H
|
|
|
|
|
|
|
|
#include <linux/compiler.h>
|
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/rbtree.h>
|
2010-03-25 22:58:58 +00:00
|
|
|
#include <stdio.h>
|
2010-04-28 00:17:50 +00:00
|
|
|
#include <stdbool.h>
|
2010-03-25 22:58:58 +00:00
|
|
|
#include "types.h"
|
2009-12-27 23:37:00 +00:00
|
|
|
|
|
|
|
enum map_type {
|
|
|
|
MAP__FUNCTION = 0,
|
|
|
|
MAP__VARIABLE,
|
|
|
|
};
|
|
|
|
|
|
|
|
#define MAP__NR_TYPES (MAP__VARIABLE + 1)
|
|
|
|
|
2010-02-22 19:15:39 +00:00
|
|
|
extern const char *map_type__name[MAP__NR_TYPES];
|
|
|
|
|
2009-12-27 23:37:00 +00:00
|
|
|
struct dso;
|
2010-02-03 18:52:00 +00:00
|
|
|
struct ref_reloc_sym;
|
|
|
|
struct map_groups;
|
2010-04-28 00:17:50 +00:00
|
|
|
struct machine;
|
2009-12-27 23:37:00 +00:00
|
|
|
|
|
|
|
struct map {
|
|
|
|
union {
|
|
|
|
struct rb_node rb_node;
|
|
|
|
struct list_head node;
|
|
|
|
};
|
|
|
|
u64 start;
|
|
|
|
u64 end;
|
|
|
|
enum map_type type;
|
2010-04-29 18:25:23 +00:00
|
|
|
u32 priv;
|
2009-12-27 23:37:00 +00:00
|
|
|
u64 pgoff;
|
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-03 18:52:07 +00:00
|
|
|
|
|
|
|
/* ip -> dso rip */
|
2009-12-27 23:37:00 +00:00
|
|
|
u64 (*map_ip)(struct map *, u64);
|
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-03 18:52:07 +00:00
|
|
|
/* dso rip -> ip */
|
2009-12-27 23:37:00 +00:00
|
|
|
u64 (*unmap_ip)(struct map *, u64);
|
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-03 18:52:07 +00:00
|
|
|
|
2009-12-27 23:37:00 +00:00
|
|
|
struct dso *dso;
|
2010-04-19 05:32:50 +00:00
|
|
|
struct map_groups *groups;
|
2009-12-27 23:37:00 +00:00
|
|
|
};
|
|
|
|
|
2010-02-03 18:52:00 +00:00
|
|
|
struct kmap {
|
|
|
|
struct ref_reloc_sym *ref_reloc_sym;
|
|
|
|
struct map_groups *kmaps;
|
|
|
|
};
|
|
|
|
|
2010-04-19 05:32:50 +00:00
|
|
|
struct map_groups {
|
2010-04-28 00:17:50 +00:00
|
|
|
struct rb_root maps[MAP__NR_TYPES];
|
|
|
|
struct list_head removed_maps[MAP__NR_TYPES];
|
|
|
|
struct machine *machine;
|
2010-04-19 05:32:50 +00:00
|
|
|
};
|
|
|
|
|
2010-04-28 00:17:50 +00:00
|
|
|
/* Native host kernel uses -1 as pid index in machine */
|
2010-04-19 05:32:50 +00:00
|
|
|
#define HOST_KERNEL_ID (-1)
|
|
|
|
#define DEFAULT_GUEST_KERNEL_ID (0)
|
|
|
|
|
2010-04-28 00:17:50 +00:00
|
|
|
struct machine {
|
|
|
|
struct rb_node rb_node;
|
|
|
|
pid_t pid;
|
|
|
|
char *root_dir;
|
|
|
|
struct list_head user_dsos;
|
|
|
|
struct list_head kernel_dsos;
|
2010-04-19 05:32:50 +00:00
|
|
|
struct map_groups kmaps;
|
2010-04-28 00:17:50 +00:00
|
|
|
struct map *vmlinux_maps[MAP__NR_TYPES];
|
2010-04-19 05:32:50 +00:00
|
|
|
};
|
|
|
|
|
2010-04-29 18:25:23 +00:00
|
|
|
static inline
|
|
|
|
struct map *machine__kernel_map(struct machine *self, enum map_type type)
|
|
|
|
{
|
|
|
|
return self->vmlinux_maps[type];
|
|
|
|
}
|
|
|
|
|
2010-02-03 18:52:00 +00:00
|
|
|
static inline struct kmap *map__kmap(struct map *self)
|
|
|
|
{
|
|
|
|
return (struct kmap *)(self + 1);
|
|
|
|
}
|
|
|
|
|
2009-12-27 23:37:00 +00:00
|
|
|
static inline u64 map__map_ip(struct map *map, u64 ip)
|
|
|
|
{
|
|
|
|
return ip - map->start + map->pgoff;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u64 map__unmap_ip(struct map *map, u64 ip)
|
|
|
|
{
|
|
|
|
return ip + map->start - map->pgoff;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline u64 identity__map_ip(struct map *map __used, u64 ip)
|
|
|
|
{
|
|
|
|
return ip;
|
|
|
|
}
|
|
|
|
|
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-03 18:52:07 +00:00
|
|
|
|
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 13:46:15 +00:00
|
|
|
/* rip/ip <-> addr suitable for passing to `objdump --start-address=` */
|
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-03 18:52:07 +00:00
|
|
|
u64 map__rip_2objdump(struct map *map, u64 rip);
|
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 13:46:15 +00:00
|
|
|
u64 map__objdump_2ip(struct map *map, u64 addr);
|
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-03 18:52:07 +00:00
|
|
|
|
2009-12-27 23:37:00 +00:00
|
|
|
struct symbol;
|
|
|
|
|
|
|
|
typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);
|
|
|
|
|
|
|
|
void map__init(struct map *self, enum map_type type,
|
|
|
|
u64 start, u64 end, u64 pgoff, struct dso *dso);
|
2010-04-19 05:32:50 +00:00
|
|
|
struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
|
|
|
|
u64 pgoff, u32 pid, char *filename,
|
2010-07-27 15:40:02 +00:00
|
|
|
enum map_type type);
|
2009-12-27 23:37:00 +00:00
|
|
|
void map__delete(struct map *self);
|
|
|
|
struct map *map__clone(struct map *self);
|
|
|
|
int map__overlap(struct map *l, struct map *r);
|
|
|
|
size_t map__fprintf(struct map *self, FILE *fp);
|
|
|
|
|
2010-02-03 18:52:00 +00:00
|
|
|
int map__load(struct map *self, symbol_filter_t filter);
|
|
|
|
struct symbol *map__find_symbol(struct map *self,
|
2009-12-27 23:37:00 +00:00
|
|
|
u64 addr, symbol_filter_t filter);
|
|
|
|
struct symbol *map__find_symbol_by_name(struct map *self, const char *name,
|
|
|
|
symbol_filter_t filter);
|
|
|
|
void map__fixup_start(struct map *self);
|
|
|
|
void map__fixup_end(struct map *self);
|
|
|
|
|
2010-02-03 18:52:00 +00:00
|
|
|
void map__reloc_vmlinux(struct map *self);
|
|
|
|
|
2010-03-25 22:58:58 +00:00
|
|
|
size_t __map_groups__fprintf_maps(struct map_groups *self,
|
2010-03-26 15:11:06 +00:00
|
|
|
enum map_type type, int verbose, FILE *fp);
|
2010-03-25 22:58:58 +00:00
|
|
|
void maps__insert(struct rb_root *maps, struct map *map);
|
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-02 21:18:28 +00:00
|
|
|
void maps__remove(struct rb_root *self, struct map *map);
|
2010-03-25 22:58:58 +00:00
|
|
|
struct map *maps__find(struct rb_root *maps, u64 addr);
|
|
|
|
void map_groups__init(struct map_groups *self);
|
2010-07-30 21:28:42 +00:00
|
|
|
void map_groups__exit(struct map_groups *self);
|
2010-03-26 15:11:06 +00:00
|
|
|
int map_groups__clone(struct map_groups *self,
|
|
|
|
struct map_groups *parent, enum map_type type);
|
|
|
|
size_t map_groups__fprintf(struct map_groups *self, int verbose, FILE *fp);
|
|
|
|
size_t map_groups__fprintf_maps(struct map_groups *self, int verbose, FILE *fp);
|
2010-03-25 22:58:58 +00:00
|
|
|
|
2010-04-28 00:17:50 +00:00
|
|
|
typedef void (*machine__process_t)(struct machine *self, void *data);
|
|
|
|
|
|
|
|
void machines__process(struct rb_root *self, machine__process_t process, void *data);
|
|
|
|
struct machine *machines__add(struct rb_root *self, pid_t pid,
|
|
|
|
const char *root_dir);
|
|
|
|
struct machine *machines__find_host(struct rb_root *self);
|
|
|
|
struct machine *machines__find(struct rb_root *self, pid_t pid);
|
|
|
|
struct machine *machines__findnew(struct rb_root *self, pid_t pid);
|
2010-04-28 00:19:05 +00:00
|
|
|
char *machine__mmap_name(struct machine *self, char *bf, size_t size);
|
2010-04-28 00:20:43 +00:00
|
|
|
int machine__init(struct machine *self, const char *root_dir, pid_t pid);
|
2010-07-30 21:31:28 +00:00
|
|
|
void machine__exit(struct machine *self);
|
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-02 21:18:28 +00:00
|
|
|
void machine__delete(struct machine *self);
|
2010-04-19 05:32:50 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Default guest kernel is defined by parameter --guestkallsyms
|
|
|
|
* and --guestmodules
|
|
|
|
*/
|
2010-04-28 00:17:50 +00:00
|
|
|
static inline bool machine__is_default_guest(struct machine *self)
|
2010-04-19 05:32:50 +00:00
|
|
|
{
|
2010-04-28 00:17:50 +00:00
|
|
|
return self ? self->pid == DEFAULT_GUEST_KERNEL_ID : false;
|
2010-04-19 05:32:50 +00:00
|
|
|
}
|
|
|
|
|
2010-04-28 00:17:50 +00:00
|
|
|
static inline bool machine__is_host(struct machine *self)
|
2010-04-19 05:32:50 +00:00
|
|
|
{
|
2010-04-28 00:17:50 +00:00
|
|
|
return self ? self->pid == HOST_KERNEL_ID : false;
|
2010-04-19 05:32:50 +00:00
|
|
|
}
|
|
|
|
|
2010-03-25 22:58:58 +00:00
|
|
|
static inline void map_groups__insert(struct map_groups *self, struct map *map)
|
|
|
|
{
|
2010-04-19 05:32:50 +00:00
|
|
|
maps__insert(&self->maps[map->type], map);
|
|
|
|
map->groups = self;
|
2010-03-25 22:58:58 +00:00
|
|
|
}
|
|
|
|
|
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-02 21:18:28 +00:00
|
|
|
static inline void map_groups__remove(struct map_groups *self, struct map *map)
|
|
|
|
{
|
|
|
|
maps__remove(&self->maps[map->type], map);
|
|
|
|
}
|
|
|
|
|
2010-03-25 22:58:58 +00:00
|
|
|
static inline struct map *map_groups__find(struct map_groups *self,
|
|
|
|
enum map_type type, u64 addr)
|
|
|
|
{
|
|
|
|
return maps__find(&self->maps[type], addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct symbol *map_groups__find_symbol(struct map_groups *self,
|
|
|
|
enum map_type type, u64 addr,
|
2010-03-26 15:30:40 +00:00
|
|
|
struct map **mapp,
|
2010-03-25 22:58:58 +00:00
|
|
|
symbol_filter_t filter);
|
|
|
|
|
2010-03-26 15:30:40 +00:00
|
|
|
struct symbol *map_groups__find_symbol_by_name(struct map_groups *self,
|
|
|
|
enum map_type type,
|
|
|
|
const char *name,
|
|
|
|
struct map **mapp,
|
|
|
|
symbol_filter_t filter);
|
|
|
|
|
2010-04-29 18:25:23 +00:00
|
|
|
static inline
|
|
|
|
struct symbol *machine__find_kernel_symbol(struct machine *self,
|
|
|
|
enum map_type type, u64 addr,
|
|
|
|
struct map **mapp,
|
|
|
|
symbol_filter_t filter)
|
|
|
|
{
|
|
|
|
return map_groups__find_symbol(&self->kmaps, type, addr, mapp, filter);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
|
|
|
struct symbol *machine__find_kernel_function(struct machine *self, u64 addr,
|
|
|
|
struct map **mapp,
|
|
|
|
symbol_filter_t filter)
|
2010-03-26 15:30:40 +00:00
|
|
|
{
|
2010-04-29 18:25:23 +00:00
|
|
|
return machine__find_kernel_symbol(self, MAP__FUNCTION, addr, mapp, filter);
|
2010-03-26 15:30:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
|
|
|
struct symbol *map_groups__find_function_by_name(struct map_groups *self,
|
|
|
|
const char *name, struct map **mapp,
|
|
|
|
symbol_filter_t filter)
|
2010-03-25 22:58:58 +00:00
|
|
|
{
|
2010-03-26 15:30:40 +00:00
|
|
|
return map_groups__find_symbol_by_name(self, MAP__FUNCTION, name, mapp, filter);
|
2010-03-25 22:58:58 +00:00
|
|
|
}
|
|
|
|
|
2010-03-26 15:11:06 +00:00
|
|
|
int map_groups__fixup_overlappings(struct map_groups *self, struct map *map,
|
|
|
|
int verbose, FILE *fp);
|
|
|
|
|
2010-03-25 22:58:58 +00:00
|
|
|
struct map *map_groups__find_by_name(struct map_groups *self,
|
|
|
|
enum map_type type, const char *name);
|
2010-04-28 00:20:43 +00:00
|
|
|
struct map *machine__new_module(struct machine *self, u64 start, const char *filename);
|
2010-04-19 05:32:50 +00:00
|
|
|
|
2010-03-26 15:11:06 +00:00
|
|
|
void map_groups__flush(struct map_groups *self);
|
2010-03-25 22:58:58 +00:00
|
|
|
|
2009-12-27 23:37:00 +00:00
|
|
|
#endif /* __PERF_MAP_H */
|