iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf jit: Enable jitdump support without dwarf

Browse Source 
This patch modifies the build dependencies on the jitdump support in
perf. As it stands jitdump was wrongfully made dependent 100% on using
DWARF. However, the dwarf dependency, only exist if generating the
source line table in genelf_debug.c. The rest of the support does not
need DWARF.

This patch removes the dependency on DWARF for the entire jitdump
support. It keeps it only for the genelf_debug.c support.

Signed-off-by: Maciej Debski <maciejd@google.com>
Reviewed-by: Stephane Eranian <eranian@google.com>
Cc: Anton Blanchard <anton@ozlabs.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1476356383-30100-3-git-send-email-eranian@google.com
Fixes: e12b202f8fb9 ("perf jitdump: Build only on supported archs")
[ Make it build only if NO_LIBELF isn't defined, as jitdump.o will only be built in that case ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Maciej Debski 2016-10-13 03:59:36 -07:00 committed by Arnaldo Carvalho de Melo
parent cdd75e3b0d
commit 621cb4e783
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/Makefile.config
View File

@ -366,7 +366,7 @@ ifndef NO_SDT
endif endif
ifdef PERF_HAVE_JITDUMP ifdef PERF_HAVE_JITDUMP
ifndef NO_DWARF ifndef NO_LIBELF
$(call detected,CONFIG_JITDUMP) $(call detected,CONFIG_JITDUMP)
CFLAGS += -DHAVE_JITDUMP CFLAGS += -DHAVE_JITDUMP
endif endif

2
tools/perf/util/Build
View File

@ -120,7 +120,7 @@ libperf-y += demangle-rust.o
ifdef CONFIG_JITDUMP ifdef CONFIG_JITDUMP
libperf-$(CONFIG_LIBELF) += jitdump.o libperf-$(CONFIG_LIBELF) += jitdump.o
libperf-$(CONFIG_LIBELF) += genelf.o libperf-$(CONFIG_LIBELF) += genelf.o
libperf-$(CONFIG_LIBELF) += genelf_debug.o libperf-$(CONFIG_DWARF) += genelf_debug.o
endif endif
CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

9
tools/perf/util/genelf.c
View File

@ -19,7 +19,9 @@
#include <limits.h> #include <limits.h>
#include <fcntl.h> #include <fcntl.h>
#include <err.h> #include <err.h>
#ifdef HAVE_DWARF_SUPPORT
#include <dwarf.h> #include <dwarf.h>
#endif
#include "perf.h" #include "perf.h"
#include "genelf.h" #include "genelf.h"
@ -161,7 +163,7 @@ gen_build_id(struct buildid_note *note, unsigned long load_addr, const void *cod
int int
jit_write_elf(int fd, uint64_t load_addr, const char *sym, jit_write_elf(int fd, uint64_t load_addr, const char *sym,
const void *code, int csize, const void *code, int csize,
void *debug, int nr_debug_entries) void *debug __maybe_unused, int nr_debug_entries __maybe_unused)
{ {
Elf *e; Elf *e;
Elf_Data *d; Elf_Data *d;
@ -390,11 +392,14 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym,
shdr->sh_size = sizeof(bnote); shdr->sh_size = sizeof(bnote);
shdr->sh_entsize = 0; shdr->sh_entsize = 0;
#ifdef HAVE_DWARF_SUPPORT
if (debug && nr_debug_entries) { if (debug && nr_debug_entries) {
retval = jit_add_debug_info(e, load_addr, debug, nr_debug_entries); retval = jit_add_debug_info(e, load_addr, debug, nr_debug_entries);
if (retval) if (retval)
goto error; goto error;
} else { } else
#endif
{
if (elf_update(e, ELF_C_WRITE) < 0) { if (elf_update(e, ELF_C_WRITE) < 0) {
warnx("elf_update 4 failed"); warnx("elf_update 4 failed");
goto error; goto error;

2
tools/perf/util/genelf.h
View File

@ -4,8 +4,10 @@
/* genelf.c */ /* genelf.c */
int jit_write_elf(int fd, uint64_t code_addr, const char *sym, int jit_write_elf(int fd, uint64_t code_addr, const char *sym,
const void *code, int csize, void *debug, int nr_debug_entries); const void *code, int csize, void *debug, int nr_debug_entries);
#ifdef HAVE_DWARF_SUPPORT
/* genelf_debug.c */ /* genelf_debug.c */
int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries); int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries);
#endif
#if defined(__arm__) #if defined(__arm__)
#define GEN_ELF_ARCH EM_ARM #define GEN_ELF_ARCH EM_ARM