Commit 64598e8b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.21-20190104' of... 

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

perf annotate:

  Ivan Krylov:

  - Pass filename to objdump via execl, fixing usage with filenames
    with special characters.

perf report:

  Jin Yao:

     Fix wrong iteration count in --branch-history

perf stat:

  Jin Yao:

  - Fix endless wait for child process

perf test:

  Arnaldo Carvalho de Melo:

  - Use a fallback to get the pathname in vfs_getname in

tools build:

  Jiri Olsa:

  - Allow overriding CFLAGS assignments.

Misc:

  Arnaldo Carvalho de Melo:

  - Syncronize UAPI headers

  Mattias Jacobsson:

  - Remove redundant va_end() in strbuf_addv()

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3bd6e94b 03fa4838

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -281,9 +281,11 @@ 
#define X86_FEATURE_CLZERO		(13*32+ 0) /* CLZERO instruction */

#define X86_FEATURE_CLZERO		(13*32+ 0) /* CLZERO instruction */

#define X86_FEATURE_IRPERF		(13*32+ 1) /* Instructions Retired Count */

#define X86_FEATURE_IRPERF		(13*32+ 1) /* Instructions Retired Count */

#define X86_FEATURE_XSAVEERPTR		(13*32+ 2) /* Always save/restore FP error pointers */

#define X86_FEATURE_XSAVEERPTR		(13*32+ 2) /* Always save/restore FP error pointers */

#define X86_FEATURE_WBNOINVD		(13*32+ 9) /* WBNOINVD instruction */

#define X86_FEATURE_AMD_IBPB		(13*32+12) /* "" Indirect Branch Prediction Barrier */

#define X86_FEATURE_AMD_IBPB		(13*32+12) /* "" Indirect Branch Prediction Barrier */

#define X86_FEATURE_AMD_IBRS		(13*32+14) /* "" Indirect Branch Restricted Speculation */

#define X86_FEATURE_AMD_IBRS		(13*32+14) /* "" Indirect Branch Restricted Speculation */

#define X86_FEATURE_AMD_STIBP		(13*32+15) /* "" Single Thread Indirect Branch Predictors */

#define X86_FEATURE_AMD_STIBP		(13*32+15) /* "" Single Thread Indirect Branch Predictors */

#define X86_FEATURE_AMD_STIBP_ALWAYS_ON	(13*32+17) /* "" Single Thread Indirect Branch Predictors always-on preferred */

#define X86_FEATURE_AMD_SSBD		(13*32+24) /* "" Speculative Store Bypass Disable */

#define X86_FEATURE_AMD_SSBD		(13*32+24) /* "" Speculative Store Bypass Disable */

#define X86_FEATURE_VIRT_SSBD		(13*32+25) /* Virtualized Speculative Store Bypass Disable */

#define X86_FEATURE_VIRT_SSBD		(13*32+25) /* Virtualized Speculative Store Bypass Disable */

#define X86_FEATURE_AMD_SSB_NO		(13*32+26) /* "" Speculative Store Bypass is fixed in hardware. */

#define X86_FEATURE_AMD_SSB_NO		(13*32+26) /* "" Speculative Store Bypass is fixed in hardware. */

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,12 @@ 
# define DISABLE_MPX	(1<<(X86_FEATURE_MPX & 31))

# define DISABLE_MPX	(1<<(X86_FEATURE_MPX & 31))

#endif

#endif





#ifdef CONFIG_X86_SMAP

# define DISABLE_SMAP	0

#else

# define DISABLE_SMAP	(1<<(X86_FEATURE_SMAP & 31))

#endif



#ifdef CONFIG_X86_INTEL_UMIP

#ifdef CONFIG_X86_INTEL_UMIP

# define DISABLE_UMIP	0

# define DISABLE_UMIP	0

#else

#else
@@ -68,7 +74,7 @@ 
#define DISABLED_MASK6	0

#define DISABLED_MASK6	0

#define DISABLED_MASK7	(DISABLE_PTI)

#define DISABLED_MASK7	(DISABLE_PTI)

#define DISABLED_MASK8	0

#define DISABLED_MASK8	0

#define DISABLED_MASK9	(DISABLE_MPX)

#define DISABLED_MASK9	(DISABLE_MPX|DISABLE_SMAP)

#define DISABLED_MASK10	0

#define DISABLED_MASK10	0

#define DISABLED_MASK11	0

#define DISABLED_MASK11	0

#define DISABLED_MASK12	0

#define DISABLED_MASK12	0

tools/include/uapi/asm-generic/unistd.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -738,9 +738,11 @@ __SYSCALL(__NR_statx, sys_statx) 
__SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)

__SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)

#define __NR_rseq 293

#define __NR_rseq 293

__SYSCALL(__NR_rseq, sys_rseq)

__SYSCALL(__NR_rseq, sys_rseq)

#define __NR_kexec_file_load 294

__SYSCALL(__NR_kexec_file_load,     sys_kexec_file_load)





#undef __NR_syscalls

#undef __NR_syscalls

#define __NR_syscalls 294

#define __NR_syscalls 295





/*

/*

 * 32 bit systems traditionally used different

 * 32 bit systems traditionally used different

tools/include/uapi/drm/i915_drm.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -412,6 +412,14 @@ typedef struct drm_i915_irq_wait { 
	int irq_seq;

	int irq_seq;

} drm_i915_irq_wait_t;

} drm_i915_irq_wait_t;





/*

 * Different modes of per-process Graphics Translation Table,

 * see I915_PARAM_HAS_ALIASING_PPGTT

 */

#define I915_GEM_PPGTT_NONE	0

#define I915_GEM_PPGTT_ALIASING	1

#define I915_GEM_PPGTT_FULL	2



/* Ioctl to query kernel params:

/* Ioctl to query kernel params:

 */

 */

#define I915_PARAM_IRQ_ACTIVE            1

#define I915_PARAM_IRQ_ACTIVE            1

tools/include/uapi/linux/in.h

+7 −3
Original line number Original line Diff line number Diff line
@@ -266,10 +266,14 @@ struct sockaddr_in { 




#define	IN_CLASSD(a)		((((long int) (a)) & 0xf0000000) == 0xe0000000)

#define	IN_CLASSD(a)		((((long int) (a)) & 0xf0000000) == 0xe0000000)

#define	IN_MULTICAST(a)		IN_CLASSD(a)

#define	IN_MULTICAST(a)		IN_CLASSD(a)

#define IN_MULTICAST_NET	0xF0000000

#define	IN_MULTICAST_NET	0xe0000000





#define	IN_EXPERIMENTAL(a)	((((long int) (a)) & 0xf0000000) == 0xf0000000)

#define	IN_BADCLASS(a)		((((long int) (a) ) == 0xffffffff)

#define	IN_BADCLASS(a)		IN_EXPERIMENTAL((a))

#define	IN_EXPERIMENTAL(a)	IN_BADCLASS((a))



#define	IN_CLASSE(a)		((((long int) (a)) & 0xf0000000) == 0xf0000000)

#define	IN_CLASSE_NET		0xffffffff

#define	IN_CLASSE_NSHIFT	0





/* Address to accept any incoming messages. */

/* Address to accept any incoming messages. */

#define	INADDR_ANY		((unsigned long int) 0x00000000)

#define	INADDR_ANY		((unsigned long int) 0x00000000)

CRA Git | Maintained and supported by SUSTech CRA and CCSE