History

tools headers UAPI: Sync kvm.h headers with the kernel sources

dd53f6102c30 ("Merge tag 'kvmarm-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD") 59c5c58c5b93 ("Merge tag 'kvm-ppc-next-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD") d7547c55cbe7 ("KVM: Introduce KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2") 6520ca64cde7 ("KVM: PPC: Book3S HV: XIVE: Add a mapping for the source ESB pages") 39e9af3de5ca ("KVM: PPC: Book3S HV: XIVE: Add a TIMA mapping") e4945b9da52b ("KVM: PPC: Book3S HV: XIVE: Add get/set accessors for the VP XIVE state") e6714bd1671d ("KVM: PPC: Book3S HV: XIVE: Add a control to dirty the XIVE EQ pages") 7b46b6169ab8 ("KVM: PPC: Book3S HV: XIVE: Add a control to sync the sources") 5ca806474859 ("KVM: PPC: Book3S HV: XIVE: Add a global reset control") 13ce3297c576 ("KVM: PPC: Book3S HV: XIVE: Add controls for the EQ configuration") e8676ce50e22 ("KVM: PPC: Book3S HV: XIVE: Add a control to configure a source") 4131f83c3d64 ("KVM: PPC: Book3S HV: XIVE: add a control to initialize a source") eacc56bb9de3 ("KVM: PPC: Book3S HV: XIVE: Introduce a new capability KVM_CAP_PPC_IRQ_XIVE") 90c73795afa2 ("KVM: PPC: Book3S HV: Add a new KVM device for the XIVE native exploitation mode") 4f45b90e1c03 ("KVM: s390: add deflate conversion facilty to cpu model") a243c16d18be ("KVM: arm64: Add capability to advertise ptrauth for guest") a22fa321d13b ("KVM: arm64: Add userspace flag to enable pointer authentication") 4bd774e57b29 ("KVM: arm64/sve: Simplify KVM_REG_ARM64_SVE_VLS array sizing") 8ae6efdde451 ("KVM: arm64/sve: Clean up UAPI register ID definitions") 173aec2d5a9f ("KVM: s390: add enhanced sort facilty to cpu model") 555f3d03e7fb ("KVM: arm64: Add a capability to advertise SVE support") 9033bba4b535 ("KVM: arm64/sve: Add pseudo-register for the guest's vector lengths") 7dd32a0d0103 ("KVM: arm/arm64: Add KVM_ARM_VCPU_FINALIZE ioctl") e1c9c98345b3 ("KVM: arm64/sve: Add SVE support to register access ioctl interface") 2b953ea34812 ("KVM: Allow 2048-bit register access via ioctl interface") None entails changes in tooling, the closest to that were some new arch specific ioctls, that are still not handled by the tools/perf/trace/beauty/ library, that needs to create per-arch tables to convert ioctl cmd->string (and back). From a quick look the arch specific kvm-stat.c files at: $ ls -1 tools/perf/arch/*/util/kvm-stat.c tools/perf/arch/powerpc/util/kvm-stat.c tools/perf/arch/s390/util/kvm-stat.c tools/perf/arch/x86/util/kvm-stat.c $ Are not affected. This silences these perf building warnings: Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from latest version at 'include/uapi/linux/kvm.h' diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h Warning: Kernel ABI header at 'tools/arch/powerpc/include/uapi/asm/kvm.h' differs from latest version at 'arch/powerpc/include/uapi/asm/kvm.h' diff -u tools/arch/powerpc/include/uapi/asm/kvm.h arch/powerpc/include/uapi/asm/kvm.h Warning: Kernel ABI header at 'tools/arch/s390/include/uapi/asm/kvm.h' differs from latest version at 'arch/s390/include/uapi/asm/kvm.h' diff -u tools/arch/s390/include/uapi/asm/kvm.h arch/s390/include/uapi/asm/kvm.h Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm64/include/uapi/asm/kvm.h' diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi/asm/kvm.h

Arnaldo Carvalho de Melo committed 7 years ago

Commit a7350991 parent 67380284 files · +105 −3Browse files

Showing the changes to tools/include/uapi/linux (1 of 4 files). Show all

Unified · Split

tools/include/uapi/linux/kvm.h+13−2
@@ -986,8 +986,13 @@ struct kvm_ppc_resize_hpt { · 985 unmodified lines
986986 #define KVM_CAP_HYPERV_ENLIGHTENED_VMCS 163
987987 #define KVM_CAP_EXCEPTION_PAYLOAD 164
988988 #define KVM_CAP_ARM_VM_IPA_SIZE 165
989−#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166
989+#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166 /* Obsolete */
990990 #define KVM_CAP_HYPERV_CPUID 167
991+#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 168
992+#define KVM_CAP_PPC_IRQ_XIVE 169
993+#define KVM_CAP_ARM_SVE 170
994+#define KVM_CAP_ARM_PTRAUTH_ADDRESS 171
995+#define KVM_CAP_ARM_PTRAUTH_GENERIC 172
991996
992997 #ifdef KVM_CAP_IRQ_ROUTING
993998
@@ -1145,6 +1150,7 @@ struct kvm_dirty_tlb { · 151 unmodified lines
11451150 #define KVM_REG_SIZE_U256 0x0050000000000000ULL
11461151 #define KVM_REG_SIZE_U512 0x0060000000000000ULL
11471152 #define KVM_REG_SIZE_U1024 0x0070000000000000ULL
1153+#define KVM_REG_SIZE_U2048 0x0080000000000000ULL
11481154
11491155 struct kvm_reg_list {
11501156 __u64 n; /* number of regs */
@@ -1211,6 +1217,8 @@ enum kvm_device_type { · 60 unmodified lines
12111217 #define KVM_DEV_TYPE_ARM_VGIC_V3 KVM_DEV_TYPE_ARM_VGIC_V3
12121218 KVM_DEV_TYPE_ARM_VGIC_ITS,
12131219 #define KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_ARM_VGIC_ITS
1220+ KVM_DEV_TYPE_XIVE,
1221+#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE
12141222 KVM_DEV_TYPE_MAX,
12151223 };
12161224
@@ -1434,12 +1442,15 @@ struct kvm_enc_region { · 217 unmodified lines
14341442 #define KVM_GET_NESTED_STATE _IOWR(KVMIO, 0xbe, struct kvm_nested_state)
14351443 #define KVM_SET_NESTED_STATE _IOW(KVMIO, 0xbf, struct kvm_nested_state)
14361444
1437−/* Available with KVM_CAP_MANUAL_DIRTY_LOG_PROTECT */
1445+/* Available with KVM_CAP_MANUAL_DIRTY_LOG_PROTECT_2 */
14381446 #define KVM_CLEAR_DIRTY_LOG _IOWR(KVMIO, 0xc0, struct kvm_clear_dirty_log)
14391447
14401448 /* Available with KVM_CAP_HYPERV_CPUID */
14411449 #define KVM_GET_SUPPORTED_HV_CPUID _IOWR(KVMIO, 0xc1, struct kvm_cpuid2)
14421450
1451+/* Available with KVM_CAP_ARM_SVE */
1452+#define KVM_ARM_VCPU_FINALIZE _IOW(KVMIO, 0xc2, int)
1453+
14431454 /* Secure Encrypted Virtualization command */
14441455 enum sev_cmd_id {
14451456 /* Guest initialization commands */