Update Linux headers to 5.13-rc4
PATCH 1/1 Update Linux headers to 5.13-rc4
---KVM_RUN_X86_BUS_LOCK is a requirement for:
[PATCH v4] i386: Add ratelimit for bus locks acquired in guest
Message-Id: <[email protected]>
--- .../infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 35 - include/standard-headers/drm/drm_fourcc.h | 23 +- include/standard-headers/linux/ethtool.h | 109 ++- include/standard-headers/linux/fuse.h | 17 +- include/standard-headers/linux/input.h | 2 +- include/standard-headers/linux/virtio_ids.h | 2 + .../standard-headers/rdma/vmw_pvrdma-abi.h | 7 + linux-headers/asm-generic/unistd.h | 13 +- linux-headers/asm-mips/unistd_n32.h | 751 +++++++-------- linux-headers/asm-mips/unistd_n64.h | 703 +++++++------- linux-headers/asm-mips/unistd_o32.h | 843 ++++++++--------- linux-headers/asm-powerpc/kvm.h | 2 + linux-headers/asm-powerpc/unistd_32.h | 856 +++++++++--------- linux-headers/asm-powerpc/unistd_64.h | 800 ++++++++-------- linux-headers/asm-s390/unistd_32.h | 4 + linux-headers/asm-s390/unistd_64.h | 4 + linux-headers/asm-x86/kvm.h | 3 + linux-headers/asm-x86/unistd_32.h | 4 + linux-headers/asm-x86/unistd_64.h | 4 + linux-headers/asm-x86/unistd_x32.h | 4 + linux-headers/linux/kvm.h | 139 ++- linux-headers/linux/userfaultfd.h | 36 +- linux-headers/linux/vfio.h | 35 + 23 files changed, 2350 insertions(+), 2046 deletions(-)
include/standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h +0 -35
@@ -70,30 +70,6 @@ enum pvrdma_mtu { PVRDMA_MTU_4096 = 5, }; -static inline int pvrdma_mtu_enum_to_int (enum pvrdma_mtu mtu) -{ -switch (mtu) { -case PVRDMA_MTU_256 :return 256 ; -case PVRDMA_MTU_512 :return 512 ; -case PVRDMA_MTU_1024 :return 1024 ; -case PVRDMA_MTU_2048 :return 2048 ; -case PVRDMA_MTU_4096 :return 4096 ; -default :return -1 ; - } -} - -static inline enum pvrdma_mtu pvrdma_mtu_int_to_enum (int mtu) -{ -switch (mtu) { -case 256 :return PVRDMA_MTU_256 ; -case 512 :return PVRDMA_MTU_512 ; -case 1024 :return PVRDMA_MTU_1024 ; -case 2048 :return PVRDMA_MTU_2048 ; -case 4096 : -default :return PVRDMA_MTU_4096 ; - } -} -enum pvrdma_port_state {PVRDMA_PORT_NOP =0 ,PVRDMA_PORT_DOWN =1 ,
@@ -138,17 +114,6 @@ enum pvrdma_port_width { PVRDMA_WIDTH_12X = 8, }; -static inline int pvrdma_width_enum_to_int (enum pvrdma_port_width width) -{ -switch (width) { -case PVRDMA_WIDTH_1X :return 1 ; -case PVRDMA_WIDTH_4X :return 4 ; -case PVRDMA_WIDTH_8X :return 8 ; -case PVRDMA_WIDTH_12X :return 12 ; -default :return -1 ; - } -} -enum pvrdma_port_speed {PVRDMA_SPEED_SDR =1 ,PVRDMA_SPEED_DDR =2 ,
include/standard-headers/drm/drm_fourcc.h +21 -2
@@ -526,6 +526,25 @@ extern "C" {*/ #define I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS fourcc_mod_code(INTEL, 7) +/* +* Intel Color Control Surface with Clear Color (CCS) for Gen-12 render +* compression. +* +* The main surface is Y-tiled and is at plane index 0 whereas CCS is linear +* and at index 1. The clear color is stored at index 2, and the pitch should +* be ignored. The clear color structure is 256 bits. The first 128 bits +* represents Raw Clear Color Red, Green, Blue and Alpha color each represented +* by 32 bits. The raw clear color is consumed by the 3d engine and generates +* the converted clear color of size 64 bits. The first 32 bits store the Lower +* Converted Clear Color value and the next 32 bits store the Higher Converted +* Clear Color value when applicable. The Converted Clear Color values are +* consumed by the DE. The last 64 bits are used to store Color Discard Enable +* and Depth Clear Value Valid which are ignored by the DE. A CCS cache line +* corresponds to an area of 4x1 tiles in the main surface. The main surface +* pitch is required to be a multiple of 4 tile widths. +*/ +#define I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC fourcc_mod_code(INTEL, 8) +/* * Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks *
@@ -1035,9 +1054,9 @@ drm_fourcc_canonicalize_nvidia_format_mod(uint64_t modifier)* Not all combinations are valid, and different SoCs may support different * combinations of layout and options. */ -#define __fourcc_mod_amlogic_layout_mask 0xf +#define __fourcc_mod_amlogic_layout_mask 0xff#define __fourcc_mod_amlogic_options_shift 8 -#define __fourcc_mod_amlogic_options_mask 0xf +#define __fourcc_mod_amlogic_options_mask 0xff#define DRM_FORMAT_MOD_AMLOGIC_FBC (__layout, __options) \ fourcc_mod_code(AMLOGIC, \
include/standard-headers/linux/ethtool.h +77 -32
245 lines not on this page · raw message
include/standard-headers/linux/fuse.h +16 -1
@@ -179,6 +179,8 @@* 7.33 * - add FUSE_HANDLE_KILLPRIV_V2, FUSE_WRITE_KILL_SUIDGID, FATTR_KILL_SUIDGID * - add FUSE_OPEN_KILL_SUIDGID +* - extend fuse_setxattr_in, add FUSE_SETXATTR_EXT +* - add FUSE_SETXATTR_ACL_KILL_SGID */ #ifndef _LINUX_FUSE_H
@@ -326,6 +328,7 @@ struct fuse_file_lock {* does not have CAP_FSETID. Additionally upon * write/truncate sgid is killed only if file has group * execute permission. (Same as Linux VFS behavior). +* FUSE_SETXATTR_EXT: Server supports extended struct fuse_setxattr_in */ #define FUSE_ASYNC_READ (1 << 0)#define FUSE_POSIX_LOCKS (1 << 1)
@@ -356,6 +359,7 @@ struct fuse_file_lock {#define FUSE_MAP_ALIGNMENT (1 << 26)#define FUSE_SUBMOUNTS (1 << 27)#define FUSE_HANDLE_KILLPRIV_V2 (1 << 28) +#define FUSE_SETXATTR_EXT (1 << 29)/** * CUSE INIT request/reply flags
@@ -447,6 +451,12 @@ struct fuse_file_lock {*/ #define FUSE_OPEN_KILL_SUIDGID (1 << 0) +/** +* setxattr flags +* FUSE_SETXATTR_ACL_KILL_SGID: Clear SGID when system.posix_acl_access is set +*/ +#define FUSE_SETXATTR_ACL_KILL_SGID (1 << 0) +enum fuse_opcode {FUSE_LOOKUP =1 ,FUSE_FORGET =2 ,/* no reply */
@@ -677,9 +687,13 @@ struct fuse_fsync_in {uint32_t padding; }; +#define FUSE_COMPAT_SETXATTR_IN_SIZE 8 +struct fuse_setxattr_in {uint32_t size;uint32_t flags; +uint32_t setxattr_flags; +uint32_t padding; };struct fuse_getxattr_in {
@@ -899,7 +913,8 @@ struct fuse_notify_retrieve_in { };/* Device ioctls: */ -#define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t) +#define FUSE_DEV_IOC_MAGIC 229 +#define FUSE_DEV_IOC_CLONE _IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t)struct fuse_lseek_in {uint64_t fh;
include/standard-headers/linux/input.h +1 -1
@@ -81,7 +81,7 @@ struct input_id {* in units per radian. * When INPUT_PROP_ACCELEROMETER is set the resolution changes. * The main axes (ABS_X, ABS_Y, ABS_Z) are then reported in -* in units per g (units/g) and in units per degree per second +* units per g (units/g) and in units per degree per second * (units/deg/s) for rotational axes (ABS_RX, ABS_RY, ABS_RZ). */ struct input_absinfo {
include/standard-headers/linux/virtio_ids.h +2 -0
@@ -51,8 +51,10 @@#define VIRTIO_ID_PSTORE 22/* virtio pstore device */ #define VIRTIO_ID_IOMMU 23/* virtio IOMMU */ #define VIRTIO_ID_MEM 24/* virtio mem */ +#define VIRTIO_ID_SOUND 25/* virtio sound */ #define VIRTIO_ID_FS 26/* virtio filesystem */ #define VIRTIO_ID_PMEM 27/* virtio pmem */ +#define VIRTIO_ID_BT 28/* virtio bluetooth */ #define VIRTIO_ID_MAC80211_HWSIM 29/* virtio mac80211-hwsim */ #endif /* _LINUX_VIRTIO_IDS_H */
include/standard-headers/rdma/vmw_pvrdma-abi.h +7 -0
@@ -133,6 +133,13 @@ enum pvrdma_wc_flags { PVRDMA_WC_FLAGS_MAX = PVRDMA_WC_WITH_NETWORK_HDR_TYPE, }; +enum pvrdma_network_type { +PVRDMA_NETWORK_IB , +PVRDMA_NETWORK_ROCE_V1 =PVRDMA_NETWORK_IB , +PVRDMA_NETWORK_IPV4 , +PVRDMA_NETWORK_IPV6 +}; +struct pvrdma_alloc_ucontext_resp {uint32_t qp_tab_size;uint32_t reserved;
linux-headers/asm-generic/unistd.h +12 -1
@@ -861,9 +861,20 @@ __SYSCALL(__NR_faccessat2, sys_faccessat2) __SYSCALL(__NR_process_madvise, sys_process_madvise)#define __NR_epoll_pwait2 441 __SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2) +#define __NR_mount_setattr 442 +__SYSCALL(__NR_mount_setattr, sys_mount_setattr) +#define __NR_quotactl_path 443 +__SYSCALL(__NR_quotactl_path, sys_quotactl_path) + +#define __NR_landlock_create_ruleset 444 +__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset) +#define __NR_landlock_add_rule 445 +__SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule) +#define __NR_landlock_restrict_self 446 +__SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self)#undef __NR_syscalls -#define __NR_syscalls 442 +#define __NR_syscalls 447/* * 32 bit systems traditionally used different
linux-headers/asm-mips/unistd_n32.h +377 -374
753 lines not on this page · raw message
linux-headers/asm-mips/unistd_n64.h +353 -350
705 lines not on this page · raw message
linux-headers/asm-mips/unistd_o32.h +423 -420
845 lines not on this page · raw message
linux-headers/asm-powerpc/kvm.h +2 -0
@@ -644,6 +644,8 @@ struct kvm_ppc_cpu_char {#define KVM_REG_PPC_MMCR3 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc1)#define KVM_REG_PPC_SIER2 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc2)#define KVM_REG_PPC_SIER3 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc3) +#define KVM_REG_PPC_DAWR1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc4) +#define KVM_REG_PPC_DAWRX1 (KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc5)/* Transactional Memory checkpointed state: * This is all GPRs, all VSX regs and a subset of SPRs
linux-headers/asm-powerpc/unistd_32.h +430 -426
253 lines not on this page · raw message
linux-headers/asm-powerpc/unistd_64.h +402 -398
800 lines not on this page · raw message
linux-headers/linux/kvm.h +137 -2
139 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.30.2
Part of the diff is not shown here. View the raw message.
Quoted 5 lines · Eduardo Habkost
Signed-off-by Eduardo Habkost <[email protected]>---
KVM_RUN_X86_BUS_LOCKis a requirement for:
[PATCH v4] i386: Add ratelimit for bus locks acquired in guest
Message-Id: <[email protected]>
I forgot to git-add the new virtio_bt.h and virtio_snd.h files, and this now conflicts with commit 3ea1a80243d5 ("target/i386/sev: add support to query the attestation report"). I will send v2.
Signature · 1 line
Eduardo