* [GIT PULL 0/2] perf/urgent fixes
@ 2016-03-30 22:13 Arnaldo Carvalho de Melo
2016-03-30 22:13 ` [PATCH 2/2] perf jit: genelf makes assumptions about endian Arnaldo Carvalho de Melo
2016-03-31 6:28 ` [GIT PULL 0/2] perf/urgent fixes Ingo Molnar
0 siblings, 2 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-03-30 22:13 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Arnaldo Carvalho de Melo, Andres Freund,
Anton Blanchard, Carl Love, linuxppc-dev, Michael Ellerman,
Namhyung Kim, Peter Zijlstra, Stephane Eranian,
Sukadev Bhattiprolu, Arnaldo Carvalho de Melo
Hi Ingo,
Please consider pulling,
- Arnaldo
The following changes since commit f6343be96ebbae38a07e0878810f5bbc0c38cade:
Merge tag 'perf-urgent-for-mingo-20160329' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2016-03-30 12:31:03 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-20160330
for you to fetch changes up to 9f56c092b99b40ce3cf4c6d0134ff7e513c9f1a6:
perf jit: genelf makes assumptions about endian (2016-03-30 18:12:06 -0300)
----------------------------------------------------------------
perf/urgent fixes:
- Fix determination of a callchain node's childlessness in
the top/report TUI, which was preventing navigating some
callchains, --stdio unnaffected (Andres Freund)
- Fix jitdump's genelf assumption that PowerPC is big endian
only (Anton Blanchard)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----------------------------------------------------------------
Andres Freund (1):
perf hists: Fix determination of a callchain node's childlessness
Anton Blanchard (1):
perf jit: genelf makes assumptions about endian
tools/perf/ui/browsers/hists.c | 2 +-
tools/perf/util/genelf.h | 24 ++++++++++--------------
2 files changed, 11 insertions(+), 15 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] perf jit: genelf makes assumptions about endian
2016-03-30 22:13 [GIT PULL 0/2] perf/urgent fixes Arnaldo Carvalho de Melo
@ 2016-03-30 22:13 ` Arnaldo Carvalho de Melo
2016-03-31 6:28 ` [GIT PULL 0/2] perf/urgent fixes Ingo Molnar
1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2016-03-30 22:13 UTC (permalink / raw)
To: Ingo Molnar
Cc: linux-kernel, Anton Blanchard, Carl Love, Stephane Eranian,
Sukadev Bhattiprolu, linuxppc-dev, Arnaldo Carvalho de Melo
From: Anton Blanchard <anton@samba.org>
Commit 9b07e27f88b9 ("perf inject: Add jitdump mmap injection support")
incorrectly assumed that PowerPC is big endian only.
Simplify things by consolidating the define of GEN_ELF_ENDIAN and checking
for __BYTE_ORDER == __BIG_ENDIAN.
The PowerPC checks were also incorrect, they do not match what gcc
emits. We should first look for __powerpc64__, then __powerpc__.
Signed-off-by: Anton Blanchard <anton@samba.org>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Cc: Carl Love <cel@us.ibm.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org
Fixes: 9b07e27f88b9 ("perf inject: Add jitdump mmap injection support")
Link: http://lkml.kernel.org/r/20160329175944.33a211cc@kryten
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/genelf.h | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h
index cd67e64a0494..2fbeb59c4bdd 100644
--- a/tools/perf/util/genelf.h
+++ b/tools/perf/util/genelf.h
@@ -9,36 +9,32 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
#if defined(__arm__)
#define GEN_ELF_ARCH EM_ARM
-#define GEN_ELF_ENDIAN ELFDATA2LSB
#define GEN_ELF_CLASS ELFCLASS32
#elif defined(__aarch64__)
#define GEN_ELF_ARCH EM_AARCH64
-#define GEN_ELF_ENDIAN ELFDATA2LSB
#define GEN_ELF_CLASS ELFCLASS64
#elif defined(__x86_64__)
#define GEN_ELF_ARCH EM_X86_64
-#define GEN_ELF_ENDIAN ELFDATA2LSB
#define GEN_ELF_CLASS ELFCLASS64
#elif defined(__i386__)
#define GEN_ELF_ARCH EM_386
-#define GEN_ELF_ENDIAN ELFDATA2LSB
#define GEN_ELF_CLASS ELFCLASS32
-#elif defined(__ppcle__)
-#define GEN_ELF_ARCH EM_PPC
-#define GEN_ELF_ENDIAN ELFDATA2LSB
-#define GEN_ELF_CLASS ELFCLASS64
-#elif defined(__powerpc__)
-#define GEN_ELF_ARCH EM_PPC64
-#define GEN_ELF_ENDIAN ELFDATA2MSB
-#define GEN_ELF_CLASS ELFCLASS64
-#elif defined(__powerpcle__)
+#elif defined(__powerpc64__)
#define GEN_ELF_ARCH EM_PPC64
-#define GEN_ELF_ENDIAN ELFDATA2LSB
#define GEN_ELF_CLASS ELFCLASS64
+#elif defined(__powerpc__)
+#define GEN_ELF_ARCH EM_PPC
+#define GEN_ELF_CLASS ELFCLASS32
#else
#error "unsupported architecture"
#endif
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define GEN_ELF_ENDIAN ELFDATA2MSB
+#else
+#define GEN_ELF_ENDIAN ELFDATA2LSB
+#endif
+
#if GEN_ELF_CLASS == ELFCLASS64
#define elf_newehdr elf64_newehdr
#define elf_getshdr elf64_getshdr
--
2.5.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [GIT PULL 0/2] perf/urgent fixes
2016-03-30 22:13 [GIT PULL 0/2] perf/urgent fixes Arnaldo Carvalho de Melo
2016-03-30 22:13 ` [PATCH 2/2] perf jit: genelf makes assumptions about endian Arnaldo Carvalho de Melo
@ 2016-03-31 6:28 ` Ingo Molnar
1 sibling, 0 replies; 3+ messages in thread
From: Ingo Molnar @ 2016-03-31 6:28 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: linux-kernel, Andres Freund, Anton Blanchard, Carl Love,
linuxppc-dev, Michael Ellerman, Namhyung Kim, Peter Zijlstra,
Stephane Eranian, Sukadev Bhattiprolu, Arnaldo Carvalho de Melo
* Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> Hi Ingo,
>
> Please consider pulling,
>
> - Arnaldo
>
> The following changes since commit f6343be96ebbae38a07e0878810f5bbc0c38cade:
>
> Merge tag 'perf-urgent-for-mingo-20160329' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2016-03-30 12:31:03 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo-20160330
>
> for you to fetch changes up to 9f56c092b99b40ce3cf4c6d0134ff7e513c9f1a6:
>
> perf jit: genelf makes assumptions about endian (2016-03-30 18:12:06 -0300)
>
> ----------------------------------------------------------------
> perf/urgent fixes:
>
> - Fix determination of a callchain node's childlessness in
> the top/report TUI, which was preventing navigating some
> callchains, --stdio unnaffected (Andres Freund)
>
> - Fix jitdump's genelf assumption that PowerPC is big endian
> only (Anton Blanchard)
>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
>
> ----------------------------------------------------------------
> Andres Freund (1):
> perf hists: Fix determination of a callchain node's childlessness
>
> Anton Blanchard (1):
> perf jit: genelf makes assumptions about endian
>
> tools/perf/ui/browsers/hists.c | 2 +-
> tools/perf/util/genelf.h | 24 ++++++++++--------------
> 2 files changed, 11 insertions(+), 15 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-31 6:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-30 22:13 [GIT PULL 0/2] perf/urgent fixes Arnaldo Carvalho de Melo
2016-03-30 22:13 ` [PATCH 2/2] perf jit: genelf makes assumptions about endian Arnaldo Carvalho de Melo
2016-03-31 6:28 ` [GIT PULL 0/2] perf/urgent fixes Ingo Molnar
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).