History

Merge tag 'kvmarm-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm updates for Linux 5.5: - Allow non-ISV data aborts to be reported to userspace - Allow injection of data aborts from userspace - Expose stolen time to guests - GICv4 performance improvements - vgic ITS emulation fixes - Simplify FWB handling - Enable halt pool counters - Make the emulated timer PREEMPT_RT compliant

Paolo Bonzini committed 6 years ago

Commit 14edff82 parents 992edea cd7056a55 files · +1016 −276Browse files

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

Unified · Split

include/uapi/linux/kvm.h+10−0
@@ -235,6 +235,7 @@ struct kvm_hyperv_exit { · 234 unmodified lines
235235 #define KVM_EXIT_S390_STSI 25
236236 #define KVM_EXIT_IOAPIC_EOI 26
237237 #define KVM_EXIT_HYPERV 27
238+#define KVM_EXIT_ARM_NISV 28
238239
239240 /* For KVM_EXIT_INTERNAL_ERROR */
240241 /* Emulate instruction failed. */
@@ -394,6 +395,11 @@ struct kvm_run { · 153 unmodified lines
394395 } eoi;
395396 /* KVM_EXIT_HYPERV */
396397 struct kvm_hyperv_exit hyperv;
398+ /* KVM_EXIT_ARM_NISV */
399+ struct {
400+ __u64 esr_iss;
401+ __u64 fault_ipa;
402+ } arm_nisv;
397403 /* Fix the size of the union. */
398404 char padding[256];
399405 };
@@ -1001,6 +1007,8 @@ struct kvm_ppc_resize_hpt { · 601 unmodified lines
10011007 #define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174
10021008 #define KVM_CAP_HYPERV_DIRECT_TLBFLUSH 175
10031009 #define KVM_CAP_PPC_GUEST_DEBUG_SSTEP 176
1010+#define KVM_CAP_ARM_NISV_TO_USER 177
1011+#define KVM_CAP_ARM_INJECT_EXT_DABT 178
10041012
10051013 #ifdef KVM_CAP_IRQ_ROUTING
10061014
@@ -1228,6 +1236,8 @@ enum kvm_device_type { · 221 unmodified lines
12281236 #define KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_ARM_VGIC_ITS
12291237 KVM_DEV_TYPE_XIVE,
12301238 #define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE
1239+ KVM_DEV_TYPE_ARM_PV_TIME,
1240+#define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME
12311241 KVM_DEV_TYPE_MAX,
12321242 };
12331243