History

tools headers: Sync KVM headers with the kernel sources

To pick up the changes in: 103ff3a50e3a50a9 ("KVM: s390: Add capability to support 2G hugepages") 229132c309d667bb ("LoongArch: KVM: Add DMSINTC device support") 2619da73bb2f10d8 ("KVM: x86: Use __DECLARE_FLEX_ARRAY() for UAPI structures with VLAs") 4aebd7d5c72f805e ("KVM: s390: Add KVM capability for ESA mode guests") 4f256d5770febb9d ("KVM: x86: nSVM: Save/restore gPAT with KVM_{GET,SET}_NESTED_STATE") 822790ab01495d67 ("KVM: x86: Define KVM_X86_QUIRK_NESTED_SVM_SHARED_PAT") 8800dbf6614aad10 ("KVM: arm64: Allow userspace to create protected VMs when pKVM is enabled") bf8f3cec939db68e ("KVM: s390: vsie: Refactor handle_stfle") c547c51ff4d44c78 ("KVM: arm64: gic-v5: Add ARM_VGIC_V5 device to KVM headers") d7507a94a0720223 ("KVM: SVM: Treat exit_code as an unsigned 64-bit value through all of KVM") This addresses these perf build warnings: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h diff -u tools/arch/x86/include/uapi/asm/kvm.h arch/x86/include/uapi/asm/kvm.h diff -u tools/arch/x86/include/uapi/asm/svm.h arch/x86/include/uapi/asm/svm.h diff -u tools/arch/s390/include/uapi/asm/kvm.h arch/s390/include/uapi/asm/kvm.h Please see tools/include/uapi/README for further details.

Arnaldo Carvalho de Melo committed 4 months ago

Commit fac520e1 parent 42bfbb34 files · +40 −27Browse files

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

Unified · Split

tools/include/uapi/linux/kvm.h+15−5
@@ -11,6 +11,7 @@ · 10 unmodified lines
1111 #include <linux/const.h>
1212 #include <linux/types.h>
1313 #include <linux/compiler.h>
14+#include <linux/stddef.h>
1415 #include <linux/ioctl.h>
1516 #include <asm/kvm.h>
1617
@@ -542,7 +543,7 @@ struct kvm_coalesced_mmio { · 525 unmodified lines
542543
543544 struct kvm_coalesced_mmio_ring {
544545 __u32 first, last;
545− struct kvm_coalesced_mmio coalesced_mmio[];
546+ __DECLARE_FLEX_ARRAY(struct kvm_coalesced_mmio, coalesced_mmio);
546547 };
547548
548549 #define KVM_COALESCED_MMIO_MAX \
@@ -592,7 +593,7 @@ struct kvm_clear_dirty_log { · 43 unmodified lines
592593 /* for KVM_SET_SIGNAL_MASK */
593594 struct kvm_signal_mask {
594595 __u32 len;
595− __u8 sigset[];
596+ __DECLARE_FLEX_ARRAY(__u8, sigset);
596597 };
597598
598599 /* for KVM_TPR_ACCESS_REPORTING */
@@ -703,6 +704,11 @@ struct kvm_enable_cap { · 104 unmodified lines
703704 #define KVM_VM_TYPE_ARM_IPA_SIZE_MASK 0xffULL
704705 #define KVM_VM_TYPE_ARM_IPA_SIZE(x) \
705706 ((x) & KVM_VM_TYPE_ARM_IPA_SIZE_MASK)
707+
708+#define KVM_VM_TYPE_ARM_PROTECTED (1UL << 31)
709+#define KVM_VM_TYPE_ARM_MASK (KVM_VM_TYPE_ARM_IPA_SIZE_MASK | \
710+ KVM_VM_TYPE_ARM_PROTECTED)
711+
706712 /*
707713 * ioctls for /dev/kvm fds:
708714 */
@@ -989,6 +995,8 @@ struct kvm_enable_cap { · 280 unmodified lines
989995 #define KVM_CAP_ARM_SEA_TO_USER 245
990996 #define KVM_CAP_S390_USER_OPEREXEC 246
991997 #define KVM_CAP_S390_KEYOP 247
998+#define KVM_CAP_S390_VSIE_ESAMODE 248
999+#define KVM_CAP_S390_HPAGE_2G 249
9921000
9931001 struct kvm_irq_routing_irqchip {
9941002 __u32 irqchip;
@@ -1051,7 +1059,7 @@ struct kvm_irq_routing_entry { · 56 unmodified lines
10511059 struct kvm_irq_routing {
10521060 __u32 nr;
10531061 __u32 flags;
1054− struct kvm_irq_routing_entry entries[];
1062+ __DECLARE_FLEX_ARRAY(struct kvm_irq_routing_entry, entries);
10551063 };
10561064
10571065 #define KVM_IRQFD_FLAG_DEASSIGN (1 << 0)
@@ -1142,7 +1150,7 @@ struct kvm_dirty_tlb { · 84 unmodified lines
11421150
11431151 struct kvm_reg_list {
11441152 __u64 n; /* number of regs */
1145− __u64 reg[];
1153+ __DECLARE_FLEX_ARRAY(__u64, reg);
11461154 };
11471155
11481156 struct kvm_one_reg {
@@ -1224,6 +1232,8 @@ enum kvm_device_type { · 75 unmodified lines
12241232 #define KVM_DEV_TYPE_LOONGARCH_EIOINTC KVM_DEV_TYPE_LOONGARCH_EIOINTC
12251233 KVM_DEV_TYPE_LOONGARCH_PCHPIC,
12261234 #define KVM_DEV_TYPE_LOONGARCH_PCHPIC KVM_DEV_TYPE_LOONGARCH_PCHPIC
1235+ KVM_DEV_TYPE_LOONGARCH_DMSINTC,
1236+#define KVM_DEV_TYPE_LOONGARCH_DMSINTC KVM_DEV_TYPE_LOONGARCH_DMSINTC
12271237 KVM_DEV_TYPE_ARM_VGIC_V5,
12281238 #define KVM_DEV_TYPE_ARM_VGIC_V5 KVM_DEV_TYPE_ARM_VGIC_V5
12291239
@@ -1610,7 +1620,7 @@ struct kvm_stats_desc { · 380 unmodified lines
16101620 #ifdef __KERNEL__
16111621 char name[KVM_STATS_NAME_SIZE];
16121622 #else
1613− char name[];
1623+ __DECLARE_FLEX_ARRAY(char, name);
16141624 #endif
16151625 };
16161626

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t