Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b5b8bb2 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add dso__type() 



dso__type() determines wheather a dso is 32-bit, x32 (32-bit with 64-bit
registers) or 64-bit.

dso__type() will be used to determine the VDSO a program maps.

Reviewed-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1406035081-14301-51-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 51682dc7

tools/perf/util/dso.c

+11 −0
Original line number Diff line number Diff line
@@ -940,3 +940,14 @@ size_t dso__fprintf(struct dso *dso, enum map_type type, FILE *fp) 


	return ret;

}



enum dso_type dso__type(struct dso *dso, struct machine *machine)

{

	int fd;



	fd = dso__data_fd(dso, machine);

	if (fd < 0)

		return DSO__TYPE_UNKNOWN;



	return dso__type_fd(fd);

}

tools/perf/util/dso.h

+10 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <linux/rbtree.h>

#include <stdbool.h>

#include <linux/types.h>

#include <linux/bitops.h>

#include "map.h"

#include "build-id.h"
@@ -50,6 +51,13 @@ enum dso_data_status_seen { 
	DSO_DATA_STATUS_SEEN_ITRACE,

};



enum dso_type {

	DSO__TYPE_UNKNOWN,

	DSO__TYPE_64BIT,

	DSO__TYPE_32BIT,

	DSO__TYPE_X32BIT,

};



#define DSO__SWAP(dso, type, val)			\

({							\

	type ____r = val;				\
@@ -245,4 +253,6 @@ static inline bool dso__is_kcore(struct dso *dso) 


void dso__free_a2l(struct dso *dso);



enum dso_type dso__type(struct dso *dso, struct machine *machine);



#endif /* __PERF_DSO */

tools/perf/util/symbol-elf.c

+33 −0
Original line number Diff line number Diff line
@@ -1028,6 +1028,39 @@ int file__read_maps(int fd, bool exe, mapfn_t mapfn, void *data, 
	return err;

}



enum dso_type dso__type_fd(int fd)

{

	enum dso_type dso_type = DSO__TYPE_UNKNOWN;

	GElf_Ehdr ehdr;

	Elf_Kind ek;

	Elf *elf;



	elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);

	if (elf == NULL)

		goto out;



	ek = elf_kind(elf);

	if (ek != ELF_K_ELF)

		goto out_end;



	if (gelf_getclass(elf) == ELFCLASS64) {

		dso_type = DSO__TYPE_64BIT;

		goto out_end;

	}



	if (gelf_getehdr(elf, &ehdr) == NULL)

		goto out_end;



	if (ehdr.e_machine == EM_X86_64)

		dso_type = DSO__TYPE_X32BIT;

	else

		dso_type = DSO__TYPE_32BIT;

out_end:

	elf_end(elf);

out:

	return dso_type;

}



static int copy_bytes(int from, off_t from_offs, int to, off_t to_offs, u64 len)

{

	ssize_t r;

tools/perf/util/symbol-minimal.c

+21 −0
Original line number Diff line number Diff line
@@ -305,6 +305,27 @@ static int fd__is_64_bit(int fd) 
	return e_ident[EI_CLASS] == ELFCLASS64;

}



enum dso_type dso__type_fd(int fd)

{

	Elf64_Ehdr ehdr;

	int ret;



	ret = fd__is_64_bit(fd);

	if (ret < 0)

		return DSO__TYPE_UNKNOWN;



	if (ret)

		return DSO__TYPE_64BIT;



	if (readn(fd, &ehdr, sizeof(ehdr)) != sizeof(ehdr))

		return DSO__TYPE_UNKNOWN;



	if (ehdr.e_machine == EM_X86_64)

		return DSO__TYPE_X32BIT;



	return DSO__TYPE_32BIT;

}



int dso__load_sym(struct dso *dso, struct map *map __maybe_unused,

		  struct symsrc *ss,

		  struct symsrc *runtime_ss __maybe_unused,

tools/perf/util/symbol.h

+2 −0
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type, 
struct symbol *dso__first_symbol(struct dso *dso, enum map_type type);

struct symbol *dso__next_symbol(struct symbol *sym);



enum dso_type dso__type_fd(int fd);



int filename__read_build_id(const char *filename, void *bf, size_t size);

int sysfs__read_build_id(const char *filename, void *bf, size_t size);

int modules__parse(const char *filename, void *arg,