From: Adrian Hunter <adrian.hunter@intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org, David Ahern <dsahern@gmail.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@gmail.com>,
Paul Mackerras <paulus@samba.org>,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 50/52] perf tools: Add dso__type()
Date: Tue, 22 Jul 2014 16:17:59 +0300 [thread overview]
Message-ID: <1406035081-14301-51-git-send-email-adrian.hunter@intel.com> (raw)
In-Reply-To: <1406035081-14301-1-git-send-email-adrian.hunter@intel.com>
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.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
tools/perf/util/dso.c | 11 +++++++++++
tools/perf/util/dso.h | 10 ++++++++++
tools/perf/util/symbol-elf.c | 33 +++++++++++++++++++++++++++++++++
tools/perf/util/symbol-minimal.c | 21 +++++++++++++++++++++
tools/perf/util/symbol.h | 2 ++
5 files changed, 77 insertions(+)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c
index e657d86..90d02c66 100644
--- a/tools/perf/util/dso.c
+++ b/tools/perf/util/dso.c
@@ -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);
+}
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index d03720b..1c72a33 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -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; \
@@ -246,4 +254,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 */
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 0387780..ec0b8ea 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -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;
diff --git a/tools/perf/util/symbol-minimal.c b/tools/perf/util/symbol-minimal.c
index 101f55d..c9541fe 100644
--- a/tools/perf/util/symbol-minimal.c
+++ b/tools/perf/util/symbol-minimal.c
@@ -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,
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 31e5400..51fb26b 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -244,6 +244,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,
--
1.8.3.2
next prev parent reply other threads:[~2014-07-22 13:21 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-22 13:17 [PATCH 00/52] perf tools: More preparation for call graph from Intel BTS Adrian Hunter
2014-07-22 13:17 ` [PATCH 01/52] perf tools: Fix jump label always changing during tracing Adrian Hunter
2014-07-22 14:00 ` Arnaldo Carvalho de Melo
2014-07-22 14:11 ` Peter Zijlstra
2014-07-23 6:07 ` Adrian Hunter
2014-07-23 6:58 ` Peter Zijlstra
2014-07-23 7:15 ` Adrian Hunter
2014-07-23 14:05 ` Arnaldo Carvalho de Melo
2014-07-23 6:07 ` Adrian Hunter
2014-07-28 8:22 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 02/52] perf tools: Identify which comms are from exec Adrian Hunter
2014-07-22 13:17 ` [PATCH 03/52] perf tools: Add machine__thread_exec_comm() Adrian Hunter
2014-07-22 13:17 ` [PATCH 04/52] perf tools: Fix missing label symbols Adrian Hunter
2014-07-22 13:17 ` [PATCH 05/52] perf tools: Add machine__kernel_ip() Adrian Hunter
2014-07-22 13:17 ` [PATCH 06/52] perf script: Improve srcline display for BTS Adrian Hunter
2014-07-28 8:22 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 07/52] perf script: Do not print dangling '=>' " Adrian Hunter
2014-07-28 8:22 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 08/52] perf tools: Fix incorrect fd error comparison Adrian Hunter
2014-07-22 13:17 ` [PATCH 09/52] perf tools: Record whether a dso has data Adrian Hunter
2014-07-28 8:22 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 10/52] perf tools: Add dso__data_status_seen() Adrian Hunter
2014-07-28 8:23 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 11/52] perf tools: Let a user specify a PMU event without any config terms Adrian Hunter
2014-07-22 13:17 ` [PATCH 12/52] perf tools: Let default config be defined for a PMU Adrian Hunter
2014-07-22 13:17 ` [PATCH 13/52] perf tools: Add perf_pmu__scan_file() Adrian Hunter
2014-07-22 19:09 ` Jiri Olsa
2014-07-23 6:24 ` Adrian Hunter
2014-07-23 9:36 ` Jiri Olsa
2014-07-23 14:25 ` Arnaldo Carvalho de Melo
2014-07-24 10:06 ` Jiri Olsa
2014-07-24 14:02 ` Arnaldo Carvalho de Melo
2014-07-22 13:17 ` [PATCH 14/52] perf tools: Add dsos__hit_all() Adrian Hunter
2014-07-28 8:23 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 15/52] perf tools: Add cpu to struct thread Adrian Hunter
2014-07-28 8:23 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 16/52] perf tools: Add ability to record the current tid for each cpu Adrian Hunter
2014-07-23 14:34 ` Arnaldo Carvalho de Melo
2014-07-28 8:23 ` [tip:perf/core] perf machine: " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 17/52] perf evlist: Add perf_evlist__set_tracking_event() Adrian Hunter
2014-07-22 19:22 ` Jiri Olsa
2014-07-23 6:25 ` Adrian Hunter
2014-07-23 11:00 ` [PATCH V2 " Adrian Hunter
2014-07-23 13:20 ` Jiri Olsa
2014-07-22 13:17 ` [PATCH 18/52] perf evlist: Add 'system_wide' option Adrian Hunter
2014-07-22 13:17 ` [PATCH 19/52] perf tools: Add id index Adrian Hunter
2014-07-22 13:17 ` [PATCH 20/52] perf pmu: Let pmu's with no events show up on perf list Adrian Hunter
2014-07-22 13:17 ` [PATCH 21/52] perf session: Add ability to skip 4GiB or more Adrian Hunter
2014-07-23 14:45 ` Arnaldo Carvalho de Melo
2014-07-23 19:19 ` [PATCH 1/2] perf session: Add ability to 'skip' a non-piped event stream Adrian Hunter
2014-07-23 19:19 ` [PATCH 2/2] perf session: Add ability to skip 4GiB or more Adrian Hunter
2014-07-28 8:24 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-28 8:24 ` [tip:perf/core] perf session: Add ability to 'skip' a non-piped event stream tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 22/52] perf session: Add perf_session__deliver_synth_event() Adrian Hunter
2014-07-22 13:17 ` [PATCH 23/52] perf tools: Move rdtsc() function Adrian Hunter
2014-07-28 8:23 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 24/52] perf evlist: Add perf_evlist__enable_event_idx() Adrian Hunter
2014-07-22 13:17 ` [PATCH 25/52] perf session: Add perf_session__peek_event() Adrian Hunter
2014-07-22 13:17 ` [PATCH 26/52] perf tools: Add dso__data_size() Adrian Hunter
2014-07-28 8:24 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 27/52] perf tools: Add a thread stack for synthesizing call chains Adrian Hunter
2014-07-22 13:17 ` [PATCH 28/52] perf script: Allow callchains if any event samples them Adrian Hunter
2014-07-25 13:27 ` Arnaldo Carvalho de Melo
2014-07-25 15:32 ` David Ahern
2014-07-27 6:31 ` Adrian Hunter
2014-07-28 1:32 ` Namhyung Kim
2014-07-22 13:17 ` [PATCH 29/52] perf inject: Add --kallsyms parameter Adrian Hunter
2014-07-28 8:27 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 30/52] perf tools: Expose 'addr' functions so they can be reused Adrian Hunter
2014-07-28 8:27 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 31/52] perf tools: Add facility to export data in database-friendly way Adrian Hunter
2014-07-22 13:17 ` [PATCH 32/52] perf tools: Add helpers for calling Python objects Adrian Hunter
2014-07-22 13:17 ` [PATCH 33/52] perf tools: Extend Python script interface to export data in a database-friendly way Adrian Hunter
2014-07-22 13:17 ` [PATCH 34/52] perf tools: Add Python script to export to postgresql Adrian Hunter
2014-07-22 13:17 ` [PATCH 35/52] perf tools: Add flags and insn_len to struct sample Adrian Hunter
2014-07-22 13:17 ` [PATCH 36/52] perf tools: Add branch type to db export Adrian Hunter
2014-07-22 13:17 ` [PATCH 37/52] perf tools: Add branch_type and in_tx to Python export Adrian Hunter
2014-07-22 13:17 ` [PATCH 38/52] perf tools: Enhance the thread stack to output call/return data Adrian Hunter
2014-07-22 13:17 ` [PATCH 39/52] perf tools: Add call information to the database export API Adrian Hunter
2014-07-22 13:17 ` [PATCH 40/52] perf tools: Add call information to Python export Adrian Hunter
2014-07-22 13:17 ` [PATCH 41/52] perf tools: Add 'flush' callback to scripting API Adrian Hunter
2014-07-22 13:17 ` [PATCH 42/52] perf tools: Defer export of comms that were not 'set' Adrian Hunter
2014-07-22 13:17 ` [PATCH 43/52] perf tools: Add perf-with-kcore script Adrian Hunter
2014-07-22 13:17 ` [PATCH 44/52] perf tools: Pass machine to vdso__dso_findnew() Adrian Hunter
2014-07-28 8:24 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 45/52] perf tools: Group VDSO global variables into a structure Adrian Hunter
2014-07-28 8:25 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 46/52] perf tools: Fix the lifetime of the VDSO temporary file Adrian Hunter
2014-07-23 11:23 ` [PATCH V2 " Adrian Hunter
2014-07-28 8:25 ` [tip:perf/core] perf machine: " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 47/52] perf tools: Add vdso__new() Adrian Hunter
2014-07-28 8:25 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 48/52] perf tools: Separate the VDSO map name from the VDSO dso name Adrian Hunter
2014-07-28 8:25 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:17 ` [PATCH 49/52] perf tools: Build programs to copy 32-bit compatibility VDSOs Adrian Hunter
2014-07-23 12:48 ` Jiri Olsa
2014-07-23 13:55 ` Adrian Hunter
2014-07-23 20:44 ` Arnaldo Carvalho de Melo
2014-07-24 10:05 ` [PATCH] " Adrian Hunter
2014-07-24 13:56 ` Arnaldo Carvalho de Melo
2014-07-22 13:17 ` Adrian Hunter [this message]
2014-07-28 8:26 ` [tip:perf/core] perf tools: Add dso__type() tip-bot for Adrian Hunter
2014-07-22 13:18 ` [PATCH 51/52] perf tools: Add thread parameter to vdso__dso_findnew() Adrian Hunter
2014-07-28 8:26 ` [tip:perf/core] " tip-bot for Adrian Hunter
2014-07-22 13:18 ` [PATCH 52/52] perf tools: Add support for 32-bit compatibility VDSOs Adrian Hunter
2014-07-23 13:02 ` Jiri Olsa
2014-07-23 13:59 ` Adrian Hunter
2014-07-23 23:35 ` Namhyung Kim
2014-07-24 7:31 ` [PATCH V2 " Adrian Hunter
2014-07-23 13:05 ` [PATCH " Jiri Olsa
2014-07-23 13:09 ` Arnaldo Carvalho de Melo
2014-07-23 13:10 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406035081-14301-51-git-send-email-adrian.hunter@intel.com \
--to=adrian.hunter@intel.com \
--cc=acme@kernel.org \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=fweisbec@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).