History

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull kvm fixes from Paolo Bonzini: "ARM: - Take care of faults occuring between the PARange and IPA range by injecting an exception - Fix S2 faults taken from a host EL0 in protected mode - Work around Oops caused by a PMU access from a 32bit guest when PMU has been created. This is a temporary bodge until we fix it for good. x86: - Fix potential races when walking host page table - Fix shadow page table leak when KVM runs nested - Work around bug in userspace when KVM synthesizes leaf 0x80000021 on older (pre-EPYC) or Intel processors Generic (but affects only RISC-V): - Fix bad user ABI for KVM_EXIT_SYSTEM_EVENT" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: x86: work around QEMU issue with synthetic CPUID leaves Revert "x86/mm: Introduce lookup_address_in_mm()" KVM: x86/mmu: fix potential races when walking host page table KVM: fix bad user ABI for KVM_EXIT_SYSTEM_EVENT KVM: x86/mmu: Do not create SPTEs for GFNs that exceed host.MAXPHYADDR KVM: arm64: Inject exception on out-of-IPA-range translation fault KVM/arm64: Don't emulate a PMU for 32-bit guests if feature not set KVM: arm64: Handle host stage-2 faults from 32-bit EL0

Linus Torvalds committed 4 years ago

Commit b6b26482 parents b2da7df f751d8e18 files · +214 −62Browse files

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

Unified · Split

include/uapi/linux/kvm.h+9−1
@@ -445,7 +445,13 @@ struct kvm_run { · 444 unmodified lines
445445 #define KVM_SYSTEM_EVENT_RESET 2
446446 #define KVM_SYSTEM_EVENT_CRASH 3
447447 __u32 type;
448− __u64 flags;
448+ __u32 ndata;
449+ union {
450+#ifndef __KERNEL__
451+ __u64 flags;
452+#endif
453+ __u64 data[16];
454+ };
449455 } system_event;
450456 /* KVM_EXIT_S390_STSI */
451457 struct {
@@ -1144,6 +1150,8 @@ struct kvm_ppc_resize_hpt { · 692 unmodified lines
11441150 #define KVM_CAP_S390_MEM_OP_EXTENSION 211
11451151 #define KVM_CAP_PMU_CAPABILITY 212
11461152 #define KVM_CAP_DISABLE_QUIRKS2 213
1153+/* #define KVM_CAP_VM_TSC_CONTROL 214 */
1154+#define KVM_CAP_SYSTEM_EVENT_DATA 215
11471155
11481156 #ifdef KVM_CAP_IRQ_ROUTING
11491157