lkml.org 
[lkml]   [2014]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 49/52] perf tools: Build programs to copy 32-bit compatibility VDSOs
    Date
    perf tools copy VDSO out of memory.  However, on 64-bit
    machines there may be 32-bit compatibility VDOs also. To
    copy those requires separate 32-bit executables. This
    patch adds to the build additional programs perf-read-vdso32
    and perf-read-vdsox32 for 32-bit and x32 respectively.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    ---
    tools/perf/Makefile.perf | 37 +++++++++++++++++++++++---
    tools/perf/config/Makefile | 21 +++++++++++++++
    tools/perf/config/Makefile.arch | 8 ++++++
    tools/perf/perf-read-vdso.c | 59 +++++++++++++++++++++++++++++++++++++++++
    4 files changed, 121 insertions(+), 4 deletions(-)
    create mode 100644 tools/perf/perf-read-vdso.c

    diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
    index 9b1f05d..2cd3316 100644
    --- a/tools/perf/Makefile.perf
    +++ b/tools/perf/Makefile.perf
    @@ -60,6 +60,12 @@ include config/utilities.mak
    #
    # Define NO_LIBDW_DWARF_UNWIND if you do not want libdw support
    # for dwarf backtrace post unwind.
    +#
    +# Define NO_PERF_READ_VDSO32 if you do not want to build perf-read-vdso32
    +# for reading the 32-bit compatibility VDSO in 64-bit mode
    +#
    +# Define NO_PERF_READ_VDSOX32 if you do not want to build perf-read-vdsox32
    +# for reading the x32 mode 32-bit compatibility VDSO in 64-bit mode

    ifeq ($(srctree),)
    srctree := $(patsubst %/,%,$(dir $(shell pwd)))
    @@ -171,11 +177,16 @@ $(OUTPUT)python/perf.so: $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS)

    SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))

    -#
    -# Single 'perf' binary right now:
    -#
    PROGRAMS += $(OUTPUT)perf

    +ifndef NO_PERF_READ_VDSO32
    +PROGRAMS += $(OUTPUT)perf-read-vdso32
    +endif
    +
    +ifndef NO_PERF_READ_VDSOX32
    +PROGRAMS += $(OUTPUT)perf-read-vdsox32
    +endif
    +
    # what 'all' will build and 'install' will install, in perfexecdir
    ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)

    @@ -732,6 +743,16 @@ $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o: scripts/python/Perf-Trace-Uti
    $(OUTPUT)perf-%: %.o $(PERFLIBS)
    $(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(filter %.o,$^) $(LIBS)

    +ifndef NO_PERF_READ_VDSO32
    +$(OUTPUT)perf-read-vdso32: perf-read-vdso.c
    + $(QUIET_CC)$(CC) -m32 -Wall -Werror -o $@ perf-read-vdso.c
    +endif
    +
    +ifndef NO_PERF_READ_VDSOX32
    +$(OUTPUT)perf-read-vdsox32: perf-read-vdso.c
    + $(QUIET_CC)$(CC) -mx32 -Wall -Werror -o $@ perf-read-vdso.c
    +endif
    +
    $(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
    $(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)

    @@ -876,6 +897,14 @@ install-bin: all install-gtk
    $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \
    $(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)'; \
    $(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'
    +ifndef NO_PERF_READ_VDSO32
    + $(call QUIET_INSTALL, perf-read-vdso32) \
    + $(INSTALL) $(OUTPUT)perf-read-vdso32 '$(DESTDIR_SQ)$(bindir_SQ)';
    +endif
    +ifndef NO_PERF_READ_VDSOX32
    + $(call QUIET_INSTALL, perf-read-vdsox32) \
    + $(INSTALL) $(OUTPUT)perf-read-vdsox32 '$(DESTDIR_SQ)$(bindir_SQ)';
    +endif
    $(call QUIET_INSTALL, libexec) \
    $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
    $(call QUIET_INSTALL, perf-archive) \
    @@ -928,7 +957,7 @@ config-clean:

    clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean
    $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(OUTPUT)perf.o $(LANG_BINDINGS) $(GTK_OBJS)
    - $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf
    + $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
    $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS $(OUTPUT)PERF-FEATURES $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*
    $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
    $(python-clean)
    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 1f67aa0..45ab040 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -604,6 +604,27 @@ ifdef HAVE_KVM_STAT_SUPPORT
    CFLAGS += -DHAVE_KVM_STAT_SUPPORT
    endif

    +ifeq (${IS_64_BIT}, 1)
    + ifndef NO_PERF_READ_VDSO32
    + CAN_DO := $(shell echo "main() {}" | ${CC} -m32 -x c - >/dev/null 2>/dev/null && echo 1 || echo 0)
    + ifneq (${CAN_DO}, 1)
    + NO_PERF_READ_VDSO32 := 1
    + endif
    + endif
    + ifneq (${IS_X86_64}, 1)
    + NO_PERF_READ_VDSOX32 := 1
    + endif
    + ifndef NO_PERF_READ_VDSOX32
    + CAN_DO := $(shell echo 'main() {}' | ${CC} -mx32 -x c - >/dev/null 2>/dev/null && echo 1 || echo 0)
    + ifneq (${CAN_DO}, 1)
    + NO_PERF_READ_VDSOX32 := 1
    + endif
    + endif
    +else
    + NO_PERF_READ_VDSO32 := 1
    + NO_PERF_READ_VDSOX32 := 1
    +endif
    +
    # Among the variables below, these:
    # perfexecdir
    # template_dir
    diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
    index 4b06719..851cd01 100644
    --- a/tools/perf/config/Makefile.arch
    +++ b/tools/perf/config/Makefile.arch
    @@ -21,3 +21,11 @@ ifeq ($(ARCH),x86_64)
    RAW_ARCH := x86_64
    endif
    endif
    +
    +ifeq (${IS_X86_64}, 1)
    + IS_64_BIT := 1
    +else ifeq ($(ARCH),x86)
    + IS_64_BIT := 0
    +else
    + IS_64_BIT := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1)
    +endif
    diff --git a/tools/perf/perf-read-vdso.c b/tools/perf/perf-read-vdso.c
    new file mode 100644
    index 0000000..a6b49b5
    --- /dev/null
    +++ b/tools/perf/perf-read-vdso.c
    @@ -0,0 +1,59 @@
    +#include <stdio.h>
    +#include <string.h>
    +
    +#define VDSO__MAP_NAME "[vdso]"
    +
    +static int find_vdso_map(void **start, void **end)
    +{
    + FILE *maps;
    + char line[128];
    + int found = 0;
    +
    + maps = fopen("/proc/self/maps", "r");
    + if (!maps) {
    + fprintf(stderr, "vdso: cannot open maps\n");
    + return -1;
    + }
    +
    + while (!found && fgets(line, sizeof(line), maps)) {
    + int m = -1;
    +
    + /* We care only about private r-x mappings. */
    + if (2 != sscanf(line, "%p-%p r-xp %*x %*x:%*x %*u %n",
    + start, end, &m))
    + continue;
    + if (m < 0)
    + continue;
    +
    + if (!strncmp(&line[m], VDSO__MAP_NAME,
    + sizeof(VDSO__MAP_NAME) - 1))
    + found = 1;
    + }
    +
    + fclose(maps);
    + return !found;
    +}
    +
    +int main(void)
    +{
    + void *start, *end;
    + size_t size, written;
    +
    + if (find_vdso_map(&start, &end))
    + return 1;
    +
    + size = end - start;
    +
    + while (size) {
    + written = fwrite(start, 1, size, stdout);
    + if (!written)
    + return 1;
    + start += written;
    + size -= written;
    + }
    +
    + if (fflush(stdout))
    + return 1;
    +
    + return 0;
    +}
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-07-23 11:21    [W:4.492 / U:0.500 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site