lkml.org 
[lkml]   [2018]   [Jun]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 27/29] perf/tools: header file sync up
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    When building tools/perf/ it rightly complains about a number of .h
    files being out of sync. Fix this up by syncing them properly with the
    relevant in-kernel versions.

    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    tools/arch/arm/include/uapi/asm/kvm.h | 13 ++
    tools/arch/arm64/include/uapi/asm/kvm.h | 6 +
    tools/arch/powerpc/include/uapi/asm/kvm.h | 1
    tools/arch/s390/include/uapi/asm/kvm.h | 5
    tools/arch/x86/include/asm/cpufeatures.h | 44 ++++++-
    tools/arch/x86/include/asm/disabled-features.h | 7 -
    tools/arch/x86/include/asm/required-features.h | 3
    tools/include/uapi/asm-generic/mman-common.h | 5
    tools/include/uapi/linux/bpf.h | 51 ++++++++
    tools/include/uapi/linux/fcntl.h | 5
    tools/include/uapi/linux/stat.h | 131 ----------------------
    tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 7 -
    12 files changed, 132 insertions(+), 146 deletions(-)

    --- a/tools/arch/arm/include/uapi/asm/kvm.h
    +++ b/tools/arch/arm/include/uapi/asm/kvm.h
    @@ -84,6 +84,13 @@ struct kvm_regs {
    #define KVM_VGIC_V2_DIST_SIZE 0x1000
    #define KVM_VGIC_V2_CPU_SIZE 0x2000

    +/* Supported VGICv3 address types */
    +#define KVM_VGIC_V3_ADDR_TYPE_DIST 2
    +#define KVM_VGIC_V3_ADDR_TYPE_REDIST 3
    +
    +#define KVM_VGIC_V3_DIST_SIZE SZ_64K
    +#define KVM_VGIC_V3_REDIST_SIZE (2 * SZ_64K)
    +
    #define KVM_ARM_VCPU_POWER_OFF 0 /* CPU is started in OFF state */
    #define KVM_ARM_VCPU_PSCI_0_2 1 /* CPU uses PSCI v0.2 */

    @@ -166,6 +173,12 @@ struct kvm_arch_memory_slot {
    #define KVM_REG_ARM_VFP_FPINST 0x1009
    #define KVM_REG_ARM_VFP_FPINST2 0x100A

    +/* KVM-as-firmware specific pseudo-registers */
    +#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT)
    +#define KVM_REG_ARM_FW_REG(r) (KVM_REG_ARM | KVM_REG_SIZE_U64 | \
    + KVM_REG_ARM_FW | ((r) & 0xffff))
    +#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0)
    +
    /* Device Control API: ARM VGIC */
    #define KVM_DEV_ARM_VGIC_GRP_ADDR 0
    #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
    --- a/tools/arch/arm64/include/uapi/asm/kvm.h
    +++ b/tools/arch/arm64/include/uapi/asm/kvm.h
    @@ -195,6 +195,12 @@ struct kvm_arch_memory_slot {
    #define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)
    #define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2)

    +/* KVM-as-firmware specific pseudo-registers */
    +#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT)
    +#define KVM_REG_ARM_FW_REG(r) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \
    + KVM_REG_ARM_FW | ((r) & 0xffff))
    +#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0)
    +
    /* Device Control API: ARM VGIC */
    #define KVM_DEV_ARM_VGIC_GRP_ADDR 0
    #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
    --- a/tools/arch/powerpc/include/uapi/asm/kvm.h
    +++ b/tools/arch/powerpc/include/uapi/asm/kvm.h
    @@ -596,6 +596,7 @@ struct kvm_get_htab_header {
    #define KVM_REG_PPC_TM_VSCR (KVM_REG_PPC_TM | KVM_REG_SIZE_U32 | 0x67)
    #define KVM_REG_PPC_TM_DSCR (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x68)
    #define KVM_REG_PPC_TM_TAR (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x69)
    +#define KVM_REG_PPC_TM_XER (KVM_REG_PPC_TM | KVM_REG_SIZE_U64 | 0x6a)

    /* PPC64 eXternal Interrupt Controller Specification */
    #define KVM_DEV_XICS_GRP_SOURCES 1 /* 64-bit source attributes */
    --- a/tools/arch/s390/include/uapi/asm/kvm.h
    +++ b/tools/arch/s390/include/uapi/asm/kvm.h
    @@ -197,6 +197,7 @@ struct kvm_guest_debug_arch {
    #define KVM_SYNC_VRS (1UL << 6)
    #define KVM_SYNC_RICCB (1UL << 7)
    #define KVM_SYNC_FPRS (1UL << 8)
    +#define KVM_SYNC_BPBC (1UL << 10)
    /* definition of registers in kvm_run */
    struct kvm_sync_regs {
    __u64 prefix; /* prefix register */
    @@ -217,7 +218,9 @@ struct kvm_sync_regs {
    };
    __u8 reserved[512]; /* for future vector expansion */
    __u32 fpc; /* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */
    - __u8 padding[52]; /* riccb needs to be 64byte aligned */
    + __u8 bpbc : 1; /* bp mode */
    + __u8 reserved2 : 7;
    + __u8 padding1[51]; /* riccb needs to be 64byte aligned */
    __u8 riccb[64]; /* runtime instrumentation controls block */
    };

    --- a/tools/arch/x86/include/asm/cpufeatures.h
    +++ b/tools/arch/x86/include/asm/cpufeatures.h
    @@ -12,7 +12,7 @@
    /*
    * Defines x86 CPU feature bits
    */
    -#define NCAPINTS 18 /* N 32-bit words worth of info */
    +#define NCAPINTS 19 /* N 32-bit words worth of info */
    #define NBUGINTS 1 /* N 32-bit bug flags */

    /*
    @@ -189,17 +189,32 @@

    #define X86_FEATURE_CPB ( 7*32+ 2) /* AMD Core Performance Boost */
    #define X86_FEATURE_EPB ( 7*32+ 3) /* IA32_ENERGY_PERF_BIAS support */
    +#define X86_FEATURE_INVPCID_SINGLE ( 7*32+ 4) /* Effectively INVPCID && CR4.PCIDE=1 */

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

    -#define X86_FEATURE_INTEL_PT ( 7*32+15) /* Intel Processor Trace */
    -#define X86_FEATURE_AVX512_4VNNIW (7*32+16) /* AVX-512 Neural Network Instructions */
    -#define X86_FEATURE_AVX512_4FMAPS (7*32+17) /* AVX-512 Multiply Accumulation Single precision */
    +#define X86_FEATURE_RETPOLINE ( 7*32+12) /* "" Generic Retpoline mitigation for Spectre variant 2 */
    +#define X86_FEATURE_RETPOLINE_AMD ( 7*32+13) /* "" AMD Retpoline mitigation for Spectre variant 2 */
    +
    +#define X86_FEATURE_MSR_SPEC_CTRL ( 7*32+16) /* "" MSR SPEC_CTRL is implemented */
    +#define X86_FEATURE_SSBD ( 7*32+17) /* Speculative Store Bypass Disable */
    +
    +#define X86_FEATURE_RSB_CTXSW ( 7*32+19) /* "" Fill RSB on context switches */

    /* Because the ALTERNATIVE scheme is for members of the X86_FEATURE club... */
    #define X86_FEATURE_KAISER ( 7*32+31) /* CONFIG_PAGE_TABLE_ISOLATION w/o nokaiser */

    +#define X86_FEATURE_USE_IBPB ( 7*32+21) /* "" Indirect Branch Prediction Barrier enabled */
    +#define X86_FEATURE_USE_IBRS_FW ( 7*32+22) /* "" Use IBRS during runtime firmware calls */
    +#define X86_FEATURE_SPEC_STORE_BYPASS_DISABLE ( 7*32+23) /* "" Disable Speculative Store Bypass. */
    +#define X86_FEATURE_LS_CFG_SSBD ( 7*32+24) /* "" AMD SSBD implementation */
    +#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_STIBP ( 7*32+27) /* Single Thread Indirect Branch Predictors */
    +#define X86_FEATURE_ZEN ( 7*32+28) /* "" CPU is AMD family 0x17 (Zen) */
    +
    +
    /* Virtualization flags: Linux defined, word 8 */
    #define X86_FEATURE_TPR_SHADOW ( 8*32+ 0) /* Intel TPR Shadow */
    #define X86_FEATURE_VNMI ( 8*32+ 1) /* Intel Virtual NMI */
    @@ -231,6 +246,7 @@
    #define X86_FEATURE_SMAP ( 9*32+20) /* Supervisor Mode Access Prevention */
    #define X86_FEATURE_CLFLUSHOPT ( 9*32+23) /* CLFLUSHOPT instruction */
    #define X86_FEATURE_CLWB ( 9*32+24) /* CLWB instruction */
    +#define X86_FEATURE_INTEL_PT ( 9*32+25) /* Intel Processor Trace */
    #define X86_FEATURE_AVX512PF ( 9*32+26) /* AVX-512 Prefetch */
    #define X86_FEATURE_AVX512ER ( 9*32+27) /* AVX-512 Exponential and Reciprocal */
    #define X86_FEATURE_AVX512CD ( 9*32+28) /* AVX-512 Conflict Detection */
    @@ -255,6 +271,10 @@
    /* AMD-defined CPU features, CPUID level 0x80000008 (ebx), word 13 */
    #define X86_FEATURE_CLZERO (13*32+0) /* CLZERO instruction */
    #define X86_FEATURE_IRPERF (13*32+1) /* Instructions Retired Count */
    +#define X86_FEATURE_AMD_IBPB (13*32+12) /* Indirect Branch Prediction Barrier */
    +#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_VIRT_SSBD (13*32+25) /* Virtualized Speculative Store Bypass Disable */

    /* Thermal and Power Management Leaf, CPUID level 0x00000006 (eax), word 14 */
    #define X86_FEATURE_DTHERM (14*32+ 0) /* Digital Thermal Sensor */
    @@ -290,6 +310,16 @@
    #define X86_FEATURE_SUCCOR (17*32+1) /* Uncorrectable error containment and recovery */
    #define X86_FEATURE_SMCA (17*32+3) /* Scalable MCA */

    +
    +/* 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_PCONFIG (18*32+18) /* Intel PCONFIG */
    +#define X86_FEATURE_SPEC_CTRL (18*32+26) /* "" Speculation Control (IBRS + IBPB) */
    +#define X86_FEATURE_INTEL_STIBP (18*32+27) /* "" Single Thread Indirect Branch Predictors */
    +#define X86_FEATURE_ARCH_CAPABILITIES (18*32+29) /* IA32_ARCH_CAPABILITIES MSR (Intel) */
    +#define X86_FEATURE_SPEC_CTRL_SSBD (18*32+31) /* "" Speculative Store Bypass Disable */
    +
    /*
    * BUG word(s)
    */
    @@ -314,4 +344,10 @@
    #define X86_BUG_NULL_SEG X86_BUG(10) /* Nulling a selector preserves the base */
    #define X86_BUG_SWAPGS_FENCE X86_BUG(11) /* SWAPGS without input dep on GS */
    #define X86_BUG_MONITOR X86_BUG(12) /* IPI required to wake up remote CPU */
    +#define X86_BUG_AMD_E400 X86_BUG(13) /* CPU is among the affected by Erratum 400 */
    +#define X86_BUG_CPU_MELTDOWN X86_BUG(14) /* CPU is affected by meltdown attack and needs kernel page table isolation */
    +#define X86_BUG_SPECTRE_V1 X86_BUG(15) /* CPU is affected by Spectre variant 1 attack with conditional branches */
    +#define X86_BUG_SPECTRE_V2 X86_BUG(16) /* CPU is affected by Spectre variant 2 attack with indirect branches */
    +#define X86_BUG_SPEC_STORE_BYPASS X86_BUG(17) /* CPU is affected by speculative store bypass attack */
    +
    #endif /* _ASM_X86_CPUFEATURES_H */
    --- a/tools/arch/x86/include/asm/disabled-features.h
    +++ b/tools/arch/x86/include/asm/disabled-features.h
    @@ -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
    @@ -43,7 +45,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
    @@ -57,6 +59,7 @@
    #define DISABLED_MASK15 0
    #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE)
    #define DISABLED_MASK17 0
    -#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
    +#define DISABLED_MASK18 0
    +#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)

    #endif /* _ASM_X86_DISABLED_FEATURES_H */
    --- a/tools/arch/x86/include/asm/required-features.h
    +++ b/tools/arch/x86/include/asm/required-features.h
    @@ -100,6 +100,7 @@
    #define REQUIRED_MASK15 0
    #define REQUIRED_MASK16 0
    #define REQUIRED_MASK17 0
    -#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18)
    +#define REQUIRED_MASK18 0
    +#define REQUIRED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 19)

    #endif /* _ASM_X86_REQUIRED_FEATURES_H */
    --- a/tools/include/uapi/asm-generic/mman-common.h
    +++ b/tools/include/uapi/asm-generic/mman-common.h
    @@ -72,4 +72,9 @@
    #define MAP_HUGE_SHIFT 26
    #define MAP_HUGE_MASK 0x3f

    +#define PKEY_DISABLE_ACCESS 0x1
    +#define PKEY_DISABLE_WRITE 0x2
    +#define PKEY_ACCESS_MASK (PKEY_DISABLE_ACCESS |\
    + PKEY_DISABLE_WRITE)
    +
    #endif /* __ASM_GENERIC_MMAN_COMMON_H */
    --- a/tools/include/uapi/linux/bpf.h
    +++ b/tools/include/uapi/linux/bpf.h
    @@ -95,6 +95,7 @@ enum bpf_prog_type {
    BPF_PROG_TYPE_SCHED_ACT,
    BPF_PROG_TYPE_TRACEPOINT,
    BPF_PROG_TYPE_XDP,
    + BPF_PROG_TYPE_PERF_EVENT,
    };

    #define BPF_PSEUDO_MAP_FD 1
    @@ -375,6 +376,56 @@ enum bpf_func_id {
    */
    BPF_FUNC_probe_write_user,

    + /**
    + * bpf_current_task_under_cgroup(map, index) - Check cgroup2 membership of current task
    + * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type
    + * @index: index of the cgroup in the bpf_map
    + * Return:
    + * == 0 current failed the cgroup2 descendant test
    + * == 1 current succeeded the cgroup2 descendant test
    + * < 0 error
    + */
    + BPF_FUNC_current_task_under_cgroup,
    +
    + /**
    + * bpf_skb_change_tail(skb, len, flags)
    + * The helper will resize the skb to the given new size,
    + * to be used f.e. with control messages.
    + * @skb: pointer to skb
    + * @len: new skb length
    + * @flags: reserved
    + * Return: 0 on success or negative error
    + */
    + BPF_FUNC_skb_change_tail,
    +
    + /**
    + * bpf_skb_pull_data(skb, len)
    + * The helper will pull in non-linear data in case the
    + * skb is non-linear and not all of len are part of the
    + * linear section. Only needed for read/write with direct
    + * packet access.
    + * @skb: pointer to skb
    + * @len: len to make read/writeable
    + * Return: 0 on success or negative error
    + */
    + BPF_FUNC_skb_pull_data,
    +
    + /**
    + * bpf_csum_update(skb, csum)
    + * Adds csum into skb->csum in case of CHECKSUM_COMPLETE.
    + * @skb: pointer to skb
    + * @csum: csum to add
    + * Return: csum on success or negative error
    + */
    + BPF_FUNC_csum_update,
    +
    + /**
    + * bpf_set_hash_invalid(skb)
    + * Invalidate current skb>hash.
    + * @skb: pointer to skb
    + */
    + BPF_FUNC_set_hash_invalid,
    +
    __BPF_FUNC_MAX_ID,
    };

    --- a/tools/include/uapi/linux/fcntl.h
    +++ b/tools/include/uapi/linux/fcntl.h
    @@ -63,10 +63,5 @@
    #define AT_NO_AUTOMOUNT 0x800 /* Suppress terminal automount traversal */
    #define AT_EMPTY_PATH 0x1000 /* Allow empty relative pathname */

    -#define AT_STATX_SYNC_TYPE 0x6000 /* Type of synchronisation required from statx() */
    -#define AT_STATX_SYNC_AS_STAT 0x0000 /* - Do whatever stat() does */
    -#define AT_STATX_FORCE_SYNC 0x2000 /* - Force the attributes to be sync'd with the server */
    -#define AT_STATX_DONT_SYNC 0x4000 /* - Don't sync attributes with the server */
    -

    #endif /* _UAPI_LINUX_FCNTL_H */
    --- a/tools/include/uapi/linux/stat.h
    +++ b/tools/include/uapi/linux/stat.h
    @@ -1,7 +1,6 @@
    #ifndef _UAPI_LINUX_STAT_H
    #define _UAPI_LINUX_STAT_H

    -#include <linux/types.h>

    #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)

    @@ -42,135 +41,5 @@

    #endif

    -/*
    - * Timestamp structure for the timestamps in struct statx.
    - *
    - * tv_sec holds the number of seconds before (negative) or after (positive)
    - * 00:00:00 1st January 1970 UTC.
    - *
    - * tv_nsec holds a number of nanoseconds before (0..-999,999,999 if tv_sec is
    - * negative) or after (0..999,999,999 if tv_sec is positive) the tv_sec time.
    - *
    - * Note that if both tv_sec and tv_nsec are non-zero, then the two values must
    - * either be both positive or both negative.
    - *
    - * __reserved is held in case we need a yet finer resolution.
    - */
    -struct statx_timestamp {
    - __s64 tv_sec;
    - __s32 tv_nsec;
    - __s32 __reserved;
    -};
    -
    -/*
    - * Structures for the extended file attribute retrieval system call
    - * (statx()).
    - *
    - * The caller passes a mask of what they're specifically interested in as a
    - * parameter to statx(). What statx() actually got will be indicated in
    - * st_mask upon return.
    - *
    - * For each bit in the mask argument:
    - *
    - * - if the datum is not supported:
    - *
    - * - the bit will be cleared, and
    - *
    - * - the datum will be set to an appropriate fabricated value if one is
    - * available (eg. CIFS can take a default uid and gid), otherwise
    - *
    - * - the field will be cleared;
    - *
    - * - otherwise, if explicitly requested:
    - *
    - * - the datum will be synchronised to the server if AT_STATX_FORCE_SYNC is
    - * set or if the datum is considered out of date, and
    - *
    - * - the field will be filled in and the bit will be set;
    - *
    - * - otherwise, if not requested, but available in approximate form without any
    - * effort, it will be filled in anyway, and the bit will be set upon return
    - * (it might not be up to date, however, and no attempt will be made to
    - * synchronise the internal state first);
    - *
    - * - otherwise the field and the bit will be cleared before returning.
    - *
    - * Items in STATX_BASIC_STATS may be marked unavailable on return, but they
    - * will have values installed for compatibility purposes so that stat() and
    - * co. can be emulated in userspace.
    - */
    -struct statx {
    - /* 0x00 */
    - __u32 stx_mask; /* What results were written [uncond] */
    - __u32 stx_blksize; /* Preferred general I/O size [uncond] */
    - __u64 stx_attributes; /* Flags conveying information about the file [uncond] */
    - /* 0x10 */
    - __u32 stx_nlink; /* Number of hard links */
    - __u32 stx_uid; /* User ID of owner */
    - __u32 stx_gid; /* Group ID of owner */
    - __u16 stx_mode; /* File mode */
    - __u16 __spare0[1];
    - /* 0x20 */
    - __u64 stx_ino; /* Inode number */
    - __u64 stx_size; /* File size */
    - __u64 stx_blocks; /* Number of 512-byte blocks allocated */
    - __u64 __spare1[1];
    - /* 0x40 */
    - struct statx_timestamp stx_atime; /* Last access time */
    - struct statx_timestamp stx_btime; /* File creation time */
    - struct statx_timestamp stx_ctime; /* Last attribute change time */
    - struct statx_timestamp stx_mtime; /* Last data modification time */
    - /* 0x80 */
    - __u32 stx_rdev_major; /* Device ID of special file [if bdev/cdev] */
    - __u32 stx_rdev_minor;
    - __u32 stx_dev_major; /* ID of device containing file [uncond] */
    - __u32 stx_dev_minor;
    - /* 0x90 */
    - __u64 __spare2[14]; /* Spare space for future expansion */
    - /* 0x100 */
    -};
    -
    -/*
    - * Flags to be stx_mask
    - *
    - * Query request/result mask for statx() and struct statx::stx_mask.
    - *
    - * These bits should be set in the mask argument of statx() to request
    - * particular items when calling statx().
    - */
    -#define STATX_TYPE 0x00000001U /* Want/got stx_mode & S_IFMT */
    -#define STATX_MODE 0x00000002U /* Want/got stx_mode & ~S_IFMT */
    -#define STATX_NLINK 0x00000004U /* Want/got stx_nlink */
    -#define STATX_UID 0x00000008U /* Want/got stx_uid */
    -#define STATX_GID 0x00000010U /* Want/got stx_gid */
    -#define STATX_ATIME 0x00000020U /* Want/got stx_atime */
    -#define STATX_MTIME 0x00000040U /* Want/got stx_mtime */
    -#define STATX_CTIME 0x00000080U /* Want/got stx_ctime */
    -#define STATX_INO 0x00000100U /* Want/got stx_ino */
    -#define STATX_SIZE 0x00000200U /* Want/got stx_size */
    -#define STATX_BLOCKS 0x00000400U /* Want/got stx_blocks */
    -#define STATX_BASIC_STATS 0x000007ffU /* The stuff in the normal stat struct */
    -#define STATX_BTIME 0x00000800U /* Want/got stx_btime */
    -#define STATX_ALL 0x00000fffU /* All currently supported flags */
    -
    -/*
    - * Attributes to be found in stx_attributes
    - *
    - * These give information about the features or the state of a file that might
    - * be of use to ordinary userspace programs such as GUIs or ls rather than
    - * specialised tools.
    - *
    - * Note that the flags marked [I] correspond to generic FS_IOC_FLAGS
    - * semantically. Where possible, the numerical value is picked to correspond
    - * also.
    - */
    -#define STATX_ATTR_COMPRESSED 0x00000004 /* [I] File is compressed by the fs */
    -#define STATX_ATTR_IMMUTABLE 0x00000010 /* [I] File is marked immutable */
    -#define STATX_ATTR_APPEND 0x00000020 /* [I] File is append-only */
    -#define STATX_ATTR_NODUMP 0x00000040 /* [I] File is not to be dumped */
    -#define STATX_ATTR_ENCRYPTED 0x00000800 /* [I] File requires key to decrypt in fs */
    -
    -#define STATX_ATTR_AUTOMOUNT 0x00001000 /* Dir: Automount trigger */
    -

    #endif /* _UAPI_LINUX_STAT_H */
    --- a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
    +++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl
    @@ -335,6 +335,9 @@
    326 common copy_file_range sys_copy_file_range
    327 64 preadv2 sys_preadv2
    328 64 pwritev2 sys_pwritev2
    +329 common pkey_mprotect sys_pkey_mprotect
    +330 common pkey_alloc sys_pkey_alloc
    +331 common pkey_free sys_pkey_free

    #
    # x32-specific system call numbers start at 512 to avoid cache impact
    @@ -374,5 +377,5 @@
    543 x32 io_setup compat_sys_io_setup
    544 x32 io_submit compat_sys_io_submit
    545 x32 execveat compat_sys_execveat/ptregs
    -534 x32 preadv2 compat_sys_preadv2
    -535 x32 pwritev2 compat_sys_pwritev2
    +546 x32 preadv2 compat_sys_preadv64v2
    +547 x32 pwritev2 compat_sys_pwritev64v2

    \
     
     \ /
      Last update: 2018-06-04 09:00    [W:3.307 / U:0.724 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site