Commit 4e6e311e 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:

User visible fixes:

 - Fallback to kallsyms when using the minimal 'ELF' loader (Arnaldo Carvalho de Melo)

 - Fix annotation with kcore (Adrian Hunter)

 - Fix up srcline histogram key formatting (Arnaldo Carvalho de Melo)

 - Add missing handler for PERF_RECORD_MMAP2 events in 'perf diff' (Kan Liang)

User visible changes/new features:

 - Only print base source file for srcline histogram sort key (Andi Kleen)

 - Support source line numbers in annotate using a hotkey (Andi Kleen)

Infrastructure changes and fixes:

 - Do not poll events that use the system_wide flag (Adrian Hunter)

 - Add perf-read-vdso32 and perf-read-vdsox32 to .gitignore (Adrian Hunter)

 - Only override the default :tid comm entry (Adrian Hunter)

 - Factor out adding new call chain entries (Andi Kleen)

 - Use al.addr to set up call chain (Andi Kleen)

 - Use a common function to resolve symbol or name (Andi Kleen)

 - Fix ftrace:function event recording (Jiri Olsa)

 - Move disable_buildid_cache() to util/build-id.c (Namhyung Kim)

 - Clean up libelf feature support code (Namhyung Kim)

 - Fix typo in python 'perf test' (WANG Chao)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2565711f a8480808

tools/perf/.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ PERF-CFLAGS 
PERF-GUI-VARS

PERF-VERSION-FILE

perf

perf-read-vdso32

perf-read-vdsox32

perf-help

perf-record

perf-report

tools/perf/Makefile.perf

+0 −2
Original line number Diff line number Diff line
@@ -497,8 +497,6 @@ ifneq ($(OUTPUT),) 
endif



ifdef NO_LIBELF

EXTLIBS := $(filter-out -lelf,$(EXTLIBS))



# Remove ELF/DWARF dependent codes

LIB_OBJS := $(filter-out $(OUTPUT)util/symbol-elf.o,$(LIB_OBJS))

LIB_OBJS := $(filter-out $(OUTPUT)util/dwarf-aux.o,$(LIB_OBJS))

tools/perf/builtin-diff.c

+1 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ static int diff__process_sample_event(struct perf_tool *tool __maybe_unused, 
static struct perf_tool tool = {

	.sample	= diff__process_sample_event,

	.mmap	= perf_event__process_mmap,

	.mmap2	= perf_event__process_mmap2,

	.comm	= perf_event__process_comm,

	.exit	= perf_event__process_exit,

	.fork	= perf_event__process_fork,

tools/perf/config/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ CFLAGS += -std=gnu99 
# adding assembler files missing the .GNU-stack linker note.

LDFLAGS += -Wl,-z,noexecstack



EXTLIBS = -lelf -lpthread -lrt -lm -ldl

EXTLIBS = -lpthread -lrt -lm -ldl



ifneq ($(OUTPUT),)

  OUTPUT_FEATURES = $(OUTPUT)config/feature-checks/
@@ -354,6 +354,7 @@ endif # NO_LIBELF 


ifndef NO_LIBELF

  CFLAGS += -DHAVE_LIBELF_SUPPORT

  EXTLIBS += -lelf



  ifeq ($(feature-libelf-mmap), 1)

    CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
@@ -373,7 +374,7 @@ ifndef NO_LIBELF 
    else

      CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)

      LDFLAGS += $(LIBDW_LDFLAGS)

      EXTLIBS += -lelf -ldw

      EXTLIBS += -ldw

    endif # PERF_HAVE_DWARF_REGS

  endif # NO_DWARF

endif # NO_LIBELF

tools/perf/tests/builtin-test.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static struct test { 
		.func = test__hists_link,

	},

	{

		.desc = "Try 'use perf' in python, checking link problems",

		.desc = "Try 'import perf' in python, checking link problems",

		.func = test__python_use,

	},

	{

CRA Git | Maintained and supported by SUSTech CRA and CCSE