Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd2281be 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:

  - Support Intel PT in several tools, enabling the use of the processor trace
    feature introduced in Intel Broadwell processors: (Adrian Hunter)

	 # dmesg | grep Performance
	 # [0.188477] Performance Events: PEBS fmt2+, 16-deep LBR, Broadwell events, full-width counters, Intel PMU driver.
	 # perf record -e intel_pt//u -a sleep 1
	 [ perf record: Woken up 1 times to write data ]
	 [ perf record: Captured and wrote 0.216 MB perf.data ]
	 # perf script # then navigate in the tool output to some area, like this one:
	 184 1030 dl_main (/usr/lib64/ld-2.17.so) => 7f21ba661440 dl_main (/usr/lib64/ld-2.17.so)
	 185 1457 dl_main (/usr/lib64/ld-2.17.so) => 7f21ba669f10 _dl_new_object (/usr/lib64/ld-2.17.so)
	 186 9f37 _dl_new_object (/usr/lib64/ld-2.17.so) => 7f21ba677b90 strlen (/usr/lib64/ld-2.17.so)
	 187 7ba3 strlen (/usr/lib64/ld-2.17.so) => 7f21ba677c75 strlen (/usr/lib64/ld-2.17.so)
	 188 7c78 strlen (/usr/lib64/ld-2.17.so) => 7f21ba669f3c _dl_new_object (/usr/lib64/ld-2.17.so)
	 189 9f8a _dl_new_object (/usr/lib64/ld-2.17.so) => 7f21ba65fab0 calloc@plt (/usr/lib64/ld-2.17.so)
	 190 fab0 calloc@plt (/usr/lib64/ld-2.17.so) => 7f21ba675e70 calloc (/usr/lib64/ld-2.17.so)
	 191 5e87 calloc (/usr/lib64/ld-2.17.so) => 7f21ba65fa90 malloc@plt (/usr/lib64/ld-2.17.so)
	 192 fa90 malloc@plt (/usr/lib64/ld-2.17.so) => 7f21ba675e60 malloc (/usr/lib64/ld-2.17.so)
	 193 5e68 malloc (/usr/lib64/ld-2.17.so) => 7f21ba65fa80 __libc_memalign@plt (/usr/lib64/ld-2.17.so)
	 194 fa80 __libc_memalign@plt (/usr/lib64/ld-2.17.so) => 7f21ba675d50 __libc_memalign (/usr/lib64/ld-2.17.so)
	 195 5d63 __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba675e20 __libc_memalign (/usr/lib64/ld-2.17.so)
	 196 5e40 __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba675d73 __libc_memalign (/usr/lib64/ld-2.17.so)
	 197 5d97 __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba675e18 __libc_memalign (/usr/lib64/ld-2.17.so)
	 198 5e1e __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba675df9 __libc_memalign (/usr/lib64/ld-2.17.so)
	 199 5e10 __libc_memalign (/usr/lib64/ld-2.17.so) => 7f21ba669f8f _dl_new_object (/usr/lib64/ld-2.17.so)
	 200 9fc2 _dl_new_object (/usr/lib64/ld-2.17.so) =>  7f21ba678e70 memcpy (/usr/lib64/ld-2.17.so)
	 201 8e8c memcpy (/usr/lib64/ld-2.17.so) => 7f21ba678ea0 memcpy (/usr/lib64/ld-2.17.so)

  - Fix annotation of vdso (Adrian Hunter)

  - Fix DWARF callchains in 'perf script' (Jiri Olsa)

  - Fix adding probes in kernel syscalls and listing which variables can be
    collected at kernel syscall function lines (Masami Hiramatsu)

Build Fixes:

  - Fix 32-bit compilation error in util/annotate.c (Adrian Hunter)

  - Support static linking with libdw on Fedora 22 (Andi Kleen)

Infrastructure changes:

  - Add a helper function to probe whether cpu-wide tracing is possible (Adrian Hunter)

  - Move vfs_getname storage to per thread area in 'perf trace' (Arnaldo Carvalho de Melo)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 40a2ea1b 5efb1d54

tools/build/Makefile.build

+2 −0
Original line number Original line Diff line number Diff line
@@ -57,6 +57,8 @@ quiet_cmd_cc_i_c = CPP $@ 
quiet_cmd_cc_s_c = AS       $@

quiet_cmd_cc_s_c = AS       $@

      cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<

      cmd_cc_s_c = $(CC) $(c_flags) -S -o $@ $<





quiet_cmd_gen = GEN      $@



# Link agregate command

# Link agregate command

# If there's nothing to link, create empty $@ object.

# If there's nothing to link, create empty $@ object.

quiet_cmd_ld_multi = LD       $@

quiet_cmd_ld_multi = LD       $@

tools/build/feature/Makefile

+6 −1
Original line number Original line Diff line number Diff line
@@ -70,8 +70,13 @@ test-libelf.bin: 
test-glibc.bin:

test-glibc.bin:

	$(BUILD)

	$(BUILD)





DWARFLIBS := -ldw

ifeq ($(findstring -static,${LDFLAGS}),-static)

DWARFLIBS += -lelf -lebl -lz -llzma -lbz2

endif



test-dwarf.bin:

test-dwarf.bin:

	$(BUILD) -ldw

	$(BUILD) $(DWARFLIBS)





test-libelf-mmap.bin:

test-libelf-mmap.bin:

	$(BUILD) -lelf

	$(BUILD) -lelf

tools/perf/.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,3 +29,4 @@ config.mak.autogen 
*.pyc

*.pyc

*.pyo

*.pyo

.config-detected

.config-detected

util/intel-pt-decoder/inat-tables.c

tools/perf/Documentation/intel-pt.txt

0 → 100644
+588 −0

File added.

Preview size limit exceeded, changes collapsed.

tools/perf/Makefile.perf

+10 −2
Original line number Original line Diff line number Diff line
@@ -76,6 +76,12 @@ include config/utilities.mak 
#

#

# Define NO_AUXTRACE if you do not want AUX area tracing support

# Define NO_AUXTRACE if you do not want AUX area tracing support





# As per kernel Makefile, avoid funny character set dependencies

unexport LC_ALL

LC_COLLATE=C

LC_NUMERIC=C

export LC_COLLATE LC_NUMERIC



ifeq ($(srctree),)

ifeq ($(srctree),)

srctree := $(patsubst %/,%,$(dir $(shell pwd)))

srctree := $(patsubst %/,%,$(dir $(shell pwd)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

srctree := $(patsubst %/,%,$(dir $(srctree)))
@@ -135,6 +141,7 @@ INSTALL = install 
FLEX    = flex

FLEX    = flex

BISON   = bison

BISON   = bison

STRIP   = strip

STRIP   = strip

AWK     = awk





LIB_DIR          = $(srctree)/tools/lib/api/

LIB_DIR          = $(srctree)/tools/lib/api/

TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/

TRACE_EVENT_DIR = $(srctree)/tools/lib/traceevent/
@@ -289,7 +296,7 @@ strip: $(PROGRAMS) $(OUTPUT)perf 




PERF_IN := $(OUTPUT)perf-in.o

PERF_IN := $(OUTPUT)perf-in.o





export srctree OUTPUT RM CC LD AR CFLAGS V BISON FLEX

export srctree OUTPUT RM CC LD AR CFLAGS V BISON FLEX AWK

build := -f $(srctree)/tools/build/Makefile.build dir=. obj

build := -f $(srctree)/tools/build/Makefile.build dir=. obj





$(PERF_IN): $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h FORCE

$(PERF_IN): $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)common-cmds.h FORCE
@@ -565,7 +572,8 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean 
	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete

	$(Q)$(RM) $(OUTPUT).config-detected

	$(Q)$(RM) $(OUTPUT).config-detected

	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32

	$(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)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*

	$(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \

		$(OUTPUT)util/intel-pt-decoder/inat-tables.c

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean

	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean

	$(python-clean)

	$(python-clean)