Commit 1c6f705b 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 perf fixes from Thomas Gleixner:

 - Prevent a division by zero in the perf aux buffer handling

 - Sync kernel headers with perf tool headers

 - Fix a build failure in the syscalltbl code

 - Make the debug messages of perf report --call-graph work correctly

 - Make sure that all required perf files are in the MANIFEST for
   container builds

 - Fix the atrr.exclude kernel handling so it respects the
   perf_event_paranoid and the user permissions

 - Make perf test on s390x work correctly

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/aux: Only update ->aux_wakeup in non-overwrite mode
  perf test: Fix vmlinux failure on s390x part 2
  perf test: Fix vmlinux failure on s390x
  perf tools: Fix syscalltbl build failure
  perf report: Fix debug messages with --call-graph option
  perf evsel: Fix attr.exclude_kernel setting for default cycles:p
  tools include: Sync kernel ABI headers with tooling headers
  perf tools: Get all of tools/{arch,include}/ in the MANIFEST
parents 1de47f3c 1addcd55

kernel/events/ring_buffer.c

+15 −5
Original line number Original line Diff line number Diff line
@@ -412,6 +412,19 @@ err: 
	return NULL;

	return NULL;

}

}





static bool __always_inline rb_need_aux_wakeup(struct ring_buffer *rb)

{

	if (rb->aux_overwrite)

		return false;



	if (rb->aux_head - rb->aux_wakeup >= rb->aux_watermark) {

		rb->aux_wakeup = rounddown(rb->aux_head, rb->aux_watermark);

		return true;

	}



	return false;

}



/*

/*

 * Commit the data written by hardware into the ring buffer by adjusting

 * Commit the data written by hardware into the ring buffer by adjusting

 * aux_head and posting a PERF_RECORD_AUX into the perf buffer. It is the

 * aux_head and posting a PERF_RECORD_AUX into the perf buffer. It is the
@@ -451,10 +464,8 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size) 
	}

	}





	rb->user_page->aux_head = rb->aux_head;

	rb->user_page->aux_head = rb->aux_head;

	if (rb->aux_head - rb->aux_wakeup >= rb->aux_watermark) {

	if (rb_need_aux_wakeup(rb))

		wakeup = true;

		wakeup = true;

		rb->aux_wakeup = rounddown(rb->aux_head, rb->aux_watermark);

	}





	if (wakeup) {

	if (wakeup) {

		if (handle->aux_flags & PERF_AUX_FLAG_TRUNCATED)

		if (handle->aux_flags & PERF_AUX_FLAG_TRUNCATED)
@@ -484,9 +495,8 @@ int perf_aux_output_skip(struct perf_output_handle *handle, unsigned long size) 
	rb->aux_head += size;

	rb->aux_head += size;





	rb->user_page->aux_head = rb->aux_head;

	rb->user_page->aux_head = rb->aux_head;

	if (rb->aux_head - rb->aux_wakeup >= rb->aux_watermark) {

	if (rb_need_aux_wakeup(rb)) {

		perf_output_wakeup(handle);

		perf_output_wakeup(handle);

		rb->aux_wakeup = rounddown(rb->aux_head, rb->aux_watermark);

		handle->wakeup = rb->aux_wakeup + rb->aux_watermark;

		handle->wakeup = rb->aux_wakeup + rb->aux_watermark;

	}

	}

tools/arch/s390/include/uapi/asm/kvm.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,12 @@ struct kvm_s390_io_adapter_req { 
/* kvm attributes for KVM_S390_VM_TOD */

/* kvm attributes for KVM_S390_VM_TOD */

#define KVM_S390_VM_TOD_LOW		0

#define KVM_S390_VM_TOD_LOW		0

#define KVM_S390_VM_TOD_HIGH		1

#define KVM_S390_VM_TOD_HIGH		1

#define KVM_S390_VM_TOD_EXT		2



struct kvm_s390_vm_tod_clock {

	__u8  epoch_idx;

	__u64 tod;

};





/* kvm attributes for KVM_S390_VM_CPU_MODEL */

/* kvm attributes for KVM_S390_VM_CPU_MODEL */

/* processor related attributes are r/w */

/* processor related attributes are r/w */

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -196,6 +196,7 @@ 




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

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

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

#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_PPIN	( 7*32+14) /* Intel Processor Inventory Number */

#define X86_FEATURE_INTEL_PT	( 7*32+15) /* Intel Processor Trace */

#define X86_FEATURE_INTEL_PT	( 7*32+15) /* Intel Processor Trace */
@@ -287,6 +288,7 @@ 
#define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */

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

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

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

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

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

#define X86_FEATURE_VGIF	(15*32+16) /* Virtual GIF */





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

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

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

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

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

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

# define DISABLE_K6_MTRR	(1<<(X86_FEATURE_K6_MTRR & 31))

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

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

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

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

# define DISABLE_PCID		0

#else

#else

# define DISABLE_VME		0

# define DISABLE_VME		0

# define DISABLE_K6_MTRR	0

# define DISABLE_K6_MTRR	0

# define DISABLE_CYRIX_ARR	0

# define DISABLE_CYRIX_ARR	0

# define DISABLE_CENTAUR_MCR	0

# define DISABLE_CENTAUR_MCR	0

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

#endif /* CONFIG_X86_64 */

#endif /* CONFIG_X86_64 */





#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

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

#define DISABLED_MASK1	0

#define DISABLED_MASK2	0

#define DISABLED_MASK2	0

#define DISABLED_MASK3	(DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR)

#define DISABLED_MASK3	(DISABLE_CYRIX_ARR|DISABLE_CENTAUR_MCR|DISABLE_K6_MTRR)

#define DISABLED_MASK4	0

#define DISABLED_MASK4	(DISABLE_PCID)

#define DISABLED_MASK5	0

#define DISABLED_MASK5	0

#define DISABLED_MASK6	0

#define DISABLED_MASK6	0

#define DISABLED_MASK7	0

#define DISABLED_MASK7	0

tools/include/asm-generic/hugetlb_encode.h

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
#ifndef _ASM_GENERIC_HUGETLB_ENCODE_H_

#define _ASM_GENERIC_HUGETLB_ENCODE_H_



/*

 * Several system calls take a flag to request "hugetlb" huge pages.

 * Without further specification, these system calls will use the

 * system's default huge page size.  If a system supports multiple

 * huge page sizes, the desired huge page size can be specified in

 * bits [26:31] of the flag arguments.  The value in these 6 bits

 * will encode the log2 of the huge page size.

 *

 * The following definitions are associated with this huge page size

 * encoding in flag arguments.  System call specific header files

 * that use this encoding should include this file.  They can then

 * provide definitions based on these with their own specific prefix.

 * for example:

 * #define MAP_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT

 */



#define HUGETLB_FLAG_ENCODE_SHIFT	26

#define HUGETLB_FLAG_ENCODE_MASK	0x3f



#define HUGETLB_FLAG_ENCODE_64KB	(16 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_512KB	(19 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_1MB		(20 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_2MB		(21 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_8MB		(23 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_16MB	(24 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_256MB	(28 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_1GB		(30 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_2GB		(31 << HUGETLB_FLAG_ENCODE_SHIFT)

#define HUGETLB_FLAG_ENCODE_16GB	(34 << HUGETLB_FLAG_ENCODE_SHIFT)



#endif /* _ASM_GENERIC_HUGETLB_ENCODE_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE