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

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

Merge tag 'perf-core-for-mingo-20160713' 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 changes:

- Finish merging initial SDT (Statically Defined Traces) support, see
  cset comments for details about how it all works (Masami Hiramatsu)

- Support attaching eBPF programs to tracepoints (Wang Nan)

Infrastructure changes:

- Fix up BITS_PER_LONG setting (Arnaldo Carvalho de Melo)

- Add fallback from ELF_C_READ_MMAP to ELF_C_READ in objtool, fixing
  the build in libelf implementations lacking that elf_begin() cmd,
  such as Alpine Linux's (Arnaldo Carvalho de Melo)

- Avoid checking code drift on busybox's diff in objtool (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 7b39cafb 8e5dc848

tools/build/Makefile.feature

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ FEATURE_TESTS_BASIC := \ 
	zlib				\

	lzma				\

	get_cpuid			\

	bpf

	bpf				\

	sdt



# FEATURE_TESTS_BASIC + FEATURE_TESTS_EXTRA is the complete list

# of all feature tests

tools/build/feature/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ FILES= \ 
	test-zlib.bin			\

	test-lzma.bin			\

	test-bpf.bin			\

	test-get_cpuid.bin

	test-get_cpuid.bin		\

	test-sdt.bin



FILES := $(addprefix $(OUTPUT),$(FILES))
@@ -213,6 +214,9 @@ $(OUTPUT)test-get_cpuid.bin: 
$(OUTPUT)test-bpf.bin:

	$(BUILD)



$(OUTPUT)test-sdt.bin:

	$(BUILD)



-include $(OUTPUT)*.d



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

tools/build/feature/test-all.c

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,10 @@ 
# include "test-libcrypto.c"

#undef main



#define main main_test_sdt

# include "test-sdt.c"

#undef main



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

{

	main_test_libpython();
@@ -178,6 +182,7 @@ int main(int argc, char *argv[]) 
	main_test_get_cpuid();

	main_test_bpf();

	main_test_libcrypto();

	main_test_sdt();



	return 0;

}

tools/build/feature/test-sdt.c

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#include <sys/sdt.h>



int main(void)

{

	DTRACE_PROBE(provider, name);

	return 0;

}

tools/include/asm-generic/bitsperlong.h

+19 −5
Original line number Diff line number Diff line
@@ -3,6 +3,24 @@ 


#include <uapi/asm-generic/bitsperlong.h>



/*

 * In the kernel, where this file comes from, we can rely on CONFIG_64BIT,

 * here we have to make amends with what the various compilers provides us

 * to figure out if we're on a 64-bit machine...

 */

#ifdef __SIZEOF_LONG__

# if __SIZEOF_LONG__ == 8

#  define CONFIG_64BIT

# endif

#else

# ifdef __WORDSIZE

#  if __WORDSIZE == 64

#   define CONFIG_64BIT

#  endif

# else

#  error Failed to determine BITS_PER_LONG value

# endif

#endif



#ifdef CONFIG_64BIT

#define BITS_PER_LONG 64
@@ -10,11 +28,7 @@ 
#define BITS_PER_LONG 32

#endif /* CONFIG_64BIT */



/*

 * FIXME: The check currently breaks x86-64 build, so it's

 * temporarily disabled. Please fix x86-64 and reenable

 */

#if 0 && BITS_PER_LONG != __BITS_PER_LONG

#if BITS_PER_LONG != __BITS_PER_LONG

#error Inconsistent word size. Check asm/bitsperlong.h

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE