Commit 322cd21f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

Infrastructure changes:

 - Add gzip decompression support for kernel modules (Namhyung Kim)

 - More prep patches for Intel PT, including a a thread stack and
   more stuff made available via the database export mechanism (Adrian Hunter)

 - Optimize checking that tracepoint events are defined in perf script perl/python (Jiri Olsa)

 - Do not free pevent when deleting tracepoint evsel (Jiri Olsa)

 - Fix build-id matching for vmlinux (Namhyung Kim)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 05b2537e daa01794

tools/perf/Makefile.perf

+9 −0
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ include config/utilities.mak 
#

# 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

#

# Define NO_ZLIB if you do not want to support compressed kernel modules





ifeq ($(srctree),)

srctree := $(patsubst %/,%,$(dir $(shell pwd)))
@@ -317,6 +320,7 @@ LIB_H += ui/util.h 
LIB_H += ui/ui.h

LIB_H += util/data.h

LIB_H += util/kvm-stat.h

LIB_H += util/thread-stack.h



LIB_OBJS += $(OUTPUT)util/abspath.o

LIB_OBJS += $(OUTPUT)util/alias.o
@@ -394,6 +398,7 @@ LIB_OBJS += $(OUTPUT)util/srcline.o 
LIB_OBJS += $(OUTPUT)util/data.o

LIB_OBJS += $(OUTPUT)util/tsc.o

LIB_OBJS += $(OUTPUT)util/cloexec.o

LIB_OBJS += $(OUTPUT)util/thread-stack.o



LIB_OBJS += $(OUTPUT)ui/setup.o

LIB_OBJS += $(OUTPUT)ui/helpline.o
@@ -582,6 +587,10 @@ ifndef NO_LIBNUMA 
  BUILTIN_OBJS += $(OUTPUT)bench/numa.o

endif



ifndef NO_ZLIB

  LIB_OBJS += $(OUTPUT)util/zlib.o

endif



ifdef ASCIIDOC8

  export ASCIIDOC8

endif

tools/perf/builtin-record.c

+11 −0
Original line number Diff line number Diff line
@@ -200,6 +200,17 @@ static int process_buildids(struct record *rec) 
	if (size == 0)

		return 0;



	/*

	 * During this process, it'll load kernel map and replace the

	 * dso->long_name to a real pathname it found.  In this case

	 * we prefer the vmlinux path like

	 *   /lib/modules/3.16.4/build/vmlinux

	 *

	 * rather than build-id path (in debug directory).

	 *   $HOME/.debug/.build-id/f0/6e17aa50adf4d00b88925e03775de107611551

	 */

	symbol_conf.ignore_vmlinux_buildid = true;



	return __perf_session__process_events(session, start,

					      size - start,

					      size, &build_id__mark_dso_hit_ops);

tools/perf/config/Makefile

+13 −2
Original line number Diff line number Diff line
@@ -200,7 +200,8 @@ CORE_FEATURE_TESTS = \ 
	libunwind			\

	stackprotector-all		\

	timerfd				\

	libdw-dwarf-unwind

	libdw-dwarf-unwind		\

	zlib



LIB_FEATURE_TESTS =			\

	dwarf				\
@@ -214,7 +215,8 @@ LIB_FEATURE_TESTS = \ 
	libpython			\

	libslang			\

	libunwind			\

	libdw-dwarf-unwind

	libdw-dwarf-unwind		\

	zlib



VF_FEATURE_TESTS =			\

	backtrace			\
@@ -604,6 +606,15 @@ ifneq ($(filter -lbfd,$(EXTLIBS)),) 
  CFLAGS += -DHAVE_LIBBFD_SUPPORT

endif



ifndef NO_ZLIB

  ifeq ($(feature-zlib), 1)

    CFLAGS += -DHAVE_ZLIB_SUPPORT

    EXTLIBS += -lz

  else

    NO_ZLIB := 1

  endif

endif



ifndef NO_BACKTRACE

  ifeq ($(feature-backtrace), 1)

    CFLAGS += -DHAVE_BACKTRACE_SUPPORT

tools/perf/config/feature-checks/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ FILES= \ 
	test-timerfd.bin		\

	test-libdw-dwarf-unwind.bin	\

	test-compile-32.bin		\

	test-compile-x32.bin

	test-compile-x32.bin		\

	test-zlib.bin



CC := $(CROSS_COMPILE)gcc -MD

PKG_CONFIG := $(CROSS_COMPILE)pkg-config
@@ -41,7 +42,7 @@ BUILD = $(CC) $(CFLAGS) -o $(OUTPUT)$@ $(patsubst %.bin,%.c,$@) $(LDFLAGS) 
###############################



test-all.bin:

	$(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl

	$(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz



test-hello.bin:

	$(BUILD)
@@ -139,6 +140,9 @@ test-compile-32.bin: 
test-compile-x32.bin:

	$(CC) -mx32 -o $(OUTPUT)$@ test-compile.c



test-zlib.bin:

	$(BUILD) -lz



-include *.d



###############################

tools/perf/config/feature-checks/test-all.c

+5 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ 
# include "test-sync-compare-and-swap.c"

#undef main



#define main main_test_zlib

# include "test-zlib.c"

#undef main



int main(int argc, char *argv[])

{

	main_test_libpython();
@@ -116,6 +120,7 @@ int main(int argc, char *argv[]) 
	main_test_stackprotector_all();

	main_test_libdw_dwarf_unwind();

	main_test_sync_compare_and_swap(argc, argv);

	main_test_zlib();



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE