perf tools: Build programs to copy 32-bit compatibility
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> Cc: Peter Zijlstra <peterz@infradead.org> 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: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1414061124-26830-15-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Adrian Hunter
Arnaldo Carvalho de Melo
parent
42634bc7a0
commit
e477f3f01a
8 changed files with 149 additions and 37 deletions
|
|
@ -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)
|
||||
|
||||
|
|
@ -253,6 +264,7 @@ LIB_H += util/event.h
|
|||
LIB_H += util/evsel.h
|
||||
LIB_H += util/evlist.h
|
||||
LIB_H += util/exec_cmd.h
|
||||
LIB_H += util/find-vdso-map.c
|
||||
LIB_H += util/levenshtein.h
|
||||
LIB_H += util/machine.h
|
||||
LIB_H += util/map.h
|
||||
|
|
@ -732,6 +744,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 util/find-vdso-map.c
|
||||
$(QUIET_CC)$(CC) -m32 $(filter -static,$(LDFLAGS)) -Wall -Werror -o $@ perf-read-vdso.c
|
||||
endif
|
||||
|
||||
ifndef NO_PERF_READ_VDSOX32
|
||||
$(OUTPUT)perf-read-vdsox32: perf-read-vdso.c util/find-vdso-map.c
|
||||
$(QUIET_CC)$(CC) -mx32 $(filter -static,$(LDFLAGS)) -Wall -Werror -o $@ perf-read-vdso.c
|
||||
endif
|
||||
|
||||
$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
|
||||
$(patsubst perf-%,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
|
||||
|
||||
|
|
@ -876,6 +898,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 +958,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)
|
||||
|
|
|
|||
|
|
@ -230,7 +230,9 @@ VF_FEATURE_TESTS = \
|
|||
bionic \
|
||||
liberty \
|
||||
liberty-z \
|
||||
cplus-demangle
|
||||
cplus-demangle \
|
||||
compile-32 \
|
||||
compile-x32
|
||||
|
||||
# Set FEATURE_CHECK_(C|LD)FLAGS-all for all CORE_FEATURE_TESTS features.
|
||||
# If in the future we need per-feature checks/flags for features not
|
||||
|
|
@ -622,6 +624,27 @@ ifdef HAVE_KVM_STAT_SUPPORT
|
|||
CFLAGS += -DHAVE_KVM_STAT_SUPPORT
|
||||
endif
|
||||
|
||||
ifeq (${IS_64_BIT}, 1)
|
||||
ifndef NO_PERF_READ_VDSO32
|
||||
$(call feature_check,compile-32)
|
||||
ifneq ($(feature-compile-32), 1)
|
||||
NO_PERF_READ_VDSO32 := 1
|
||||
endif
|
||||
endif
|
||||
ifneq (${IS_X86_64}, 1)
|
||||
NO_PERF_READ_VDSOX32 := 1
|
||||
endif
|
||||
ifndef NO_PERF_READ_VDSOX32
|
||||
$(call feature_check,compile-x32)
|
||||
ifneq ($(feature-compile-x32), 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -27,7 +27,9 @@ FILES= \
|
|||
test-libunwind-debug-frame.bin \
|
||||
test-stackprotector-all.bin \
|
||||
test-timerfd.bin \
|
||||
test-libdw-dwarf-unwind.bin
|
||||
test-libdw-dwarf-unwind.bin \
|
||||
test-compile-32.bin \
|
||||
test-compile-x32.bin
|
||||
|
||||
CC := $(CROSS_COMPILE)gcc -MD
|
||||
PKG_CONFIG := $(CROSS_COMPILE)pkg-config
|
||||
|
|
@ -131,6 +133,12 @@ test-libdw-dwarf-unwind.bin:
|
|||
test-sync-compare-and-swap.bin:
|
||||
$(BUILD) -Werror
|
||||
|
||||
test-compile-32.bin:
|
||||
$(CC) -m32 -o $(OUTPUT)$@ test-compile.c
|
||||
|
||||
test-compile-x32.bin:
|
||||
$(CC) -mx32 -o $(OUTPUT)$@ test-compile.c
|
||||
|
||||
-include *.d
|
||||
|
||||
###############################
|
||||
|
|
|
|||
4
tools/perf/config/feature-checks/test-compile.c
Normal file
4
tools/perf/config/feature-checks/test-compile.c
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
int main(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
34
tools/perf/perf-read-vdso.c
Normal file
34
tools/perf/perf-read-vdso.c
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#define VDSO__MAP_NAME "[vdso]"
|
||||
|
||||
/*
|
||||
* Include definition of find_vdso_map() also used in util/vdso.c for
|
||||
* building perf.
|
||||
*/
|
||||
#include "util/find-vdso-map.c"
|
||||
|
||||
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;
|
||||
}
|
||||
30
tools/perf/util/find-vdso-map.c
Normal file
30
tools/perf/util/find-vdso-map.c
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
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;
|
||||
}
|
||||
|
|
@ -15,6 +15,12 @@
|
|||
#include "linux/string.h"
|
||||
#include "debug.h"
|
||||
|
||||
/*
|
||||
* Include definition of find_vdso_map() also used in perf-read-vdso.c for
|
||||
* building perf-read-vdso32 and perf-read-vdsox32.
|
||||
*/
|
||||
#include "find-vdso-map.c"
|
||||
|
||||
#define VDSO__TEMP_FILE_NAME "/tmp/perf-vdso.so-XXXXXX"
|
||||
|
||||
struct vdso_file {
|
||||
|
|
@ -40,37 +46,6 @@ static struct vdso_info *vdso_info__new(void)
|
|||
return memdup(&vdso_info_init, sizeof(vdso_info_init));
|
||||
}
|
||||
|
||||
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) {
|
||||
pr_err("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;
|
||||
}
|
||||
|
||||
static char *get_file(struct vdso_file *vdso_file)
|
||||
{
|
||||
char *vdso = NULL;
|
||||
|
|
|
|||
Loading…
Reference in a new issue