KVM: PPC: Book3S HV: add a new KVM device for the XIVE native exploitation mode
Subsystems (3)
RFC PATCH 5/16 KVM: PPC: Book3S HV: add a new KVM device for the XIVE native exploitation mode
This is the basic framework for the new KVM device supporting the XIVE native exploitation mode. The user interface exposes a new capability and a new KVM device defines to be used by QEMU.
Internally, the interface to the new KVM device is protected with a new interrupt mode: KVMPPC_IRQ_XIVE.
Signed-off-by Cédric Le Goater <[email protected]>
--- arch/powerpc/include/asm/kvm_host.h | 2 + arch/powerpc/include/asm/kvm_ppc.h | 21 +++ arch/powerpc/kvm/Makefile | 2 +- arch/powerpc/kvm/book3s.c | 7 +- arch/powerpc/kvm/book3s_xive.h | 3 + arch/powerpc/kvm/book3s_xive_native.c | 338 ++++++++++++++++++++++++++++++++++ arch/powerpc/kvm/powerpc.c | 30 +++ include/uapi/linux/kvm.h | 3 + 8 files changed, 404 insertions(+), 2 deletions(-) create mode 100644 arch/powerpc/kvm/book3s_xive_native.c
arch/powerpc/include/asm/kvm_host.h +2 -0
@@ -211,6 +211,7 @@ extern struct kvm_device_ops kvm_xics_ops;struct kvmppc_xive ;struct kvmppc_xive_vcpu ;extern struct kvm_device_ops kvm_xive_ops; +extern struct kvm_device_ops kvm_xive_native_ops;struct kvmppc_passthru_irqmap ;
@@ -431,6 +432,7 @@ struct kvmppc_passthru_irqmap {#define KVMPPC_IRQ_DEFAULT 0#define KVMPPC_IRQ_MPIC 1#define KVMPPC_IRQ_XICS 2/* Includes a XIVE option */ +#define KVMPPC_IRQ_XIVE 3/* XIVE native exploitation mode */ #define MMIO_HPTE_CACHE_SIZE 4
arch/powerpc/include/asm/kvm_ppc.h +21 -0
@@ -582,6 +582,18 @@ extern int kvmppc_xive_set_icp(struct kvm_vcpu *vcpu, u64 icpval);extern int kvmppc_xive_set_irq (struct kvm *kvm,int irq_source_id,u32 irq,int level,bool line_status); + +static inline int kvmppc_xive_enabled (struct kvm_vcpu *vcpu) +{ +return vcpu->arch.irq_type =KVMPPC_IRQ_XIVE ; +} + +extern int kvmppc_xive_native_connect_vcpu (struct kvm_device *dev, +struct kvm_vcpu *vcpu,u32 cpu); +extern int kvmppc_xive_native_cleanup_vcpu (struct kvm_vcpu *vcpu); +extern void kvmppc_xive_native_init_module (void ); +extern void kvmppc_xive_native_exit_module (void ); +#else static inline int kvmppc_xive_set_xive (struct kvm *kvm,u32 irq,u32 server,u32 priority) {return -1 ; }
@@ -604,6 +616,15 @@ static inline int kvmppc_xive_set_icp(struct kvm_vcpu *vcpu, u64 icpval) { returstatic inline int kvmppc_xive_set_irq (struct kvm *kvm,int irq_source_id,u32 irq,int level,bool line_status) {return -ENODEV ; } + +static inline int kvmppc_xive_enabled (struct kvm_vcpu *vcpu) + {return 0 ; } +static inline int kvmppc_xive_native_connect_vcpu (struct kvm_device *dev, + struct kvm_vcpu *vcpu, u32 cpu) { return -EBUSY} +static inline int kvmppc_xive_native_cleanup_vcpu (struct kvm_vcpu *vcpu) {return 0 ; } +static inline void kvmppc_xive_native_init_module (void ) { } +static inline void kvmppc_xive_native_exit_module (void ) { } +#endif /* CONFIG_KVM_XIVE */ /*
arch/powerpc/kvm/Makefile +1 -1
@@ -90,7 +90,7 @@ endif kvm-book3s_64-objs-$(CONFIG_KVM_XICS) += \ book3s_xics.o -kvm-book3s_64-objs-$(CONFIG_KVM_XIVE) += book3s_xive.o +kvm-book3s_64-objs-$(CONFIG_KVM_XIVE) += book3s_xive.o book3s_xive_native.o kvm-book3s_64-objs-$(CONFIG_SPAPR_TCE_IOMMU) += book3s_64_vio.o kvm-book3s_64-module-objs := \
arch/powerpc/kvm/book3s.c +6 -1
@@ -1021,7 +1021,10 @@ static int kvmppc_book3s_init(void)#ifdef CONFIG_KVM_XIVE if (xive_enabled ()) {kvmppc_xive_init_module (); +kvmppc_xive_native_init_module ();kvm_register_device_ops (&kvm_xive_ops,KVM_DEV_TYPE_XICS ); +kvm_register_device_ops (&kvm_xive_native_ops, +KVM_DEV_TYPE_XIVE ); } else#endif kvm_register_device_ops (&kvm_xics_ops,KVM_DEV_TYPE_XICS );
@@ -1032,8 +1035,10 @@ static int kvmppc_book3s_init(void)static void kvmppc_book3s_exit (void ) {#ifdef CONFIG_KVM_XICS -if (xive_enabled ()) +if (xive_enabled ()) {kvmppc_xive_exit_module (); +kvmppc_xive_native_exit_module (); + }#endif #ifdef CONFIG_KVM_BOOK3S_32_HANDLER kvmppc_book3s_exit_pr ();
arch/powerpc/kvm/book3s_xive.h +3 -0
@@ -12,6 +12,9 @@#ifdef CONFIG_KVM_XICS #include "book3s_xics.h" +#define KVMPPC_XIVE_FIRST_IRQ 0 +#define KVMPPC_XIVE_NR_IRQS KVMPPC_XICS_NR_IRQS +/* * State for one guest irq source. *
arch/powerpc/kvm/book3s_xive_native.c new file +338 -0
338 lines not on this page · raw message
arch/powerpc/kvm/powerpc.c +30 -0
@@ -552,6 +552,9 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)#ifdef CONFIG_KVM_XICS case KVM_CAP_IRQ_XICS :#endif +#ifdef CONFIG_KVM_XIVE +case KVM_CAP_PPC_IRQ_XIVE : +#endif case KVM_CAP_PPC_GET_CPU_CHAR : r =1 ;break ;
@@ -731,6 +734,9 @@ void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu)else kvmppc_xics_free_icp (vcpu);break ; +case KVMPPC_IRQ_XIVE : +kvmppc_xive_native_cleanup_vcpu (vcpu); +break ; }kvmppc_core_vcpu_free (vcpu);
@@ -1714,6 +1720,30 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu, break; }#endif /* CONFIG_KVM_XICS */ +#ifdef CONFIG_KVM_XIVE +case KVM_CAP_PPC_IRQ_XIVE : { +struct fd f; +struct kvm_device *dev; + + r = -EBADF ; + f =fdget (cap->args[0 ]); +if (!f.file) +break ; + + r = -ENXIO ; +if (!xive_enabled ()) +break ; + + r = -EPERM ; + dev =kvm_device_from_filp (f.file); +if (dev) + r =kvmppc_xive_native_connect_vcpu (dev, vcpu, + cap->args[1 ]); + +fdput (f); +break ; + } +#endif /* CONFIG_KVM_XIVE */ #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE case KVM_CAP_PPC_FWNMI : r = -EINVAL ;
include/uapi/linux/kvm.h +3 -0
@@ -936,6 +936,7 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_PPC_GET_CPU_CHAR 151#define KVM_CAP_S390_BPB 152#define KVM_CAP_GET_MSR_FEATURES 153 +#define KVM_CAP_PPC_IRQ_XIVE 154#ifdef KVM_CAP_IRQ_ROUTING
@@ -1159,6 +1160,8 @@ enum kvm_device_type {#define KVM_DEV_TYPE_ARM_VGIC_V3 KVM_DEV_TYPE_ARM_VGIC_V3 KVM_DEV_TYPE_ARM_VGIC_ITS,#define KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_ARM_VGIC_ITS + KVM_DEV_TYPE_XIVE, +#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_MAX, };
Signature · 1 line
2.13.6