Commit b7374586 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'perf-urgent-2020-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf tooling fixes and updates from Thomas Gleixner:

 - Fix the header line of perf stat output for '--metric-only --per-socket'

 - Fix the python build with clang

 - The usual tools UAPI header synchronization

* tag 'perf-urgent-2020-04-19' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tools headers: Synchronize linux/bits.h with the kernel sources
  tools headers: Adopt verbatim copy of compiletime_assert() from kernel sources
  tools headers: Update x86's syscall_64.tbl with the kernel sources
  tools headers UAPI: Sync drm/i915_drm.h with the kernel sources
  tools headers UAPI: Update tools's copy of drm.h headers
  tools headers kvm: Sync linux/kvm.h with the kernel sources
  tools headers UAPI: Sync linux/fscrypt.h with the kernel sources
  tools include UAPI: Sync linux/vhost.h with the kernel sources
  tools arch x86: Sync asm/cpufeatures.h with the kernel sources
  tools headers UAPI: Sync linux/mman.h with the kernel
  tools headers UAPI: Sync sched.h with the kernel
  tools headers: Update linux/vdso.h and grab a copy of vdso/const.h
  perf stat: Fix no metric header if --per-socket and --metric-only set
  perf python: Check if clang supports -fno-semantic-interposition
  tools arch x86: Sync the msr-index.h copy with the kernel sources
parents 80ade29e cd094335
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
#define X86_FEATURE_IBRS ( 7*32+25) /* Indirect Branch Restricted Speculation */ #define X86_FEATURE_IBRS ( 7*32+25) /* Indirect Branch Restricted Speculation */
#define X86_FEATURE_IBPB ( 7*32+26) /* Indirect Branch Prediction Barrier */ #define X86_FEATURE_IBPB ( 7*32+26) /* Indirect Branch Prediction Barrier */
#define X86_FEATURE_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */ #define X86_FEATURE_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */
#define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU is AMD family 0x17 (Zen) */ #define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU is AMD family 0x17 or above (Zen) */
#define X86_FEATURE_L1TF_PTEINV ( 7*32+29) /* "" L1TF workaround PTE inversion */ #define X86_FEATURE_L1TF_PTEINV ( 7*32+29) /* "" L1TF workaround PTE inversion */
#define X86_FEATURE_IBRS_ENHANCED ( 7*32+30) /* Enhanced IBRS */ #define X86_FEATURE_IBRS_ENHANCED ( 7*32+30) /* Enhanced IBRS */
#define X86_FEATURE_MSR_IA32_FEAT_CTL ( 7*32+31) /* "" MSR IA32_FEAT_CTL configured */ #define X86_FEATURE_MSR_IA32_FEAT_CTL ( 7*32+31) /* "" MSR IA32_FEAT_CTL configured */
...@@ -285,6 +285,7 @@ ...@@ -285,6 +285,7 @@
#define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3) /* LLC Local MBM monitoring */ #define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3) /* LLC Local MBM monitoring */
#define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4) /* "" LFENCE in user entry SWAPGS path */ #define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4) /* "" LFENCE in user entry SWAPGS path */
#define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */ #define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */
#define X86_FEATURE_SPLIT_LOCK_DETECT (11*32+ 6) /* #AC for split lock */
/* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */
#define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* AVX512 BFLOAT16 instructions */ #define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* AVX512 BFLOAT16 instructions */
...@@ -299,6 +300,7 @@ ...@@ -299,6 +300,7 @@
#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_STIBP_ALWAYS_ON (13*32+17) /* "" Single Thread Indirect Branch Predictors always-on preferred */
#define X86_FEATURE_AMD_PPIN (13*32+23) /* Protected Processor Inventory Number */
#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. */
...@@ -367,6 +369,7 @@ ...@@ -367,6 +369,7 @@
#define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */ #define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */
#define X86_FEATURE_FLUSH_L1D (18*32+28) /* Flush L1D cache */ #define X86_FEATURE_FLUSH_L1D (18*32+28) /* Flush L1D cache */
#define X86_FEATURE_ARCH_CAPABILITIES (18*32+29) /* IA32_ARCH_CAPABILITIES MSR (Intel) */ #define X86_FEATURE_ARCH_CAPABILITIES (18*32+29) /* IA32_ARCH_CAPABILITIES MSR (Intel) */
#define X86_FEATURE_CORE_CAPABILITIES (18*32+30) /* "" IA32_CORE_CAPABILITIES MSR */
#define X86_FEATURE_SPEC_CTRL_SSBD (18*32+31) /* "" Speculative Store Bypass Disable */ #define X86_FEATURE_SPEC_CTRL_SSBD (18*32+31) /* "" Speculative Store Bypass Disable */
/* /*
......
...@@ -41,6 +41,10 @@ ...@@ -41,6 +41,10 @@
/* Intel MSRs. Some also available on other CPUs */ /* Intel MSRs. Some also available on other CPUs */
#define MSR_TEST_CTRL 0x00000033
#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT 29
#define MSR_TEST_CTRL_SPLIT_LOCK_DETECT BIT(MSR_TEST_CTRL_SPLIT_LOCK_DETECT_BIT)
#define MSR_IA32_SPEC_CTRL 0x00000048 /* Speculation Control */ #define MSR_IA32_SPEC_CTRL 0x00000048 /* Speculation Control */
#define SPEC_CTRL_IBRS BIT(0) /* Indirect Branch Restricted Speculation */ #define SPEC_CTRL_IBRS BIT(0) /* Indirect Branch Restricted Speculation */
#define SPEC_CTRL_STIBP_SHIFT 1 /* Single Thread Indirect Branch Predictor (STIBP) bit */ #define SPEC_CTRL_STIBP_SHIFT 1 /* Single Thread Indirect Branch Predictor (STIBP) bit */
...@@ -70,6 +74,11 @@ ...@@ -70,6 +74,11 @@
*/ */
#define MSR_IA32_UMWAIT_CONTROL_TIME_MASK (~0x03U) #define MSR_IA32_UMWAIT_CONTROL_TIME_MASK (~0x03U)
/* Abbreviated from Intel SDM name IA32_CORE_CAPABILITIES */
#define MSR_IA32_CORE_CAPS 0x000000cf
#define MSR_IA32_CORE_CAPS_SPLIT_LOCK_DETECT_BIT 5
#define MSR_IA32_CORE_CAPS_SPLIT_LOCK_DETECT BIT(MSR_IA32_CORE_CAPS_SPLIT_LOCK_DETECT_BIT)
#define MSR_PKG_CST_CONFIG_CONTROL 0x000000e2 #define MSR_PKG_CST_CONFIG_CONTROL 0x000000e2
#define NHM_C3_AUTO_DEMOTE (1UL << 25) #define NHM_C3_AUTO_DEMOTE (1UL << 25)
#define NHM_C1_AUTO_DEMOTE (1UL << 26) #define NHM_C1_AUTO_DEMOTE (1UL << 26)
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#define __LINUX_BITS_H #define __LINUX_BITS_H
#include <linux/const.h> #include <linux/const.h>
#include <vdso/bits.h>
#include <asm/bitsperlong.h> #include <asm/bitsperlong.h>
#define BIT(nr) (UL(1) << (nr))
#define BIT_ULL(nr) (ULL(1) << (nr)) #define BIT_ULL(nr) (ULL(1) << (nr))
#define BIT_MASK(nr) (UL(1) << ((nr) % BITS_PER_LONG)) #define BIT_MASK(nr) (UL(1) << ((nr) % BITS_PER_LONG))
#define BIT_WORD(nr) ((nr) / BITS_PER_LONG) #define BIT_WORD(nr) ((nr) / BITS_PER_LONG)
...@@ -18,12 +18,30 @@ ...@@ -18,12 +18,30 @@
* position @h. For example * position @h. For example
* GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000. * GENMASK_ULL(39, 21) gives us the 64bit vector 0x000000ffffe00000.
*/ */
#define GENMASK(h, l) \ #if !defined(__ASSEMBLY__) && \
(!defined(CONFIG_CC_IS_GCC) || CONFIG_GCC_VERSION >= 49000)
#include <linux/build_bug.h>
#define GENMASK_INPUT_CHECK(h, l) \
(BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
__builtin_constant_p((l) > (h)), (l) > (h), 0)))
#else
/*
* BUILD_BUG_ON_ZERO is not available in h files included from asm files,
* disable the input check if that is the case.
*/
#define GENMASK_INPUT_CHECK(h, l) 0
#endif
#define __GENMASK(h, l) \
(((~UL(0)) - (UL(1) << (l)) + 1) & \ (((~UL(0)) - (UL(1) << (l)) + 1) & \
(~UL(0) >> (BITS_PER_LONG - 1 - (h)))) (~UL(0) >> (BITS_PER_LONG - 1 - (h))))
#define GENMASK(h, l) \
(GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
#define GENMASK_ULL(h, l) \ #define __GENMASK_ULL(h, l) \
(((~ULL(0)) - (ULL(1) << (l)) + 1) & \ (((~ULL(0)) - (ULL(1) << (l)) + 1) & \
(~ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h)))) (~ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))
#define GENMASK_ULL(h, l) \
(GENMASK_INPUT_CHECK(h, l) + __GENMASK_ULL(h, l))
#endif /* __LINUX_BITS_H */ #endif /* __LINUX_BITS_H */
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _LINUX_BUILD_BUG_H
#define _LINUX_BUILD_BUG_H
#include <linux/compiler.h>
#ifdef __CHECKER__
#define BUILD_BUG_ON_ZERO(e) (0)
#else /* __CHECKER__ */
/*
* Force a compilation error if condition is true, but also produce a
* result (of value 0 and type int), so the expression can be used
* e.g. in a structure initializer (or where-ever else comma expressions
* aren't permitted).
*/
#define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
#endif /* __CHECKER__ */
/* Force a compilation error if a constant expression is not a power of 2 */
#define __BUILD_BUG_ON_NOT_POWER_OF_2(n) \
BUILD_BUG_ON(((n) & ((n) - 1)) != 0)
#define BUILD_BUG_ON_NOT_POWER_OF_2(n) \
BUILD_BUG_ON((n) == 0 || (((n) & ((n) - 1)) != 0))
/*
* BUILD_BUG_ON_INVALID() permits the compiler to check the validity of the
* expression but avoids the generation of any code, even if that expression
* has side-effects.
*/
#define BUILD_BUG_ON_INVALID(e) ((void)(sizeof((__force long)(e))))
/**
* BUILD_BUG_ON_MSG - break compile if a condition is true & emit supplied
* error message.
* @condition: the condition which the compiler should know is false.
*
* See BUILD_BUG_ON for description.
*/
#define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
/**
* BUILD_BUG_ON - break compile if a condition is true.
* @condition: the condition which the compiler should know is false.
*
* If you have some code which relies on certain constants being equal, or
* some other compile-time-evaluated condition, you should use BUILD_BUG_ON to
* detect if someone changes it.
*/
#define BUILD_BUG_ON(condition) \
BUILD_BUG_ON_MSG(condition, "BUILD_BUG_ON failed: " #condition)
/**
* BUILD_BUG - break compile if used.
*
* If you have some code that you expect the compiler to eliminate at
* build time, you should use BUILD_BUG to detect if it is
* unexpectedly used.
*/
#define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")
/**
* static_assert - check integer constant expression at build time
*
* static_assert() is a wrapper for the C11 _Static_assert, with a
* little macro magic to make the message optional (defaulting to the
* stringification of the tested expression).
*
* Contrary to BUILD_BUG_ON(), static_assert() can be used at global
* scope, but requires the expression to be an integer constant
* expression (i.e., it is not enough that __builtin_constant_p() is
* true for expr).
*
* Also note that BUILD_BUG_ON() fails the build if the condition is
* true, while static_assert() fails the build if the expression is
* false.
*/
#ifndef static_assert
#define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
#define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
#endif // static_assert
#endif /* _LINUX_BUILD_BUG_H */
...@@ -10,6 +10,32 @@ ...@@ -10,6 +10,32 @@
# define __compiletime_error(message) # define __compiletime_error(message)
#endif #endif
#ifdef __OPTIMIZE__
# define __compiletime_assert(condition, msg, prefix, suffix) \
do { \
extern void prefix ## suffix(void) __compiletime_error(msg); \
if (!(condition)) \
prefix ## suffix(); \
} while (0)
#else
# define __compiletime_assert(condition, msg, prefix, suffix) do { } while (0)
#endif
#define _compiletime_assert(condition, msg, prefix, suffix) \
__compiletime_assert(condition, msg, prefix, suffix)
/**
* compiletime_assert - break build and emit msg if condition is false
* @condition: a compile-time constant condition to check
* @msg: a message to emit if condition is false
*
* In tradition of POSIX assert, this macro will break the build if the
* supplied condition is *false*, emitting the supplied error message if the
* compiler has support to do so.
*/
#define compiletime_assert(condition, msg) \
_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
/* Optimization barrier */ /* Optimization barrier */
/* The "volatile" is due to gcc bugs */ /* The "volatile" is due to gcc bugs */
#define barrier() __asm__ __volatile__("": : :"memory") #define barrier() __asm__ __volatile__("": : :"memory")
......
#ifndef _LINUX_CONST_H #ifndef _LINUX_CONST_H
#define _LINUX_CONST_H #define _LINUX_CONST_H
#include <uapi/linux/const.h> #include <vdso/const.h>
#define UL(x) (_UL(x))
#define ULL(x) (_ULL(x))
#endif /* _LINUX_CONST_H */ #endif /* _LINUX_CONST_H */
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <assert.h> #include <assert.h>
#include <linux/build_bug.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <endian.h> #include <endian.h>
#include <byteswap.h> #include <byteswap.h>
...@@ -35,9 +36,6 @@ ...@@ -35,9 +36,6 @@
(type *)((char *)__mptr - offsetof(type, member)); }) (type *)((char *)__mptr - offsetof(type, member)); })
#endif #endif
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
#ifndef max #ifndef max
#define max(x, y) ({ \ #define max(x, y) ({ \
typeof(x) _max1 = (x); \ typeof(x) _max1 = (x); \
......
...@@ -948,6 +948,8 @@ extern "C" { ...@@ -948,6 +948,8 @@ extern "C" {
#define DRM_IOCTL_SYNCOBJ_TRANSFER DRM_IOWR(0xCC, struct drm_syncobj_transfer) #define DRM_IOCTL_SYNCOBJ_TRANSFER DRM_IOWR(0xCC, struct drm_syncobj_transfer)
#define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL DRM_IOWR(0xCD, struct drm_syncobj_timeline_array) #define DRM_IOCTL_SYNCOBJ_TIMELINE_SIGNAL DRM_IOWR(0xCD, struct drm_syncobj_timeline_array)
#define DRM_IOCTL_MODE_GETFB2 DRM_IOWR(0xCE, struct drm_mode_fb_cmd2)
/** /**
* Device specific ioctls should only be in their respective headers * Device specific ioctls should only be in their respective headers
* The device specific ioctl range is from 0x40 to 0x9f. * The device specific ioctl range is from 0x40 to 0x9f.
......
...@@ -1619,6 +1619,27 @@ struct drm_i915_gem_context_param { ...@@ -1619,6 +1619,27 @@ struct drm_i915_gem_context_param {
* By default, new contexts allow persistence. * By default, new contexts allow persistence.
*/ */
#define I915_CONTEXT_PARAM_PERSISTENCE 0xb #define I915_CONTEXT_PARAM_PERSISTENCE 0xb
/*
* I915_CONTEXT_PARAM_RINGSIZE:
*
* Sets the size of the CS ringbuffer to use for logical ring contexts. This
* applies a limit of how many batches can be queued to HW before the caller
* is blocked due to lack of space for more commands.
*
* Only reliably possible to be set prior to first use, i.e. during
* construction. At any later point, the current execution must be flushed as
* the ring can only be changed while the context is idle. Note, the ringsize
* can be specified as a constructor property, see
* I915_CONTEXT_CREATE_EXT_SETPARAM, but can also be set later if required.
*
* Only applies to the current set of engine and lost when those engines
* are replaced by a new mapping (see I915_CONTEXT_PARAM_ENGINES).
*
* Must be between 4 - 512 KiB, in intervals of page size [4 KiB].
* Default is 16 KiB.
*/
#define I915_CONTEXT_PARAM_RINGSIZE 0xc
/* Must be kept compact -- no holes and well documented */ /* Must be kept compact -- no holes and well documented */
__u64 value; __u64 value;
......
...@@ -163,6 +163,7 @@ struct fscrypt_get_key_status_arg { ...@@ -163,6 +163,7 @@ struct fscrypt_get_key_status_arg {
#define FS_IOC_REMOVE_ENCRYPTION_KEY _IOWR('f', 24, struct fscrypt_remove_key_arg) #define FS_IOC_REMOVE_ENCRYPTION_KEY _IOWR('f', 24, struct fscrypt_remove_key_arg)
#define FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS _IOWR('f', 25, struct fscrypt_remove_key_arg) #define FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS _IOWR('f', 25, struct fscrypt_remove_key_arg)
#define FS_IOC_GET_ENCRYPTION_KEY_STATUS _IOWR('f', 26, struct fscrypt_get_key_status_arg) #define FS_IOC_GET_ENCRYPTION_KEY_STATUS _IOWR('f', 26, struct fscrypt_get_key_status_arg)
#define FS_IOC_GET_ENCRYPTION_NONCE _IOR('f', 27, __u8[16])
/**********************************************************************/ /**********************************************************************/
......
...@@ -474,12 +474,17 @@ struct kvm_s390_mem_op { ...@@ -474,12 +474,17 @@ struct kvm_s390_mem_op {
__u32 size; /* amount of bytes */ __u32 size; /* amount of bytes */
__u32 op; /* type of operation */ __u32 op; /* type of operation */
__u64 buf; /* buffer in userspace */ __u64 buf; /* buffer in userspace */
union {
__u8 ar; /* the access register number */ __u8 ar; /* the access register number */
__u8 reserved[31]; /* should be set to 0 */ __u32 sida_offset; /* offset into the sida */
__u8 reserved[32]; /* should be set to 0 */
};
}; };
/* types for kvm_s390_mem_op->op */ /* types for kvm_s390_mem_op->op */
#define KVM_S390_MEMOP_LOGICAL_READ 0 #define KVM_S390_MEMOP_LOGICAL_READ 0
#define KVM_S390_MEMOP_LOGICAL_WRITE 1 #define KVM_S390_MEMOP_LOGICAL_WRITE 1
#define KVM_S390_MEMOP_SIDA_READ 2
#define KVM_S390_MEMOP_SIDA_WRITE 3
/* flags for kvm_s390_mem_op->flags */ /* flags for kvm_s390_mem_op->flags */
#define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0) #define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0)
#define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1) #define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1)
...@@ -1010,6 +1015,8 @@ struct kvm_ppc_resize_hpt { ...@@ -1010,6 +1015,8 @@ struct kvm_ppc_resize_hpt {
#define KVM_CAP_ARM_NISV_TO_USER 177 #define KVM_CAP_ARM_NISV_TO_USER 177
#define KVM_CAP_ARM_INJECT_EXT_DABT 178 #define KVM_CAP_ARM_INJECT_EXT_DABT 178
#define KVM_CAP_S390_VCPU_RESETS 179 #define KVM_CAP_S390_VCPU_RESETS 179
#define KVM_CAP_S390_PROTECTED 180
#define KVM_CAP_PPC_SECURE_GUEST 181
#ifdef KVM_CAP_IRQ_ROUTING #ifdef KVM_CAP_IRQ_ROUTING
...@@ -1478,6 +1485,39 @@ struct kvm_enc_region { ...@@ -1478,6 +1485,39 @@ struct kvm_enc_region {
#define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3) #define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
#define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4) #define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
struct kvm_s390_pv_sec_parm {
__u64 origin;
__u64 length;
};
struct kvm_s390_pv_unp {
__u64 addr;
__u64 size;
__u64 tweak;
};
enum pv_cmd_id {
KVM_PV_ENABLE,
KVM_PV_DISABLE,
KVM_PV_SET_SEC_PARMS,
KVM_PV_UNPACK,
KVM_PV_VERIFY,
KVM_PV_PREP_RESET,
KVM_PV_UNSHARE_ALL,
};
struct kvm_pv_cmd {
__u32 cmd; /* Command to be executed */
__u16 rc; /* Ultravisor return code */
__u16 rrc; /* Ultravisor return reason code */
__u64 data; /* Data or address */
__u32 flags; /* flags for future extensions. Must be 0 for now */
__u32 reserved[3];
};
/* Available with KVM_CAP_S390_PROTECTED */
#define KVM_S390_PV_COMMAND _IOWR(KVMIO, 0xc5, struct kvm_pv_cmd)
/* Secure Encrypted Virtualization command */ /* Secure Encrypted Virtualization command */
enum sev_cmd_id { enum sev_cmd_id {
/* Guest initialization commands */ /* Guest initialization commands */
...@@ -1628,4 +1668,7 @@ struct kvm_hyperv_eventfd { ...@@ -1628,4 +1668,7 @@ struct kvm_hyperv_eventfd {
#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff #define KVM_HYPERV_CONN_ID_MASK 0x00ffffff
#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0) #define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0)
#define KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE (1 << 0)
#define KVM_DIRTY_LOG_INITIALLY_SET (1 << 1)
#endif /* __LINUX_KVM_H */ #endif /* __LINUX_KVM_H */
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#define MREMAP_MAYMOVE 1 #define MREMAP_MAYMOVE 1
#define MREMAP_FIXED 2 #define MREMAP_FIXED 2
#define MREMAP_DONTUNMAP 4
#define OVERCOMMIT_GUESS 0 #define OVERCOMMIT_GUESS 0
#define OVERCOMMIT_ALWAYS 1 #define OVERCOMMIT_ALWAYS 1
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
/* Flags for the clone3() syscall. */ /* Flags for the clone3() syscall. */
#define CLONE_CLEAR_SIGHAND 0x100000000ULL /* Clear any signal handler and reset to SIG_DFL. */ #define CLONE_CLEAR_SIGHAND 0x100000000ULL /* Clear any signal handler and reset to SIG_DFL. */
#define CLONE_INTO_CGROUP 0x200000000ULL /* Clone into a specific cgroup given the right permissions. */
/* /*
* cloning flags intersect with CSIGNAL so can be used with unshare and clone3 * cloning flags intersect with CSIGNAL so can be used with unshare and clone3
...@@ -81,6 +82,8 @@ ...@@ -81,6 +82,8 @@
* @set_tid_size: This defines the size of the array referenced * @set_tid_size: This defines the size of the array referenced
* in @set_tid. This cannot be larger than the * in @set_tid. This cannot be larger than the
* kernel's limit of nested PID namespaces. * kernel's limit of nested PID namespaces.
* @cgroup: If CLONE_INTO_CGROUP is specified set this to
* a file descriptor for the cgroup.
* *
* The structure is versioned by size and thus extensible. * The structure is versioned by size and thus extensible.
* New struct members must go at the end of the struct and * New struct members must go at the end of the struct and
...@@ -97,11 +100,13 @@ struct clone_args { ...@@ -97,11 +100,13 @@ struct clone_args {
__aligned_u64 tls; __aligned_u64 tls;
__aligned_u64 set_tid; __aligned_u64 set_tid;
__aligned_u64 set_tid_size; __aligned_u64 set_tid_size;
__aligned_u64 cgroup;
}; };
#endif #endif
#define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */ #define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */
#define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */ #define CLONE_ARGS_SIZE_VER1 80 /* sizeof second published struct */
#define CLONE_ARGS_SIZE_VER2 88 /* sizeof third published struct */
/* /*
* Scheduling policies * Scheduling policies
......
...@@ -116,4 +116,28 @@ ...@@ -116,4 +116,28 @@
#define VHOST_VSOCK_SET_GUEST_CID _IOW(VHOST_VIRTIO, 0x60, __u64) #define VHOST_VSOCK_SET_GUEST_CID _IOW(VHOST_VIRTIO, 0x60, __u64)
#define VHOST_VSOCK_SET_RUNNING _IOW(VHOST_VIRTIO, 0x61, int) #define VHOST_VSOCK_SET_RUNNING _IOW(VHOST_VIRTIO, 0x61, int)
/* VHOST_VDPA specific defines */
/* Get the device id. The device ids follow the same definition of
* the device id defined in virtio-spec.
*/
#define VHOST_VDPA_GET_DEVICE_ID _IOR(VHOST_VIRTIO, 0x70, __u32)
/* Get and set the status. The status bits follow the same definition
* of the device status defined in virtio-spec.
*/
#define VHOST_VDPA_GET_STATUS _IOR(VHOST_VIRTIO, 0x71, __u8)
#define VHOST_VDPA_SET_STATUS _IOW(VHOST_VIRTIO, 0x72, __u8)
/* Get and set the device config. The device config follows the same
* definition of the device config defined in virtio-spec.
*/
#define VHOST_VDPA_GET_CONFIG _IOR(VHOST_VIRTIO, 0x73, \
struct vhost_vdpa_config)
#define VHOST_VDPA_SET_CONFIG _IOW(VHOST_VIRTIO, 0x74, \
struct vhost_vdpa_config)
/* Enable/disable the ring. */
#define VHOST_VDPA_SET_VRING_ENABLE _IOW(VHOST_VIRTIO, 0x75, \
struct vhost_vring_state)
/* Get the max ring size. */
#define VHOST_VDPA_GET_VRING_NUM _IOR(VHOST_VIRTIO, 0x76, __u16)
#endif #endif
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __VDSO_BITS_H
#define __VDSO_BITS_H
#include <vdso/const.h>
#define BIT(nr) (UL(1) << (nr))
#endif /* __VDSO_BITS_H */
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __VDSO_CONST_H
#define __VDSO_CONST_H
#include <uapi/linux/const.h>
#define UL(x) (_UL(x))
#define ULL(x) (_ULL(x))
#endif /* __VDSO_CONST_H */
...@@ -8,357 +8,357 @@ ...@@ -8,357 +8,357 @@
# #
# The abi is "common", "64" or "x32" for this file. # The abi is "common", "64" or "x32" for this file.
# #
0 common read __x64_sys_read 0 common read sys_read
1 common write __x64_sys_write 1 common write sys_write
2 common open __x64_sys_open 2 common open sys_open
3 common close __x64_sys_close 3 common close sys_close
4 common stat __x64_sys_newstat 4 common stat sys_newstat
5 common fstat __x64_sys_newfstat 5 common fstat sys_newfstat
6 common lstat __x64_sys_newlstat 6 common lstat sys_newlstat
7 common poll __x64_sys_poll 7 common poll sys_poll
8 common lseek __x64_sys_lseek 8 common lseek sys_lseek
9 common mmap __x64_sys_mmap 9 common mmap sys_mmap
10 common mprotect __x64_sys_mprotect 10 common mprotect sys_mprotect
11 common munmap __x64_sys_munmap 11 common munmap sys_munmap
12 common brk __x64_sys_brk 12 common brk sys_brk
13 64 rt_sigaction __x64_sys_rt_sigaction 13 64 rt_sigaction sys_rt_sigaction
14 common rt_sigprocmask __x64_sys_rt_sigprocmask 14 common rt_sigprocmask sys_rt_sigprocmask
15 64 rt_sigreturn __x64_sys_rt_sigreturn/ptregs 15 64 rt_sigreturn sys_rt_sigreturn
16 64 ioctl __x64_sys_ioctl 16 64 ioctl sys_ioctl
17 common pread64 __x64_sys_pread64 17 common pread64 sys_pread64
18 common pwrite64 __x64_sys_pwrite64 18 common pwrite64 sys_pwrite64
19 64 readv __x64_sys_readv 19 64 readv sys_readv
20 64 writev __x64_sys_writev 20 64 writev sys_writev
21 common access __x64_sys_access 21 common access sys_access
22 common pipe __x64_sys_pipe 22 common pipe sys_pipe
23 common select __x64_sys_select 23 common select sys_select
24 common sched_yield __x64_sys_sched_yield 24 common sched_yield sys_sched_yield
25 common mremap __x64_sys_mremap 25 common mremap sys_mremap
26 common msync __x64_sys_msync 26 common msync sys_msync
27 common mincore __x64_sys_mincore 27 common mincore sys_mincore
28 common madvise __x64_sys_madvise 28 common madvise sys_madvise
29 common shmget __x64_sys_shmget 29 common shmget sys_shmget
30 common shmat __x64_sys_shmat 30 common shmat sys_shmat
31 common shmctl __x64_sys_shmctl 31 common shmctl sys_shmctl
32 common dup __x64_sys_dup 32 common dup sys_dup
33 common dup2 __x64_sys_dup2 33 common dup2 sys_dup2
34 common pause __x64_sys_pause 34 common pause sys_pause
35 common nanosleep __x64_sys_nanosleep 35 common nanosleep sys_nanosleep
36 common getitimer __x64_sys_getitimer 36 common getitimer sys_getitimer
37 common alarm __x64_sys_alarm 37 common alarm sys_alarm
38 common setitimer __x64_sys_setitimer 38 common setitimer sys_setitimer
39 common getpid __x64_sys_getpid 39 common getpid sys_getpid
40 common sendfile __x64_sys_sendfile64 40 common sendfile sys_sendfile64
41 common socket __x64_sys_socket 41 common socket sys_socket
42 common connect __x64_sys_connect 42 common connect sys_connect
43 common accept __x64_sys_accept 43 common accept sys_accept
44 common sendto __x64_sys_sendto 44 common sendto sys_sendto
45 64 recvfrom __x64_sys_recvfrom 45 64 recvfrom sys_recvfrom
46 64 sendmsg __x64_sys_sendmsg 46 64 sendmsg sys_sendmsg
47 64 recvmsg __x64_sys_recvmsg 47 64 recvmsg sys_recvmsg
48 common shutdown __x64_sys_shutdown 48 common shutdown sys_shutdown
49 common bind __x64_sys_bind 49 common bind sys_bind
50 common listen __x64_sys_listen 50 common listen sys_listen
51 common getsockname __x64_sys_getsockname 51 common getsockname sys_getsockname
52 common getpeername __x64_sys_getpeername 52 common getpeername sys_getpeername
53 common socketpair __x64_sys_socketpair 53 common socketpair sys_socketpair
54 64 setsockopt __x64_sys_setsockopt 54 64 setsockopt sys_setsockopt
55 64 getsockopt __x64_sys_getsockopt 55 64 getsockopt sys_getsockopt
56 common clone __x64_sys_clone/ptregs 56 common clone sys_clone
57 common fork __x64_sys_fork/ptregs 57 common fork sys_fork
58 common vfork __x64_sys_vfork/ptregs 58 common vfork sys_vfork
59 64 execve __x64_sys_execve/ptregs 59 64 execve sys_execve
60 common exit __x64_sys_exit 60 common exit sys_exit
61 common wait4 __x64_sys_wait4 61 common wait4 sys_wait4
62 common kill __x64_sys_kill 62 common kill sys_kill
63 common uname __x64_sys_newuname 63 common uname sys_newuname
64 common semget __x64_sys_semget 64 common semget sys_semget
65 common semop __x64_sys_semop 65 common semop sys_semop
66 common semctl __x64_sys_semctl 66 common semctl sys_semctl
67 common shmdt __x64_sys_shmdt 67 common shmdt sys_shmdt
68 common msgget __x64_sys_msgget 68 common msgget sys_msgget
69 common msgsnd __x64_sys_msgsnd 69 common msgsnd sys_msgsnd
70 common msgrcv __x64_sys_msgrcv 70 common msgrcv sys_msgrcv
71 common msgctl __x64_sys_msgctl 71 common msgctl sys_msgctl
72 common fcntl __x64_sys_fcntl 72 common fcntl sys_fcntl
73 common flock __x64_sys_flock 73 common flock sys_flock
74 common fsync __x64_sys_fsync 74 common fsync sys_fsync
75 common fdatasync __x64_sys_fdatasync 75 common fdatasync sys_fdatasync
76 common truncate __x64_sys_truncate 76 common truncate sys_truncate
77 common ftruncate __x64_sys_ftruncate 77 common ftruncate sys_ftruncate
78 common getdents __x64_sys_getdents 78 common getdents sys_getdents
79 common getcwd __x64_sys_getcwd 79 common getcwd sys_getcwd
80 common chdir __x64_sys_chdir 80 common chdir sys_chdir
81 common fchdir __x64_sys_fchdir 81 common fchdir sys_fchdir
82 common rename __x64_sys_rename 82 common rename sys_rename
83 common mkdir __x64_sys_mkdir 83 common mkdir sys_mkdir
84 common rmdir __x64_sys_rmdir 84 common rmdir sys_rmdir
85 common creat __x64_sys_creat 85 common creat sys_creat
86 common link __x64_sys_link 86 common link sys_link
87 common unlink __x64_sys_unlink 87 common unlink sys_unlink
88 common symlink __x64_sys_symlink 88 common symlink sys_symlink
89 common readlink __x64_sys_readlink 89 common readlink sys_readlink
90 common chmod __x64_sys_chmod 90 common chmod sys_chmod
91 common fchmod __x64_sys_fchmod 91 common fchmod sys_fchmod
92 common chown __x64_sys_chown 92 common chown sys_chown
93 common fchown __x64_sys_fchown 93 common fchown sys_fchown
94 common lchown __x64_sys_lchown 94 common lchown sys_lchown
95 common umask __x64_sys_umask 95 common umask sys_umask
96 common gettimeofday __x64_sys_gettimeofday 96 common gettimeofday sys_gettimeofday
97 common getrlimit __x64_sys_getrlimit 97 common getrlimit sys_getrlimit
98 common getrusage __x64_sys_getrusage 98 common getrusage sys_getrusage
99 common sysinfo __x64_sys_sysinfo 99 common sysinfo sys_sysinfo
100 common times __x64_sys_times 100 common times sys_times
101 64 ptrace __x64_sys_ptrace 101 64 ptrace sys_ptrace
102 common getuid __x64_sys_getuid 102 common getuid sys_getuid
103 common syslog __x64_sys_syslog 103 common syslog sys_syslog
104 common getgid __x64_sys_getgid 104 common getgid sys_getgid
105 common setuid __x64_sys_setuid 105 common setuid sys_setuid
106 common setgid __x64_sys_setgid 106 common setgid sys_setgid
107 common geteuid __x64_sys_geteuid 107 common geteuid sys_geteuid
108 common getegid __x64_sys_getegid 108 common getegid sys_getegid
109 common setpgid __x64_sys_setpgid 109 common setpgid sys_setpgid
110 common getppid __x64_sys_getppid 110 common getppid sys_getppid
111 common getpgrp __x64_sys_getpgrp 111 common getpgrp sys_getpgrp
112 common setsid __x64_sys_setsid 112 common setsid sys_setsid
113 common setreuid __x64_sys_setreuid 113 common setreuid sys_setreuid
114 common setregid __x64_sys_setregid 114 common setregid sys_setregid
115 common getgroups __x64_sys_getgroups 115 common getgroups sys_getgroups
116 common setgroups __x64_sys_setgroups 116 common setgroups sys_setgroups
117 common setresuid __x64_sys_setresuid 117 common setresuid sys_setresuid
118 common getresuid __x64_sys_getresuid 118 common getresuid sys_getresuid
119 common setresgid __x64_sys_setresgid 119 common setresgid sys_setresgid
120 common getresgid __x64_sys_getresgid 120 common getresgid sys_getresgid
121 common getpgid __x64_sys_getpgid 121 common getpgid sys_getpgid
122 common setfsuid __x64_sys_setfsuid 122 common setfsuid sys_setfsuid
123 common setfsgid __x64_sys_setfsgid 123 common setfsgid sys_setfsgid
124 common getsid __x64_sys_getsid 124 common getsid sys_getsid
125 common capget __x64_sys_capget 125 common capget sys_capget
126 common capset __x64_sys_capset 126 common capset sys_capset
127 64 rt_sigpending __x64_sys_rt_sigpending 127 64 rt_sigpending sys_rt_sigpending
128 64 rt_sigtimedwait __x64_sys_rt_sigtimedwait 128 64 rt_sigtimedwait sys_rt_sigtimedwait
129 64 rt_sigqueueinfo __x64_sys_rt_sigqueueinfo 129 64 rt_sigqueueinfo sys_rt_sigqueueinfo
130 common rt_sigsuspend __x64_sys_rt_sigsuspend 130 common rt_sigsuspend sys_rt_sigsuspend
131 64 sigaltstack __x64_sys_sigaltstack 131 64 sigaltstack sys_sigaltstack
132 common utime __x64_sys_utime 132 common utime sys_utime
133 common mknod __x64_sys_mknod 133 common mknod sys_mknod
134 64 uselib 134 64 uselib
135 common personality __x64_sys_personality 135 common personality sys_personality
136 common ustat __x64_sys_ustat 136 common ustat sys_ustat
137 common statfs __x64_sys_statfs 137 common statfs sys_statfs
138 common fstatfs __x64_sys_fstatfs 138 common fstatfs sys_fstatfs
139 common sysfs __x64_sys_sysfs 139 common sysfs sys_sysfs
140 common getpriority __x64_sys_getpriority 140 common getpriority sys_getpriority
141 common setpriority __x64_sys_setpriority 141 common setpriority sys_setpriority
142 common sched_setparam __x64_sys_sched_setparam 142 common sched_setparam sys_sched_setparam
143 common sched_getparam __x64_sys_sched_getparam 143 common sched_getparam sys_sched_getparam
144 common sched_setscheduler __x64_sys_sched_setscheduler 144 common sched_setscheduler sys_sched_setscheduler
145 common sched_getscheduler __x64_sys_sched_getscheduler 145 common sched_getscheduler sys_sched_getscheduler
146 common sched_get_priority_max __x64_sys_sched_get_priority_max 146 common sched_get_priority_max sys_sched_get_priority_max
147 common sched_get_priority_min __x64_sys_sched_get_priority_min 147 common sched_get_priority_min sys_sched_get_priority_min
148 common sched_rr_get_interval __x64_sys_sched_rr_get_interval 148 common sched_rr_get_interval sys_sched_rr_get_interval
149 common mlock __x64_sys_mlock 149 common mlock sys_mlock
150 common munlock __x64_sys_munlock 150 common munlock sys_munlock
151 common mlockall __x64_sys_mlockall 151 common mlockall sys_mlockall
152 common munlockall __x64_sys_munlockall 152 common munlockall sys_munlockall
153 common vhangup __x64_sys_vhangup 153 common vhangup sys_vhangup
154 common modify_ldt __x64_sys_modify_ldt 154 common modify_ldt sys_modify_ldt
155 common pivot_root __x64_sys_pivot_root 155 common pivot_root sys_pivot_root
156 64 _sysctl __x64_sys_sysctl 156 64 _sysctl sys_sysctl
157 common prctl __x64_sys_prctl 157 common prctl sys_prctl
158 common arch_prctl __x64_sys_arch_prctl 158 common arch_prctl sys_arch_prctl
159 common adjtimex __x64_sys_adjtimex 159 common adjtimex sys_adjtimex
160 common setrlimit __x64_sys_setrlimit 160 common setrlimit sys_setrlimit
161 common chroot __x64_sys_chroot 161 common chroot sys_chroot
162 common sync __x64_sys_sync 162 common sync sys_sync
163 common acct __x64_sys_acct 163 common acct sys_acct
164 common settimeofday __x64_sys_settimeofday 164 common settimeofday sys_settimeofday
165 common mount __x64_sys_mount 165 common mount sys_mount
166 common umount2 __x64_sys_umount 166 common umount2 sys_umount
167 common swapon __x64_sys_swapon 167 common swapon sys_swapon
168 common swapoff __x64_sys_swapoff 168 common swapoff sys_swapoff
169 common reboot __x64_sys_reboot 169 common reboot sys_reboot
170 common sethostname __x64_sys_sethostname 170 common sethostname sys_sethostname
171 common setdomainname __x64_sys_setdomainname 171 common setdomainname sys_setdomainname
172 common iopl __x64_sys_iopl/ptregs 172 common iopl sys_iopl
173 common ioperm __x64_sys_ioperm 173 common ioperm sys_ioperm
174 64 create_module 174 64 create_module
175 common init_module __x64_sys_init_module 175 common init_module sys_init_module
176 common delete_module __x64_sys_delete_module 176 common delete_module sys_delete_module
177 64 get_kernel_syms 177 64 get_kernel_syms
178 64 query_module 178 64 query_module
179 common quotactl __x64_sys_quotactl 179 common quotactl sys_quotactl
180 64 nfsservctl 180 64 nfsservctl
181 common getpmsg 181 common getpmsg
182 common putpmsg 182 common putpmsg
183 common afs_syscall 183 common afs_syscall
184 common tuxcall 184 common tuxcall
185 common security 185 common security
186 common gettid __x64_sys_gettid 186 common gettid sys_gettid
187 common readahead __x64_sys_readahead 187 common readahead sys_readahead
188 common setxattr __x64_sys_setxattr 188 common setxattr sys_setxattr
189 common lsetxattr __x64_sys_lsetxattr 189 common lsetxattr sys_lsetxattr
190 common fsetxattr __x64_sys_fsetxattr 190 common fsetxattr sys_fsetxattr
191 common getxattr __x64_sys_getxattr 191 common getxattr sys_getxattr
192 common lgetxattr __x64_sys_lgetxattr 192 common lgetxattr sys_lgetxattr
193 common fgetxattr __x64_sys_fgetxattr 193 common fgetxattr sys_fgetxattr
194 common listxattr __x64_sys_listxattr 194 common listxattr sys_listxattr
195 common llistxattr __x64_sys_llistxattr 195 common llistxattr sys_llistxattr
196 common flistxattr __x64_sys_flistxattr 196 common flistxattr sys_flistxattr
197 common removexattr __x64_sys_removexattr 197 common removexattr sys_removexattr
198 common lremovexattr __x64_sys_lremovexattr 198 common lremovexattr sys_lremovexattr
199 common fremovexattr __x64_sys_fremovexattr 199 common fremovexattr sys_fremovexattr
200 common tkill __x64_sys_tkill 200 common tkill sys_tkill
201 common time __x64_sys_time 201 common time sys_time
202 common futex __x64_sys_futex 202 common futex sys_futex
203 common sched_setaffinity __x64_sys_sched_setaffinity 203 common sched_setaffinity sys_sched_setaffinity
204 common sched_getaffinity __x64_sys_sched_getaffinity 204 common sched_getaffinity sys_sched_getaffinity
205 64 set_thread_area 205 64 set_thread_area
206 64 io_setup __x64_sys_io_setup 206 64 io_setup sys_io_setup
207 common io_destroy __x64_sys_io_destroy 207 common io_destroy sys_io_destroy
208 common io_getevents __x64_sys_io_getevents 208 common io_getevents sys_io_getevents
209 64 io_submit __x64_sys_io_submit 209 64 io_submit sys_io_submit
210 common io_cancel __x64_sys_io_cancel 210 common io_cancel sys_io_cancel
211 64 get_thread_area 211 64 get_thread_area
212 common lookup_dcookie __x64_sys_lookup_dcookie 212 common lookup_dcookie sys_lookup_dcookie
213 common epoll_create __x64_sys_epoll_create 213 common epoll_create sys_epoll_create
214 64 epoll_ctl_old 214 64 epoll_ctl_old
215 64 epoll_wait_old 215 64 epoll_wait_old
216 common remap_file_pages __x64_sys_remap_file_pages 216 common remap_file_pages sys_remap_file_pages
217 common getdents64 __x64_sys_getdents64 217 common getdents64 sys_getdents64
218 common set_tid_address __x64_sys_set_tid_address 218 common set_tid_address sys_set_tid_address
219 common restart_syscall __x64_sys_restart_syscall 219 common restart_syscall sys_restart_syscall
220 common semtimedop __x64_sys_semtimedop 220 common semtimedop sys_semtimedop
221 common fadvise64 __x64_sys_fadvise64 221 common fadvise64 sys_fadvise64
222 64 timer_create __x64_sys_timer_create 222 64 timer_create sys_timer_create
223 common timer_settime __x64_sys_timer_settime 223 common timer_settime sys_timer_settime
224 common timer_gettime __x64_sys_timer_gettime 224 common timer_gettime sys_timer_gettime
225 common timer_getoverrun __x64_sys_timer_getoverrun 225 common timer_getoverrun sys_timer_getoverrun
226 common timer_delete __x64_sys_timer_delete 226 common timer_delete sys_timer_delete
227 common clock_settime __x64_sys_clock_settime 227 common clock_settime sys_clock_settime
228 common clock_gettime __x64_sys_clock_gettime 228 common clock_gettime sys_clock_gettime
229 common clock_getres __x64_sys_clock_getres 229 common clock_getres sys_clock_getres
230 common clock_nanosleep __x64_sys_clock_nanosleep 230 common clock_nanosleep sys_clock_nanosleep
231 common exit_group __x64_sys_exit_group 231 common exit_group sys_exit_group
232 common epoll_wait __x64_sys_epoll_wait 232 common epoll_wait sys_epoll_wait
233 common epoll_ctl __x64_sys_epoll_ctl 233 common epoll_ctl sys_epoll_ctl
234 common tgkill __x64_sys_tgkill 234 common tgkill sys_tgkill
235 common utimes __x64_sys_utimes 235 common utimes sys_utimes
236 64 vserver 236 64 vserver
237 common mbind __x64_sys_mbind 237 common mbind sys_mbind
238 common set_mempolicy __x64_sys_set_mempolicy 238 common set_mempolicy sys_set_mempolicy
239 common get_mempolicy __x64_sys_get_mempolicy 239 common get_mempolicy sys_get_mempolicy
240 common mq_open __x64_sys_mq_open 240 common mq_open sys_mq_open
241 common mq_unlink __x64_sys_mq_unlink 241 common mq_unlink sys_mq_unlink
242 common mq_timedsend __x64_sys_mq_timedsend 242 common mq_timedsend sys_mq_timedsend
243 common mq_timedreceive __x64_sys_mq_timedreceive 243 common mq_timedreceive sys_mq_timedreceive
244 64 mq_notify __x64_sys_mq_notify 244 64 mq_notify sys_mq_notify
245 common mq_getsetattr __x64_sys_mq_getsetattr 245 common mq_getsetattr sys_mq_getsetattr
246 64 kexec_load __x64_sys_kexec_load 246 64 kexec_load sys_kexec_load
247 64 waitid __x64_sys_waitid 247 64 waitid sys_waitid
248 common add_key __x64_sys_add_key 248 common add_key sys_add_key
249 common request_key __x64_sys_request_key 249 common request_key sys_request_key
250 common keyctl __x64_sys_keyctl 250 common keyctl sys_keyctl
251 common ioprio_set __x64_sys_ioprio_set 251 common ioprio_set sys_ioprio_set
252 common ioprio_get __x64_sys_ioprio_get 252 common ioprio_get sys_ioprio_get
253 common inotify_init __x64_sys_inotify_init 253 common inotify_init sys_inotify_init
254 common inotify_add_watch __x64_sys_inotify_add_watch 254 common inotify_add_watch sys_inotify_add_watch
255 common inotify_rm_watch __x64_sys_inotify_rm_watch 255 common inotify_rm_watch sys_inotify_rm_watch
256 common migrate_pages __x64_sys_migrate_pages 256 common migrate_pages sys_migrate_pages
257 common openat __x64_sys_openat 257 common openat sys_openat
258 common mkdirat __x64_sys_mkdirat 258 common mkdirat sys_mkdirat
259 common mknodat __x64_sys_mknodat 259 common mknodat sys_mknodat
260 common fchownat __x64_sys_fchownat 260 common fchownat sys_fchownat
261 common futimesat __x64_sys_futimesat 261 common futimesat sys_futimesat
262 common newfstatat __x64_sys_newfstatat 262 common newfstatat sys_newfstatat
263 common unlinkat __x64_sys_unlinkat 263 common unlinkat sys_unlinkat
264 common renameat __x64_sys_renameat 264 common renameat sys_renameat
265 common linkat __x64_sys_linkat 265 common linkat sys_linkat
266 common symlinkat __x64_sys_symlinkat 266 common symlinkat sys_symlinkat
267 common readlinkat __x64_sys_readlinkat 267 common readlinkat sys_readlinkat
268 common fchmodat __x64_sys_fchmodat 268 common fchmodat sys_fchmodat
269 common faccessat __x64_sys_faccessat 269 common faccessat sys_faccessat
270 common pselect6 __x64_sys_pselect6 270 common pselect6 sys_pselect6
271 common ppoll __x64_sys_ppoll 271 common ppoll sys_ppoll
272 common unshare __x64_sys_unshare 272 common unshare sys_unshare
273 64 set_robust_list __x64_sys_set_robust_list 273 64 set_robust_list sys_set_robust_list
274 64 get_robust_list __x64_sys_get_robust_list 274 64 get_robust_list sys_get_robust_list
275 common splice __x64_sys_splice 275 common splice sys_splice
276 common tee __x64_sys_tee 276 common tee sys_tee
277 common sync_file_range __x64_sys_sync_file_range 277 common sync_file_range sys_sync_file_range
278 64 vmsplice __x64_sys_vmsplice 278 64 vmsplice sys_vmsplice
279 64 move_pages __x64_sys_move_pages 279 64 move_pages sys_move_pages
280 common utimensat __x64_sys_utimensat 280 common utimensat sys_utimensat
281 common epoll_pwait __x64_sys_epoll_pwait 281 common epoll_pwait sys_epoll_pwait
282 common signalfd __x64_sys_signalfd 282 common signalfd sys_signalfd
283 common timerfd_create __x64_sys_timerfd_create 283 common timerfd_create sys_timerfd_create
284 common eventfd __x64_sys_eventfd 284 common eventfd sys_eventfd
285 common fallocate __x64_sys_fallocate 285 common fallocate sys_fallocate
286 common timerfd_settime __x64_sys_timerfd_settime 286 common timerfd_settime sys_timerfd_settime
287 common timerfd_gettime __x64_sys_timerfd_gettime 287 common timerfd_gettime sys_timerfd_gettime
288 common accept4 __x64_sys_accept4 288 common accept4 sys_accept4
289 common signalfd4 __x64_sys_signalfd4 289 common signalfd4 sys_signalfd4
290 common eventfd2 __x64_sys_eventfd2 290 common eventfd2 sys_eventfd2
291 common epoll_create1 __x64_sys_epoll_create1 291 common epoll_create1 sys_epoll_create1
292 common dup3 __x64_sys_dup3 292 common dup3 sys_dup3
293 common pipe2 __x64_sys_pipe2 293 common pipe2 sys_pipe2
294 common inotify_init1 __x64_sys_inotify_init1 294 common inotify_init1 sys_inotify_init1
295 64 preadv __x64_sys_preadv 295 64 preadv sys_preadv
296 64 pwritev __x64_sys_pwritev 296 64 pwritev sys_pwritev
297 64 rt_tgsigqueueinfo __x64_sys_rt_tgsigqueueinfo 297 64 rt_tgsigqueueinfo sys_rt_tgsigqueueinfo
298 common perf_event_open __x64_sys_perf_event_open 298 common perf_event_open sys_perf_event_open
299 64 recvmmsg __x64_sys_recvmmsg 299 64 recvmmsg sys_recvmmsg
300 common fanotify_init __x64_sys_fanotify_init 300 common fanotify_init sys_fanotify_init
301 common fanotify_mark __x64_sys_fanotify_mark 301 common fanotify_mark sys_fanotify_mark
302 common prlimit64 __x64_sys_prlimit64 302 common prlimit64 sys_prlimit64
303 common name_to_handle_at __x64_sys_name_to_handle_at 303 common name_to_handle_at sys_name_to_handle_at
304 common open_by_handle_at __x64_sys_open_by_handle_at 304 common open_by_handle_at sys_open_by_handle_at
305 common clock_adjtime __x64_sys_clock_adjtime 305 common clock_adjtime sys_clock_adjtime
306 common syncfs __x64_sys_syncfs 306 common syncfs sys_syncfs
307 64 sendmmsg __x64_sys_sendmmsg 307 64 sendmmsg sys_sendmmsg
308 common setns __x64_sys_setns 308 common setns sys_setns
309 common getcpu __x64_sys_getcpu 309 common getcpu sys_getcpu
310 64 process_vm_readv __x64_sys_process_vm_readv 310 64 process_vm_readv sys_process_vm_readv
311 64 process_vm_writev __x64_sys_process_vm_writev 311 64 process_vm_writev sys_process_vm_writev
312 common kcmp __x64_sys_kcmp 312 common kcmp sys_kcmp
313 common finit_module __x64_sys_finit_module 313 common finit_module sys_finit_module
314 common sched_setattr __x64_sys_sched_setattr 314 common sched_setattr sys_sched_setattr
315 common sched_getattr __x64_sys_sched_getattr 315 common sched_getattr sys_sched_getattr
316 common renameat2 __x64_sys_renameat2 316 common renameat2 sys_renameat2
317 common seccomp __x64_sys_seccomp 317 common seccomp sys_seccomp
318 common getrandom __x64_sys_getrandom 318 common getrandom sys_getrandom
319 common memfd_create __x64_sys_memfd_create 319 common memfd_create sys_memfd_create
320 common kexec_file_load __x64_sys_kexec_file_load 320 common kexec_file_load sys_kexec_file_load
321 common bpf __x64_sys_bpf 321 common bpf sys_bpf
322 64 execveat __x64_sys_execveat/ptregs 322 64 execveat sys_execveat
323 common userfaultfd __x64_sys_userfaultfd 323 common userfaultfd sys_userfaultfd
324 common membarrier __x64_sys_membarrier 324 common membarrier sys_membarrier
325 common mlock2 __x64_sys_mlock2 325 common mlock2 sys_mlock2
326 common copy_file_range __x64_sys_copy_file_range 326 common copy_file_range sys_copy_file_range
327 64 preadv2 __x64_sys_preadv2 327 64 preadv2 sys_preadv2
328 64 pwritev2 __x64_sys_pwritev2 328 64 pwritev2 sys_pwritev2
329 common pkey_mprotect __x64_sys_pkey_mprotect 329 common pkey_mprotect sys_pkey_mprotect
330 common pkey_alloc __x64_sys_pkey_alloc 330 common pkey_alloc sys_pkey_alloc
331 common pkey_free __x64_sys_pkey_free 331 common pkey_free sys_pkey_free
332 common statx __x64_sys_statx 332 common statx sys_statx
333 common io_pgetevents __x64_sys_io_pgetevents 333 common io_pgetevents sys_io_pgetevents
334 common rseq __x64_sys_rseq 334 common rseq sys_rseq
# don't use numbers 387 through 423, add new calls after the last # don't use numbers 387 through 423, add new calls after the last
# 'common' entry # 'common' entry
424 common pidfd_send_signal __x64_sys_pidfd_send_signal 424 common pidfd_send_signal sys_pidfd_send_signal
425 common io_uring_setup __x64_sys_io_uring_setup 425 common io_uring_setup sys_io_uring_setup
426 common io_uring_enter __x64_sys_io_uring_enter 426 common io_uring_enter sys_io_uring_enter
427 common io_uring_register __x64_sys_io_uring_register 427 common io_uring_register sys_io_uring_register
428 common open_tree __x64_sys_open_tree 428 common open_tree sys_open_tree
429 common move_mount __x64_sys_move_mount 429 common move_mount sys_move_mount
430 common fsopen __x64_sys_fsopen 430 common fsopen sys_fsopen
431 common fsconfig __x64_sys_fsconfig 431 common fsconfig sys_fsconfig
432 common fsmount __x64_sys_fsmount 432 common fsmount sys_fsmount
433 common fspick __x64_sys_fspick 433 common fspick sys_fspick
434 common pidfd_open __x64_sys_pidfd_open 434 common pidfd_open sys_pidfd_open
435 common clone3 __x64_sys_clone3/ptregs 435 common clone3 sys_clone3
437 common openat2 __x64_sys_openat2 437 common openat2 sys_openat2
438 common pidfd_getfd __x64_sys_pidfd_getfd 438 common pidfd_getfd sys_pidfd_getfd
# #
# x32-specific system call numbers start at 512 to avoid cache impact # x32-specific system call numbers start at 512 to avoid cache impact
...@@ -366,39 +366,39 @@ ...@@ -366,39 +366,39 @@
# on-the-fly for compat_sys_*() compatibility system calls if X86_X32 # on-the-fly for compat_sys_*() compatibility system calls if X86_X32
# is defined. # is defined.
# #
512 x32 rt_sigaction __x32_compat_sys_rt_sigaction 512 x32 rt_sigaction compat_sys_rt_sigaction
513 x32 rt_sigreturn sys32_x32_rt_sigreturn 513 x32 rt_sigreturn compat_sys_x32_rt_sigreturn
514 x32 ioctl __x32_compat_sys_ioctl 514 x32 ioctl compat_sys_ioctl
515 x32 readv __x32_compat_sys_readv 515 x32 readv compat_sys_readv
516 x32 writev __x32_compat_sys_writev 516 x32 writev compat_sys_writev
517 x32 recvfrom __x32_compat_sys_recvfrom 517 x32 recvfrom compat_sys_recvfrom
518 x32 sendmsg __x32_compat_sys_sendmsg 518 x32 sendmsg compat_sys_sendmsg
519 x32 recvmsg __x32_compat_sys_recvmsg 519 x32 recvmsg compat_sys_recvmsg
520 x32 execve __x32_compat_sys_execve/ptregs 520 x32 execve compat_sys_execve
521 x32 ptrace __x32_compat_sys_ptrace 521 x32 ptrace compat_sys_ptrace
522 x32 rt_sigpending __x32_compat_sys_rt_sigpending 522 x32 rt_sigpending compat_sys_rt_sigpending
523 x32 rt_sigtimedwait __x32_compat_sys_rt_sigtimedwait_time64 523 x32 rt_sigtimedwait compat_sys_rt_sigtimedwait_time64
524 x32 rt_sigqueueinfo __x32_compat_sys_rt_sigqueueinfo 524 x32 rt_sigqueueinfo compat_sys_rt_sigqueueinfo
525 x32 sigaltstack __x32_compat_sys_sigaltstack 525 x32 sigaltstack compat_sys_sigaltstack
526 x32 timer_create __x32_compat_sys_timer_create 526 x32 timer_create compat_sys_timer_create
527 x32 mq_notify __x32_compat_sys_mq_notify 527 x32 mq_notify compat_sys_mq_notify
528 x32 kexec_load __x32_compat_sys_kexec_load 528 x32 kexec_load compat_sys_kexec_load
529 x32 waitid __x32_compat_sys_waitid 529 x32 waitid compat_sys_waitid
530 x32 set_robust_list __x32_compat_sys_set_robust_list 530 x32 set_robust_list compat_sys_set_robust_list
531 x32 get_robust_list __x32_compat_sys_get_robust_list 531 x32 get_robust_list compat_sys_get_robust_list
532 x32 vmsplice __x32_compat_sys_vmsplice 532 x32 vmsplice compat_sys_vmsplice
533 x32 move_pages __x32_compat_sys_move_pages 533 x32 move_pages compat_sys_move_pages
534 x32 preadv __x32_compat_sys_preadv64 534 x32 preadv compat_sys_preadv64
535 x32 pwritev __x32_compat_sys_pwritev64 535 x32 pwritev compat_sys_pwritev64
536 x32 rt_tgsigqueueinfo __x32_compat_sys_rt_tgsigqueueinfo 536 x32 rt_tgsigqueueinfo compat_sys_rt_tgsigqueueinfo
537 x32 recvmmsg __x32_compat_sys_recvmmsg_time64 537 x32 recvmmsg compat_sys_recvmmsg_time64
538 x32 sendmmsg __x32_compat_sys_sendmmsg 538 x32 sendmmsg compat_sys_sendmmsg
539 x32 process_vm_readv __x32_compat_sys_process_vm_readv 539 x32 process_vm_readv compat_sys_process_vm_readv
540 x32 process_vm_writev __x32_compat_sys_process_vm_writev 540 x32 process_vm_writev compat_sys_process_vm_writev
541 x32 setsockopt __x32_compat_sys_setsockopt 541 x32 setsockopt compat_sys_setsockopt
542 x32 getsockopt __x32_compat_sys_getsockopt 542 x32 getsockopt compat_sys_getsockopt
543 x32 io_setup __x32_compat_sys_io_setup 543 x32 io_setup compat_sys_io_setup
544 x32 io_submit __x32_compat_sys_io_submit 544 x32 io_submit compat_sys_io_submit
545 x32 execveat __x32_compat_sys_execveat/ptregs 545 x32 execveat compat_sys_execveat
546 x32 preadv2 __x32_compat_sys_preadv64v2 546 x32 preadv2 compat_sys_preadv64v2
547 x32 pwritev2 __x32_compat_sys_pwritev64v2 547 x32 pwritev2 compat_sys_pwritev64v2
...@@ -22,7 +22,9 @@ include/uapi/linux/usbdevice_fs.h ...@@ -22,7 +22,9 @@ include/uapi/linux/usbdevice_fs.h
include/uapi/linux/vhost.h include/uapi/linux/vhost.h
include/uapi/sound/asound.h include/uapi/sound/asound.h
include/linux/bits.h include/linux/bits.h
include/vdso/bits.h
include/linux/const.h include/linux/const.h
include/vdso/const.h
include/linux/hash.h include/linux/hash.h
include/uapi/linux/hw_breakpoint.h include/uapi/linux/hw_breakpoint.h
arch/x86/include/asm/disabled-features.h arch/x86/include/asm/disabled-features.h
...@@ -115,6 +117,7 @@ check arch/x86/lib/memcpy_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/ex ...@@ -115,6 +117,7 @@ check arch/x86/lib/memcpy_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/ex
check arch/x86/lib/memset_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"' check arch/x86/lib/memset_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -I"^SYM_FUNC_START\(_LOCAL\)*(memset_\(erms\|orig\))"'
check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"' check include/uapi/asm-generic/mman.h '-I "^#include <\(uapi/\)*asm-generic/mman-common\(-tools\)*.h>"'
check include/uapi/linux/mman.h '-I "^#include <\(uapi/\)*asm/mman.h>"' check include/uapi/linux/mman.h '-I "^#include <\(uapi/\)*asm/mman.h>"'
check include/linux/build_bug.h '-I "^#\(ifndef\|endif\)\( \/\/\)* static_assert$"'
check include/linux/ctype.h '-I "isdigit("' check include/linux/ctype.h '-I "isdigit("'
check lib/ctype.c '-I "^EXPORT_SYMBOL" -I "^#include <linux/export.h>" -B' check lib/ctype.c '-I "^EXPORT_SYMBOL" -I "^#include <linux/export.h>" -B'
check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"' check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"'
......
...@@ -46,6 +46,7 @@ static size_t clone__scnprintf_flags(unsigned long flags, char *bf, size_t size, ...@@ -46,6 +46,7 @@ static size_t clone__scnprintf_flags(unsigned long flags, char *bf, size_t size,
P_FLAG(NEWNET); P_FLAG(NEWNET);
P_FLAG(IO); P_FLAG(IO);
P_FLAG(CLEAR_SIGHAND); P_FLAG(CLEAR_SIGHAND);
P_FLAG(INTO_CGROUP);
#undef P_FLAG #undef P_FLAG
if (flags) if (flags)
......
...@@ -69,6 +69,7 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size, ...@@ -69,6 +69,7 @@ static size_t syscall_arg__scnprintf_mremap_flags(char *bf, size_t size,
P_MREMAP_FLAG(MAYMOVE); P_MREMAP_FLAG(MAYMOVE);
P_MREMAP_FLAG(FIXED); P_MREMAP_FLAG(FIXED);
P_MREMAP_FLAG(DONTUNMAP);
#undef P_MREMAP_FLAG #undef P_MREMAP_FLAG
if (flags) if (flags)
......
...@@ -21,6 +21,8 @@ if cc_is_clang: ...@@ -21,6 +21,8 @@ if cc_is_clang:
vars[var] = sub("-fstack-clash-protection", "", vars[var]) vars[var] = sub("-fstack-clash-protection", "", vars[var])
if not clang_has_option("-fstack-protector-strong"): if not clang_has_option("-fstack-protector-strong"):
vars[var] = sub("-fstack-protector-strong", "", vars[var]) vars[var] = sub("-fstack-protector-strong", "", vars[var])
if not clang_has_option("-fno-semantic-interposition"):
vars[var] = sub("-fno-semantic-interposition", "", vars[var])
from distutils.core import setup, Extension from distutils.core import setup, Extension
......
...@@ -803,8 +803,11 @@ static void generic_metric(struct perf_stat_config *config, ...@@ -803,8 +803,11 @@ static void generic_metric(struct perf_stat_config *config,
out->force_header ? out->force_header ?
(metric_name ? metric_name : name) : "", 0); (metric_name ? metric_name : name) : "", 0);
} }
} else } else {
print_metric(config, ctxp, NULL, NULL, "", 0); print_metric(config, ctxp, NULL, NULL,
out->force_header ?
(metric_name ? metric_name : name) : "", 0);
}
for (i = 1; i < pctx.num_ids; i++) for (i = 1; i < pctx.num_ids; i++)
zfree(&pctx.ids[i].name); zfree(&pctx.ids[i].name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment