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

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

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

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

 into perf/urgent

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

- Intel PT timestamp fixes (Adrian Hunter)

- Fix Intel JSON fixed counter conversions (Andi Kleen)

- Sync memcpy, cpufeatures and bpf headers with the kernel (Arnaldo Carvalho de Melo)

- Add some more tool tips (Donghyun Kim, Kim SeonYoung, Nambong Ha)

- Fix libtraceevent's kbuffer_read_at_offset() handling of offsets before or
  equal the first event (Namhyung Kim)

- Fix uretprobe probe placement on ppc64le (Ravi Bangoria)

- Support building C++ source files and add feature detection for g++,
  prep work for supporting a builtin clang/llvm, to remove the need for having
  that toolchain installed to automagically build BPF scriptlets that then
  gets uploaded to the kernel via sys_bpf() (Wang Nan)

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

tools/arch/x86/include/asm/cpufeatures.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
#define X86_FEATURE_APERFMPERF	( 3*32+28) /* APERFMPERF */

#define X86_FEATURE_EAGER_FPU	( 3*32+29) /* "eagerfpu" Non lazy FPU restore */

#define X86_FEATURE_NONSTOP_TSC_S3 ( 3*32+30) /* TSC doesn't stop in S3 state */

#define X86_FEATURE_MCE_RECOVERY ( 3*32+31) /* cpu has recoverable machine checks */



/* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */

#define X86_FEATURE_XMM3	( 4*32+ 0) /* "pni" SSE-3 */

tools/arch/x86/lib/memcpy_64.S

+3 −3
Original line number Diff line number Diff line
@@ -181,11 +181,11 @@ ENDPROC(memcpy_orig) 


#ifndef CONFIG_UML

/*

 * memcpy_mcsafe - memory copy with machine check exception handling

 * memcpy_mcsafe_unrolled - memory copy with machine check exception handling

 * Note that we only catch machine checks when reading the source addresses.

 * Writes to target are posted and don't generate machine checks.

 */

ENTRY(memcpy_mcsafe)

ENTRY(memcpy_mcsafe_unrolled)

	cmpl $8, %edx

	/* Less than 8 bytes? Go to byte copy loop */

	jb .L_no_whole_words
@@ -273,7 +273,7 @@ ENTRY(memcpy_mcsafe) 
.L_done_memcpy_trap:

	xorq %rax, %rax

	ret

ENDPROC(memcpy_mcsafe)

ENDPROC(memcpy_mcsafe_unrolled)



	.section .fixup, "ax"

	/* Return -EFAULT for any failure */

tools/build/Build.include

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ if_changed = $(if $(strip $(any-prereq) $(arg-check)), \ 
# - per object C flags

# - BUILD_STR macro to allow '-D"$(variable)"' constructs

c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CFLAGS) -D"BUILD_STR(s)=\#s" $(CFLAGS_$(basetarget).o) $(CFLAGS_$(obj))

cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXXFLAGS_$(basetarget).o) $(CXXFLAGS_$(obj))



###

## HOSTCC C flags

tools/build/Makefile.build

+7 −0
Original line number Diff line number Diff line
@@ -61,6 +61,9 @@ quiet_cmd_cc_o_c = CC $@ 
quiet_cmd_host_cc_o_c = HOSTCC   $@

      cmd_host_cc_o_c = $(HOSTCC) $(host_c_flags) -c -o $@ $<



quiet_cmd_cxx_o_c = CXX      $@

      cmd_cxx_o_c = $(CXX) $(cxx_flags) -c -o $@ $<



quiet_cmd_cpp_i_c = CPP      $@

      cmd_cpp_i_c = $(CC) $(c_flags) -E -o $@ $<
@@ -88,6 +91,10 @@ $(OUTPUT)%.o: %.c FORCE 
	$(call rule_mkdir)

	$(call if_changed_dep,$(host)cc_o_c)



$(OUTPUT)%.o: %.cpp FORCE

	$(call rule_mkdir)

	$(call if_changed_dep,cxx_o_c)



$(OUTPUT)%.o: %.S FORCE

	$(call rule_mkdir)

	$(call if_changed_dep,$(host)cc_o_c)

tools/build/Makefile.feature

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ endif 


feature_check = $(eval $(feature_check_code))

define feature_check_code

  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0)

  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS) $(FEATURE_CHECK_CFLAGS-$(1))" CXXFLAGS="$(EXTRA_CXXFLAGS) $(FEATURE_CHECK_CXXFLAGS-$(1))" LDFLAGS="$(LDFLAGS) $(FEATURE_CHECK_LDFLAGS-$(1))" -C $(feature_dir) $(OUTPUT_FEATURES)test-$1.bin >/dev/null 2>/dev/null && echo 1 || echo 0)

endef



feature_set = $(eval $(feature_set_code))