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

Commit fbf8a1e1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

Merge tag 'perf-core-for-mingo-4.17-20180308' 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 to display the IPC/Cycle in 'annotate' TUI, for systems
  where this info can be obtained, like Intel's >= Skylake (Jin Yao)

- Support wildcards on PMU name in dynamic PMU events (Agustin Vega-Frias)

- Display pmu name when printing unmerged events in stat (Agustin Vega-Frias)

- Auto-merge PMU events created by prefix or glob match (Agustin Vega-Frias)

- Fix s390 'call' operations target function annotation (Thomas Richter)

- Handle s390 PC relative load and store instruction in the augmented
  'annotate', code, used so far in the TUI modes of 'perf report' and
  'perf annotate' (Thomas Richter)

- Provide libtraceevent with a kernel symbol resolver, so that
  symbols in tracepoint fields can be resolved when showing them in
  tools such as 'perf report' (Wang YanQing)

- Refactor the cgroups code to look more like other code in tools/perf,
  using cgroup__{put,get} for refcount operations instead of its
  open-coded equivalent, breaking larger functions, etc (Arnaldo Carvalho de Melo)

- Implement support for the -G/--cgroup target in 'perf trace', allowing
  strace like tracing (plus other events, backtraces, etc) for cgroups
  (Arnaldo Carvalho de Melo)

- Update thread shortname in 'perf sched map' when the thread's COMM
  changes (Changbin Du)

- refcount 'struct mem_info', for better sharing it over several
  users, avoid duplicating structs and fixing crashes related to
  use after free (Jiri Olsa)

- Display perf.data version, offsets in 'perf report --header' (Jiri Olsa)

- Record the machine's memory topology information in a perf.data
  feature section, to be used by tools such as 'perf c2c' (Jiri Olsa)

- Fix output of forced groups in the header for 'perf report' --stdio
  and --tui (Jiri Olsa)

- Better support llvm, clang, cxx make tests in the build process (Jiri Olsa)

- Streamline the 'struct perf_mmap' methods, storing some info in the
  struct instead of passing it via various methods, shortening its
  signatures (Kan Liang)

- Update the quipper perf.data parser library site information (Stephane Eranian)

- Correct perf's man pages title markers for asciidoctor (Takashi Iwai)

- Intel PT fixes and refactorings paving the way for implementing
  support for AUX area sampling (Adrian Hunter)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1af22eba 2427b432

tools/build/Makefile.feature

+5 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,11 @@ FEATURE_TESTS_EXTRA := \ 
         liberty-z                      \

         liberty-z                      \

         libunwind-debug-frame          \

         libunwind-debug-frame          \

         libunwind-debug-frame-arm      \

         libunwind-debug-frame-arm      \

         libunwind-debug-frame-aarch64

         libunwind-debug-frame-aarch64  \

         cxx                            \

         llvm                           \

         llvm-version                   \

         clang





FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC)

FEATURE_TESTS ?= $(FEATURE_TESTS_BASIC)

tools/build/feature/Makefile

+10 −4
Original line number Original line Diff line number Diff line
@@ -54,7 +54,10 @@ FILES= \ 
         test-jvmti.bin				\

         test-jvmti.bin				\

         test-sched_getcpu.bin			\

         test-sched_getcpu.bin			\

         test-setns.bin				\

         test-setns.bin				\

         test-libopencsd.bin

         test-libopencsd.bin			\

         test-clang.bin				\

         test-llvm.bin				\

         test-llvm-version.bin





FILES := $(addprefix $(OUTPUT),$(FILES))

FILES := $(addprefix $(OUTPUT),$(FILES))
@@ -257,11 +260,13 @@ $(OUTPUT)test-llvm.bin: 
		-I$(shell $(LLVM_CONFIG) --includedir) 		\

		-I$(shell $(LLVM_CONFIG) --includedir) 		\

		-L$(shell $(LLVM_CONFIG) --libdir)		\

		-L$(shell $(LLVM_CONFIG) --libdir)		\

		$(shell $(LLVM_CONFIG) --libs Core BPF)		\

		$(shell $(LLVM_CONFIG) --libs Core BPF)		\

		$(shell $(LLVM_CONFIG) --system-libs)

		$(shell $(LLVM_CONFIG) --system-libs)		\

		> $(@:.bin=.make.output) 2>&1





$(OUTPUT)test-llvm-version.bin:

$(OUTPUT)test-llvm-version.bin:

	$(BUILDXX) -std=gnu++11 				\

	$(BUILDXX) -std=gnu++11 				\

		-I$(shell $(LLVM_CONFIG) --includedir)

		-I$(shell $(LLVM_CONFIG) --includedir)		\

		> $(@:.bin=.make.output) 2>&1





$(OUTPUT)test-clang.bin:

$(OUTPUT)test-clang.bin:

	$(BUILDXX) -std=gnu++11 				\

	$(BUILDXX) -std=gnu++11 				\
@@ -271,7 +276,8 @@ $(OUTPUT)test-clang.bin: 
		  -lclangFrontend -lclangEdit -lclangLex	\

		  -lclangFrontend -lclangEdit -lclangLex	\

		  -lclangAST -Wl,--end-group 			\

		  -lclangAST -Wl,--end-group 			\

		$(shell $(LLVM_CONFIG) --libs Core option)	\

		$(shell $(LLVM_CONFIG) --libs Core option)	\

		$(shell $(LLVM_CONFIG) --system-libs)

		$(shell $(LLVM_CONFIG) --system-libs)		\

		> $(@:.bin=.make.output) 2>&1





-include $(OUTPUT)*.d

-include $(OUTPUT)*.d

tools/include/linux/bitmap.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ static inline int test_and_set_bit(int nr, unsigned long *addr) 




/**

/**

 * bitmap_alloc - Allocate bitmap

 * bitmap_alloc - Allocate bitmap

 * @nr: Bit to set

 * @nbits: Number of bits

 */

 */

static inline unsigned long *bitmap_alloc(int nbits)

static inline unsigned long *bitmap_alloc(int nbits)

{

{

tools/perf/Documentation/perf-data.txt

+1 −1
Original line number Original line Diff line number Diff line 
perf-data(1)

perf-data(1)

==============

============





NAME

NAME

----

----

tools/perf/Documentation/perf-ftrace.txt

+1 −1
Original line number Original line Diff line number Diff line 
perf-ftrace(1)

perf-ftrace(1)

=============

==============





NAME

NAME

----

----