Commit 1b2f76d7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.14-20170829' of... 

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

 - Fix remote HITM detection for Skylake in 'perf c2c' (Jiri Olsa)

 - Fixes for the handling of PERF_RECORD_READ records (Jiri Olsa)

 - Fix kprobes blackist symbol lookup in 'perf probe' (Li Bin)

 - The PLT header and entry sizes are not the same in !x86, fix it for ARM and
   AARCH64 (Li Bin)

 - Beautify pkey_{alloc,free,mprotect} arguments in 'perf trace' (Arnaldo Carvalho de Melo)

 - Fix CC, AR, LD external definition, allow flex and bison to be
   externally defined and other related Makefile fixes (David Carrillo-Cisneros)

 - Sync CPU features kernel ABI headers with tooling headers (Arnaldo Carvalho de Melo)

 - Fix path to PMU formats in 'perf stat' documentation (Jack Henschel)

 - Fix static build with newer toolchains (Jiri Olsa)

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

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

+2 −3
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
#define X86_FEATURE_PERFCTR_NB  ( 6*32+24) /* NB performance counter extensions */

#define X86_FEATURE_BPEXT	(6*32+26) /* data breakpoint extension */

#define X86_FEATURE_PTSC	( 6*32+27) /* performance time-stamp counter */

#define X86_FEATURE_PERFCTR_L2	( 6*32+28) /* L2 performance counter extensions */

#define X86_FEATURE_PERFCTR_LLC	( 6*32+28) /* Last Level Cache performance counter extensions */

#define X86_FEATURE_MWAITX	( 6*32+29) /* MWAIT extension (MONITORX/MWAITX) */



/*
@@ -196,7 +196,6 @@ 


#define X86_FEATURE_HW_PSTATE	( 7*32+ 8) /* AMD HW-PState */

#define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */

#define X86_FEATURE_SME		( 7*32+10) /* AMD Secure Memory Encryption */



#define X86_FEATURE_INTEL_PPIN	( 7*32+14) /* Intel Processor Inventory Number */

#define X86_FEATURE_INTEL_PT	( 7*32+15) /* Intel Processor Trace */
@@ -287,7 +286,7 @@ 
#define X86_FEATURE_PAUSEFILTER (15*32+10) /* filtered pause intercept */

#define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */

#define X86_FEATURE_AVIC	(15*32+13) /* Virtual Interrupt Controller */

#define X86_FEATURE_VIRTUAL_VMLOAD_VMSAVE (15*32+15) /* Virtual VMLOAD VMSAVE */

#define X86_FEATURE_V_VMSAVE_VMLOAD (15*32+15) /* Virtual VMSAVE VMLOAD */



/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 16 */

#define X86_FEATURE_AVX512VBMI  (16*32+ 1) /* AVX512 Vector Bit Manipulation instructions*/

tools/arch/x86/include/asm/disabled-features.h

+1 −3
Original line number Diff line number Diff line
@@ -21,13 +21,11 @@ 
# define DISABLE_K6_MTRR	(1<<(X86_FEATURE_K6_MTRR & 31))

# define DISABLE_CYRIX_ARR	(1<<(X86_FEATURE_CYRIX_ARR & 31))

# define DISABLE_CENTAUR_MCR	(1<<(X86_FEATURE_CENTAUR_MCR & 31))

# define DISABLE_PCID		0

#else

# define DISABLE_VME		0

# define DISABLE_K6_MTRR	0

# define DISABLE_CYRIX_ARR	0

# define DISABLE_CENTAUR_MCR	0

# define DISABLE_PCID		(1<<(X86_FEATURE_PCID & 31))

#endif /* CONFIG_X86_64 */



#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
@@ -51,7 +49,7 @@ 
#define DISABLED_MASK1	0

#define DISABLED_MASK2	0

#define DISABLED_MASK3	(DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR)

#define DISABLED_MASK4	(DISABLE_PCID)

#define DISABLED_MASK4	0

#define DISABLED_MASK5	0

#define DISABLED_MASK6	0

#define DISABLED_MASK7	0

tools/build/tests/ex/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ex: 
include $(srctree)/tools/build/Makefile.include



ex: ex-in.o libex-in.o

	gcc -o $@ $^

	$(CC) -o $@ $^



ex.%: fixdep FORCE

	make -f $(srctree)/tools/build/Makefile.build dir=. $@

tools/lib/api/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ srctree := $(patsubst %/,%,$(dir $(srctree))) 
#$(info Determined 'srctree' to be $(srctree))

endif



CC = $(CROSS_COMPILE)gcc

AR = $(CROSS_COMPILE)ar

LD = $(CROSS_COMPILE)ld

CC ?= $(CROSS_COMPILE)gcc

AR ?= $(CROSS_COMPILE)ar

LD ?= $(CROSS_COMPILE)ld



MAKEFLAGS += --no-print-directory
@@ -19,7 +19,7 @@ LIBFILE = $(OUTPUT)libapi.a 
CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC



ifeq ($(CC), clang)

ifeq ($(CC_NO_CLANG), 0)

  CFLAGS += -O3

else

  CFLAGS += -O6

tools/lib/subcmd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ LIBFILE = $(OUTPUT)libsubcmd.a 
CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC



ifeq ($(CC), clang)

ifeq ($(CC_NO_CLANG), 0)

  CFLAGS += -O3

else

  CFLAGS += -O6

CRA Git | Maintained and supported by SUSTech CRA and CCSE