Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c976a7d6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'tip/perf/urgent' into perf/core, to pick up fixes 



Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents a47ba4d7 1addcd55

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

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

#define KVM_S390_VM_TOD_LOW		0

#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 */

/* processor related attributes are r/w */

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

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


#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,6 +288,7 @@ 
#define X86_FEATURE_PFTHRESHOLD (15*32+12) /* pause filter threshold */

#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_VGIF	(15*32+16) /* Virtual GIF */



/* 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

+3 −1
Original line number Diff line number Diff line
@@ -21,11 +21,13 @@ 
# 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
@@ -49,7 +51,7 @@ 
#define DISABLED_MASK1	0

#define DISABLED_MASK2	0

#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_MASK6	0

#define DISABLED_MASK7	0

tools/include/asm-generic/hugetlb_encode.h

0 → 100644
+34 −0
Original line number 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_ */

tools/include/uapi/drm/drm.h

+22 −0
Original line number Diff line number Diff line
@@ -700,6 +700,7 @@ struct drm_prime_handle { 


struct drm_syncobj_create {

	__u32 handle;

#define DRM_SYNCOBJ_CREATE_SIGNALED (1 << 0)

	__u32 flags;

};
@@ -718,6 +719,24 @@ struct drm_syncobj_handle { 
	__u32 pad;

};



#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL (1 << 0)

#define DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT (1 << 1)

struct drm_syncobj_wait {

	__u64 handles;

	/* absolute timeout */

	__s64 timeout_nsec;

	__u32 count_handles;

	__u32 flags;

	__u32 first_signaled; /* only valid when not waiting all */

	__u32 pad;

};



struct drm_syncobj_array {

	__u64 handles;

	__u32 count_handles;

	__u32 pad;

};



#if defined(__cplusplus)

}

#endif
@@ -840,6 +859,9 @@ extern "C" { 
#define DRM_IOCTL_SYNCOBJ_DESTROY	DRM_IOWR(0xC0, struct drm_syncobj_destroy)

#define DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD	DRM_IOWR(0xC1, struct drm_syncobj_handle)

#define DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE	DRM_IOWR(0xC2, struct drm_syncobj_handle)

#define DRM_IOCTL_SYNCOBJ_WAIT		DRM_IOWR(0xC3, struct drm_syncobj_wait)

#define DRM_IOCTL_SYNCOBJ_RESET		DRM_IOWR(0xC4, struct drm_syncobj_array)

#define DRM_IOCTL_SYNCOBJ_SIGNAL	DRM_IOWR(0xC5, struct drm_syncobj_array)



/**

 * Device specific ioctls should only be in their respective headers