Pull KVM fixes from Radim Krčmář: "ARM: - Fix handling of the 32bit cycle counter - Fix cycle counter filtering x86: - Fix a race leading to double unregistering of user notifiers - Amend oversight in kvm_arch_set_irq that turned Hyper-V code dead - Use SRCU around kvm_lapic_set_vapic_addr - Avoid recursive flushing of asynchronous page faults - Do not rely on deferred update in KVM_GET_CLOCK, which fixes #GP - Let userspace know that KVM_GET_CLOCK is useful with master clock; 4.9 changed the return value to better match the guest clock, but didn't provide means to let guests take advantage of it" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: kvm: x86: merge kvm_arch_set_irq and kvm_arch_set_irq_inatomic KVM: x86: fix missed SRCU usage in kvm_lapic_set_vapic_addr KVM: async_pf: avoid recursive flushing of work items kvm: kvmclock: let KVM_GET_CLOCK return whether the master clock is in use KVM: Disable irq while unregistering user notifier KVM: x86: do not go through vcpu in __get_kvmclock_ns KVM: arm64: Fix the issues when guest PMCCFILTR is configured arm64: KVM: pmu: Fix AArch32 cycle counter access
Showing the changes to include/uapi/linux (1 of 9 files). Show all
Unified · Split
| @@ -972,12 +972,19 @@ struct kvm_irqfd { · 971 unmodified lines | ||
| 972 | 972 | __u8 pad[16]; |
| 973 | 973 | }; |
| 974 | 974 | |
| 975 | +/* For KVM_CAP_ADJUST_CLOCK */ | |
| 976 | + | |
| 977 | +/* Do not use 1, KVM_CHECK_EXTENSION returned it before we had flags. */ | |
| 978 | +#define KVM_CLOCK_TSC_STABLE 2 | |
| 979 | + | |
| 975 | 980 | struct kvm_clock_data { |
| 976 | 981 | __u64 clock; |
| 977 | 982 | __u32 flags; |
| 978 | 983 | __u32 pad[9]; |
| 979 | 984 | }; |
| 980 | 985 | |
| 986 | +/* For KVM_CAP_SW_TLB */ | |
| 987 | + | |
| 981 | 988 | #define KVM_MMU_FSL_BOOKE_NOHV 0 |
| 982 | 989 | #define KVM_MMU_FSL_BOOKE_HV 1 |
| 983 | 990 | |