History

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

Pull KVM updates from Paolo Bonzini: "ARM: - support for chained PMU counters in guests - improved SError handling - handle Neoverse N1 erratum #1349291 - allow side-channel mitigation status to be migrated - standardise most AArch64 system register accesses to msr_s/mrs_s - fix host MPIDR corruption on 32bit - selftests ckleanups x86: - PMU event {white,black}listing - ability for the guest to disable host-side interrupt polling - fixes for enlightened VMCS (Hyper-V pv nested virtualization), - new hypercall to yield to IPI target - support for passing cstate MSRs through to the guest - lots of cleanups and optimizations Generic: - Some txt->rST conversions for the documentation" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (128 commits) Documentation: virtual: Add toctree hooks Documentation: kvm: Convert cpuid.txt to .rst Documentation: virtual: Convert paravirt_ops.txt to .rst KVM: x86: Unconditionally enable irqs in guest context KVM: x86: PMU Event Filter kvm: x86: Fix -Wmissing-prototypes warnings KVM: Properly check if "page" is valid in kvm_vcpu_unmap KVM: arm/arm64: Initialise host's MPIDRs by reading the actual register KVM: LAPIC: Retry tune per-vCPU timer_advance_ns if adaptive tuning goes insane kvm: LAPIC: write down valid APIC registers KVM: arm64: Migrate _elx sysreg accessors to msr_s/mrs_s KVM: doc: Add API documentation on the KVM_REG_ARM_WORKAROUNDS register KVM: arm/arm64: Add save/restore support for firmware workaround state arm64: KVM: Propagate full Spectre v2 workaround state to KVM guests KVM: arm/arm64: Support chained PMU counters KVM: arm/arm64: Remove pmc->bitmask KVM: arm/arm64: Re-create event when setting counter value KVM: arm/arm64: Extract duplicated code to own function KVM: arm/arm64: Rename kvm_pmu_{enable/disable}_counter functions KVM: LAPIC: ARBPRI is a reserved register for x2APIC ...

Linus Torvalds committed 7 years ago

Commit 39d75302 parents 16c9765 a45ff5992 files · +2693 −1432Browse files

Showing the changes to include/uapi/linux (2 of 92 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/kvm.h +6 −1
  2. include/uapi/linux/kvm_para.h +1 −0
include/uapi/linux/kvm.h+6−1
@@ -696,9 +696,11 @@ struct kvm_ioeventfd { · 695 unmodified lines
696696 #define KVM_X86_DISABLE_EXITS_MWAIT (1 << 0)
697697 #define KVM_X86_DISABLE_EXITS_HLT (1 << 1)
698698 #define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2)
699+#define KVM_X86_DISABLE_EXITS_CSTATE (1 << 3)
699700 #define KVM_X86_DISABLE_VALID_EXITS (KVM_X86_DISABLE_EXITS_MWAIT | \
700701 KVM_X86_DISABLE_EXITS_HLT | \
701− KVM_X86_DISABLE_EXITS_PAUSE)
702+ KVM_X86_DISABLE_EXITS_PAUSE | \
703+ KVM_X86_DISABLE_EXITS_CSTATE)
702704
703705 /* for KVM_ENABLE_CAP */
704706 struct kvm_enable_cap {
@@ -993,6 +995,7 @@ struct kvm_ppc_resize_hpt { · 288 unmodified lines
993995 #define KVM_CAP_ARM_SVE 170
994996 #define KVM_CAP_ARM_PTRAUTH_ADDRESS 171
995997 #define KVM_CAP_ARM_PTRAUTH_GENERIC 172
998+#define KVM_CAP_PMU_EVENT_FILTER 173
996999
9971000 #ifdef KVM_CAP_IRQ_ROUTING
9981001
@@ -1327,6 +1330,8 @@ struct kvm_s390_ucas_mapping { · 328 unmodified lines
13271330 #define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)
13281331 /* Available with KVM_CAP_PPC_GET_CPU_CHAR */
13291332 #define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)
1333+/* Available with KVM_CAP_PMU_EVENT_FILTER */
1334+#define KVM_SET_PMU_EVENT_FILTER _IOW(KVMIO, 0xb2, struct kvm_pmu_event_filter)
13301335
13311336 /* ioctl for vm fd */
13321337 #define KVM_CREATE_DEVICE _IOWR(KVMIO, 0xe0, struct kvm_create_device)
include/uapi/linux/kvm_para.h+1−0
@@ -28,6 +28,7 @@ · 27 unmodified lines
2828 #define KVM_HC_MIPS_CONSOLE_OUTPUT 8
2929 #define KVM_HC_CLOCK_PAIRING 9
3030 #define KVM_HC_SEND_IPI 10
31+#define KVM_HC_SCHED_YIELD 11
3132
3233 /*
3334 * hypercalls use architecture specific