Commit a7b7b772 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull more perf updates from Ingo Molnar:
 "The only kernel change is comment typo fixes.

  The rest is mostly tooling fixes, but also new vendor event additions
  and updates, a bigger libperf/libtraceevent library and a header files
  reorganization that came in a bit late"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (108 commits)
  perf unwind: Fix libunwind build failure on i386 systems
  perf parser: Remove needless include directives
  perf build: Add detection of java-11-openjdk-devel package
  perf jvmti: Include JVMTI support for s390
  perf vendor events: Remove P8 HW events which are not supported
  perf evlist: Fix access of freed id arrays
  perf stat: Fix free memory access / memory leaks in metrics
  perf tools: Replace needless mmap.h with what is needed, event.h
  perf evsel: Move config terms to a separate header
  perf evlist: Remove unused perf_evlist__fprintf() method
  perf evsel: Introduce evsel_fprintf.h
  perf evsel: Remove need for symbol_conf in evsel_fprintf.c
  perf copyfile: Move copyfile routines to separate files
  libperf: Add perf_evlist__poll() function
  libperf: Add perf_evlist__add_pollfd() function
  libperf: Add perf_evlist__alloc_pollfd() function
  libperf: Add libperf_init() call to the tests
  libperf: Merge libperf_set_print() into libperf_init()
  libperf: Add libperf dependency for tests targets
  libperf: Use sys/types.h to get ssize_t, not unistd.h
  ...
parents 7897c04a 26acf400

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/asm/bug.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define _TOOLS_ASM_BUG_H



#include <linux/compiler.h>

#include <stdio.h>



#define __WARN_printf(arg...)	do { fprintf(stderr, arg); } while (0)

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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE