Commit 2b327697 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-5.4-20190921' of... 

Merge tag 'perf-urgent-for-mingo-5.4-20190921' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

perf tests:

  Jiri Olsa:

  - Fix 'make -C tools/perf build-test' static build entry.

perf record:

  Jiri Olsa:

  - Fix segfault in cpu_cache_level__read() when reading CPU topology.

session:

  Mamatha Inamdar:

  - Properly propagate error when reading a perf.data file, it may
    not exist or the user may not have permissions, etc.

perf probe:

  Masami Hiramatsu:

  - Skip same probe address for a given line.

  - Clear tev->nargs in clear_probe_trace_event(), fixing segfault.

tools headers UAPI:

  Arnaldo Carvalho de Melo:

  - Sync headers, among them prctl.h, that introduces two new options
    that are now supported in the 'perf trace' prctl syscall args
    beautifiers.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 351a1f5c 9f014e3a

kernel/events/core.c

+3 −3
Original line number Diff line number Diff line
@@ -2239,7 +2239,7 @@ static void __perf_event_disable(struct perf_event *event, 
 *

 * If event->ctx is a cloned context, callers must make sure that

 * every task struct that event->ctx->task could possibly point to

 * remains valid.  This condition is satisifed when called through

 * remains valid.  This condition is satisfied when called through

 * perf_event_for_each_child or perf_event_for_each because they

 * hold the top-level event's child_mutex, so any descendant that

 * goes to exit will block in perf_event_exit_event().
@@ -6054,7 +6054,7 @@ static void perf_sample_regs_intr(struct perf_regs *regs_intr, 
 * Get remaining task size from user stack pointer.

 *

 * It'd be better to take stack vma map and limit this more

 * precisly, but there's no way to get it safely under interrupt,

 * precisely, but there's no way to get it safely under interrupt,

 * so using TASK_SIZE as limit.

 */

static u64 perf_ustack_task_size(struct pt_regs *regs)
@@ -6616,7 +6616,7 @@ void perf_prepare_sample(struct perf_event_header *header, 


	if (sample_type & PERF_SAMPLE_STACK_USER) {

		/*

		 * Either we need PERF_SAMPLE_STACK_USER bit to be allways

		 * Either we need PERF_SAMPLE_STACK_USER bit to be always

		 * processed as the last one or have additional check added

		 * in case new sample type is added, because we could eat

		 * up the rest of the sample size.

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

+3 −0
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ 
#define X86_FEATURE_VMMCALL		( 8*32+15) /* Prefer VMMCALL to VMCALL */

#define X86_FEATURE_XENPV		( 8*32+16) /* "" Xen paravirtual guest */

#define X86_FEATURE_EPT_AD		( 8*32+17) /* Intel Extended Page Table access-dirty bit */

#define X86_FEATURE_VMCALL		( 8*32+18) /* "" Hypervisor supports the VMCALL instruction */

#define X86_FEATURE_VMW_VMMCALL		( 8*32+19) /* "" VMware prefers VMMCALL hypercall instruction */



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

#define X86_FEATURE_FSGSBASE		( 9*32+ 0) /* RDFSBASE, WRFSBASE, RDGSBASE, WRGSBASE instructions*/
@@ -354,6 +356,7 @@ 
/* Intel-defined CPU features, CPUID level 0x00000007:0 (EDX), word 18 */

#define X86_FEATURE_AVX512_4VNNIW	(18*32+ 2) /* AVX-512 Neural Network Instructions */

#define X86_FEATURE_AVX512_4FMAPS	(18*32+ 3) /* AVX-512 Multiply Accumulation Single precision */

#define X86_FEATURE_AVX512_VP2INTERSECT (18*32+ 8) /* AVX-512 Intersect for D/Q */

#define X86_FEATURE_MD_CLEAR		(18*32+10) /* VERW clears CPU buffers */

#define X86_FEATURE_TSX_FORCE_ABORT	(18*32+13) /* "" TSX_FORCE_ABORT */

#define X86_FEATURE_PCONFIG		(18*32+18) /* Intel PCONFIG */

tools/arch/x86/include/uapi/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#define _UAPI_ASM_X86_UNISTD_H



/* x32 syscall flag bit */

#define __X32_SYSCALL_BIT	0x40000000

#define __X32_SYSCALL_BIT	0x40000000UL



#ifndef __KERNEL__

# ifdef __i386__

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

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ __SYSCALL(__NR_semget, sys_semget) 
__SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl)

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_semtimedop 192

__SC_COMP(__NR_semtimedop, sys_semtimedop, sys_semtimedop_time32)

__SC_3264(__NR_semtimedop, sys_semtimedop_time32, sys_semtimedop)

#endif

#define __NR_semop 193

__SYSCALL(__NR_semop, sys_semop)

tools/include/uapi/linux/prctl.h

+6 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ struct prctl_mm_map { 
#define PR_GET_THP_DISABLE	42



/*

 * Tell the kernel to start/stop helping userspace manage bounds tables.

 * No longer implemented, but left here to ensure the numbers stay reserved:

 */

#define PR_MPX_ENABLE_MANAGEMENT  43

#define PR_MPX_DISABLE_MANAGEMENT 44
@@ -229,4 +229,9 @@ struct prctl_mm_map { 
# define PR_PAC_APDBKEY			(1UL << 3)

# define PR_PAC_APGAKEY			(1UL << 4)



/* Tagged user address controls for arm64 */

#define PR_SET_TAGGED_ADDR_CTRL		55

#define PR_GET_TAGGED_ADDR_CTRL		56

# define PR_TAGGED_ADDR_ENABLE		(1UL << 0)



#endif /* _LINUX_PRCTL_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE