Seeing these warnings. 'diff' tells me that the files are in fact significantly different.
Warning: Kernel ABI header at 'tools/include/uapi/linux/kvm.h' differs from
latest version at 'include/uapi/linux/kvm.h'
Warning: Kernel ABI header at 'tools/include/uapi/linux/prctl.h' differs from
latest version at 'include/uapi/linux/prctl.h'
Warning: Kernel ABI header at 'tools/include/uapi/sound/asound.h' differs from
latest version at 'include/uapi/sound/asound.h'
Warning: Kernel ABI header at 'tools/arch/x86/include/asm/required-features.h'
differs from latest version at 'arch/x86/include/asm/required-features.h'
Warning: Kernel ABI header at 'tools/arch/x86/include/uapi/asm/kvm.h' differs
from latest version at 'arch/x86/include/uapi/asm/kvm.h'
Warning: Kernel ABI header at 'tools/arch/arm/include/uapi/asm/kvm.h' differs
from latest version at 'arch/arm/include/uapi/asm/kvm.h'
Warning: Kernel ABI header at 'tools/include/uapi/asm-generic/mman-common.h'
differs from latest version at 'include/uapi/asm-generic/mman-common.h'
Warning: Kernel ABI header at 'tools/include/uapi/linux/bpf.h' differs from
latest version at 'include/uapi/linux/bpf.h'
Warning: Kernel ABI header at 'tools/include/uapi/linux/if_link.h' differs from
latest version at 'include/uapi/linux/if_link.h'
I even tried removing the tools/include versions and then doing a git
reset--hard,
and the issue persists. Looking at kvm.h, it appears at least two commits hit
the include/uapi version and failed to be applied to the tools/include/uapi
copy.
Running 'diff' on the first:
diff -u 'tools/include/uapi/linux/kvm.h' 'include/uapi/linux/kvm.h'
--- tools/include/uapi/linux/kvm.h 2018-04-23 01:40:20.259290792 -0400
+++ include/uapi/linux/kvm.h 2018-04-16 18:41:38.735881690 -0400
@@ -396,6 +396,10 @@
char padding[256];
};
+ /* 2048 is the size of the char array used to bound/pad the size
+ * of the union that holds sync regs.
+ */
+ #define SYNC_REGS_SIZE_BYTES 2048
/*
* shared registers between kvm and userspace.
* kvm_valid_regs specifies the register classes set by the host
@@ -407,7 +411,7 @@
__u64 kvm_dirty_regs;
union {
struct kvm_sync_regs regs;
- char padding[2048];
+ char padding[SYNC_REGS_SIZE_BYTES];
} s;
};
@@ -936,6 +940,7 @@
#define KVM_CAP_PPC_GET_CPU_CHAR 151
#define KVM_CAP_S390_BPB 152
#define KVM_CAP_GET_MSR_FEATURES 153
+#define KVM_CAP_HYPERV_EVENTFD 154
#ifdef KVM_CAP_IRQ_ROUTING
@@ -1375,6 +1380,10 @@
#define KVM_MEMORY_ENCRYPT_REG_REGION _IOR(KVMIO, 0xbb, struct
kvm_enc_region)
#define KVM_MEMORY_ENCRYPT_UNREG_REGION _IOR(KVMIO, 0xbc, struct
kvm_enc_region)
+/* Available with KVM_CAP_HYPERV_EVENTFD */
+#define KVM_HYPERV_EVENTFD _IOW(KVMIO, 0xbd, struct kvm_hyperv_eventfd)
+
+
/* Secure Encrypted Virtualization command */
enum sev_cmd_id {
/* Guest initialization commands */
@@ -1515,4 +1524,14 @@
#define KVM_ARM_DEV_EL1_PTIMER (1 << 1)
#define KVM_ARM_DEV_PMU (1 << 2)
+struct kvm_hyperv_eventfd {
+ __u32 conn_id;
+ __s32 fd;
+ __u32 flags;
+ __u32 padding[3];
+};
+
+#define KVM_HYPERV_CONN_ID_MASK 0x00ffffff
+#define KVM_HYPERV_EVENTFD_DEASSIGN (1 << 0)
+
#endif /* __LINUX_KVM_H */
pgpg7FPeR91Q8.pgp
Description: PGP signature
