Skip to content

Commit

Permalink
perf symbols: Function descriptor symbol lookup
Browse files Browse the repository at this point in the history
Currently symbol resolution does not work for 64-bit programs on architectures
that use function descriptors such as ppc64.

The problem is that a symbol doesn't point to a text address, it points to a
data area that contains (amongst other things) a pointer to the text address.

We look for a section called ".opd" which is the function descriptor area. To
create the full symbol table, when we see a symbol in the function descriptor
section we load the first pointer and use that as the text address.

Cc: Ingo Molnar <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Anton Blanchard <[email protected]>
Signed-off-by: Eric B Munson <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
khers authored and acmel committed Jun 17, 2010
1 parent cf103a1 commit 70c3856
Showing 1 changed file with 34 additions and 3 deletions.
37 changes: 34 additions & 3 deletions tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,25 @@ static bool elf_sec__is_a(GElf_Shdr *self, Elf_Data *secstrs, enum map_type type
}
}

static size_t elf_addr_to_index(Elf *elf, GElf_Addr addr)
{
Elf_Scn *sec = NULL;
GElf_Shdr shdr;
size_t cnt = 1;

while ((sec = elf_nextscn(elf, sec)) != NULL) {
gelf_getshdr(sec, &shdr);

if ((addr >= shdr.sh_addr) &&
(addr < (shdr.sh_addr + shdr.sh_size)))
return cnt;

++cnt;
}

return -1;
}

static int dso__load_sym(struct dso *self, struct map *map, const char *name,
int fd, symbol_filter_t filter, int kmodule)
{
Expand All @@ -944,12 +963,13 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name,
int err = -1;
uint32_t idx;
GElf_Ehdr ehdr;
GElf_Shdr shdr;
Elf_Data *syms;
GElf_Shdr shdr, opdshdr;
Elf_Data *syms, *opddata = NULL;
GElf_Sym sym;
Elf_Scn *sec, *sec_strndx;
Elf_Scn *sec, *sec_strndx, *opdsec;
Elf *elf;
int nr = 0;
size_t opdidx = 0;

elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
if (elf == NULL) {
Expand All @@ -969,6 +989,10 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name,
goto out_elf_end;
}

opdsec = elf_section_by_name(elf, &ehdr, &opdshdr, ".opd", &opdidx);
if (opdsec)
opddata = elf_rawdata(opdsec, NULL);

syms = elf_getdata(sec, NULL);
if (syms == NULL)
goto out_elf_end;
Expand Down Expand Up @@ -1013,6 +1037,13 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name,
if (!is_label && !elf_sym__is_a(&sym, map->type))
continue;

if (opdsec && sym.st_shndx == opdidx) {
u32 offset = sym.st_value - opdshdr.sh_addr;
u64 *opd = opddata->d_buf + offset;
sym.st_value = *opd;
sym.st_shndx = elf_addr_to_index(elf, sym.st_value);
}

sec = elf_getscn(elf, sym.st_shndx);
if (!sec)
goto out_elf_end;
Expand Down

0 comments on commit 70c3856

Please sign in to comment.