From: wanghaibin <wanghaibin.wang@huawei.com> irqfd handling is still hidden away in the vgic code. Let's extract it and move the generic part in the non-GIC code, with the now required abstraction in the irqchip_flow struct. Signed-off-by: Marc Zyngier <maz@kernel.org> Signed-off-by: wanghaibin <wanghaibin.wang@huawei.com> --- arch/arm64/include/asm/kvm_irq.h | 11 +++++ arch/arm64/kvm/arm.c | 68 ++++++++++++++++++++++++++++++ arch/arm64/kvm/vgic/vgic-init.c | 3 ++ arch/arm64/kvm/vgic/vgic-irqfd.c | 72 ++++++-------------------------- arch/arm64/kvm/vgic/vgic.h | 10 +++++ 5 files changed, 104 insertions(+), 60 deletions(-) diff --git a/arch/arm64/include/asm/kvm_irq.h b/arch/arm64/include/asm/kvm_irq.h index 5696dd949ad1..8676c68085a6 100644 --- a/arch/arm64/include/asm/kvm_irq.h +++ b/arch/arm64/include/asm/kvm_irq.h @@ -20,6 +20,8 @@ enum kvm_irqchip_type { #define irqchip_finalized(k) ((k)->arch.irqchip_finalized) +struct kvm_kernel_irq_routing_entry; + struct kvm_irqchip_flow { void (*irqchip_destroy)(struct kvm *); void (*irqchip_vcpu_destroy)(struct kvm_vcpu *vcpu); @@ -43,6 +45,15 @@ struct kvm_irqchip_flow { u32, struct irq_ops *); int (*irqchip_unmap_phys_irq)(struct kvm_vcpu *, unsigned int); int (*irqchip_set_owner)(struct kvm_vcpu *, unsigned int, void *); + int (*irqchip_irqfd_set_irq)(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, + int level, bool line_status); + int (*irqchip_set_msi)(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, + int level, bool line_status); + int (*irqchip_set_irq_inatomic)(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, + int level, bool line_status); }; /* diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 328afbfb9c96..2e67b6353c06 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1233,6 +1233,74 @@ static int noinstr kvm_arm_vcpu_enter_exit(struct kvm_vcpu *vcpu) return ret; } +/** + * kvm_set_routing_entry: populate a kvm routing entry + * from a user routing entry + * + * @kvm: the VM this entry is applied to + * @e: kvm kernel routing entry handle + * @ue: user api routing entry handle + * return 0 on success, -EINVAL on errors. + */ +int kvm_set_routing_entry(struct kvm *kvm, + struct kvm_kernel_irq_routing_entry *e, + const struct kvm_irq_routing_entry *ue) +{ + int r = -EINVAL; + + switch (ue->type) { + case KVM_IRQ_ROUTING_IRQCHIP: + e->set = kvm->arch.irqchip_flow.irqchip_irqfd_set_irq; + e->irqchip.irqchip = ue->u.irqchip.irqchip; + e->irqchip.pin = ue->u.irqchip.pin; + if ((e->irqchip.pin >= KVM_IRQCHIP_NUM_PINS) || + (e->irqchip.irqchip >= KVM_NR_IRQCHIPS)) + goto out; + break; + case KVM_IRQ_ROUTING_MSI: + e->set = kvm->arch.irqchip_flow.irqchip_set_msi; + e->msi.address_lo = ue->u.msi.address_lo; + e->msi.address_hi = ue->u.msi.address_hi; + e->msi.data = ue->u.msi.data; + e->msi.flags = ue->flags; + e->msi.devid = ue->u.msi.devid; + break; + default: + goto out; + } + + if (!e->set) + goto out; + + r = 0; +out: + return r; +} + +int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, + int level, bool line_status) +{ + if (!kvm->arch.irqchip_flow.irqchip_set_msi) + return -ENODEV; + return kvm->arch.irqchip_flow.irqchip_set_msi(e, kvm, irq_source_id, + level, line_status); +} + +int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, int level, + bool line_status) +{ + if (!level || !irqchip_finalized(kvm) || + !kvm->arch.irqchip_flow.irqchip_set_irq_inatomic) + return -EWOULDBLOCK; + + return kvm->arch.irqchip_flow.irqchip_set_irq_inatomic(e, kvm, + irq_source_id, + level, + line_status); +} + /** * kvm_arch_vcpu_ioctl_run - the main VCPU run function to execute guest code * @vcpu: The VCPU pointer diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index 5f37d2362453..dddd231f134c 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -42,6 +42,9 @@ static struct kvm_irqchip_flow vgic_irqchip_flow = { .irqchip_map_phys_irq = kvm_vgic_map_phys_irq, .irqchip_unmap_phys_irq = kvm_vgic_unmap_phys_irq, .irqchip_set_owner = kvm_vgic_set_owner, + .irqchip_irqfd_set_irq = vgic_irqfd_set_irq, + .irqchip_set_msi = vgic_set_msi, + .irqchip_set_irq_inatomic = vgic_set_irq_inatomic, }; /* diff --git a/arch/arm64/kvm/vgic/vgic-irqfd.c b/arch/arm64/kvm/vgic/vgic-irqfd.c index e3c1197332b5..950684fb84e5 100644 --- a/arch/arm64/kvm/vgic/vgic-irqfd.c +++ b/arch/arm64/kvm/vgic/vgic-irqfd.c @@ -38,9 +38,9 @@ void kire_arch_cached_data_update(struct kvm *kvm, * * This is the entry point for irqfd IRQ injection */ -static int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, - struct kvm *kvm, int irq_source_id, - int level, bool line_status) +int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, + int level, bool line_status) { unsigned int spi_id = e->irqchip.pin + VGIC_NR_PRIVATE_IRQS; @@ -49,46 +49,6 @@ static int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, return kvm_vgic_inject_irq(kvm, 0, spi_id, level, NULL); } -/** - * kvm_set_routing_entry: populate a kvm routing entry - * from a user routing entry - * - * @kvm: the VM this entry is applied to - * @e: kvm kernel routing entry handle - * @ue: user api routing entry handle - * return 0 on success, -EINVAL on errors. - */ -int kvm_set_routing_entry(struct kvm *kvm, - struct kvm_kernel_irq_routing_entry *e, - const struct kvm_irq_routing_entry *ue) -{ - int r = -EINVAL; - - switch (ue->type) { - case KVM_IRQ_ROUTING_IRQCHIP: - e->set = vgic_irqfd_set_irq; - e->irqchip.irqchip = ue->u.irqchip.irqchip; - e->irqchip.pin = ue->u.irqchip.pin; - if ((e->irqchip.pin >= KVM_IRQCHIP_NUM_PINS) || - (e->irqchip.irqchip >= KVM_NR_IRQCHIPS)) - goto out; - break; - case KVM_IRQ_ROUTING_MSI: - e->set = kvm_set_msi; - e->msi.address_lo = ue->u.msi.address_lo; - e->msi.address_hi = ue->u.msi.address_hi; - e->msi.data = ue->u.msi.data; - e->msi.flags = ue->flags; - e->msi.devid = ue->u.msi.devid; - break; - default: - goto out; - } - r = 0; -out: - return r; -} - static void kvm_populate_msi(struct kvm_kernel_irq_routing_entry *e, struct kvm_msi *msi) { @@ -98,16 +58,17 @@ static void kvm_populate_msi(struct kvm_kernel_irq_routing_entry *e, msi->flags = e->msi.flags; msi->devid = e->msi.devid; } + /** - * kvm_set_msi: inject the MSI corresponding to the + * vgic_set_msi: inject the MSI corresponding to the * MSI routing entry * * This is the entry point for irqfd MSI injection * and userspace MSI injection. */ -int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, - struct kvm *kvm, int irq_source_id, - int level, bool line_status) +int vgic_set_msi(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, + int level, bool line_status) { struct kvm_msi msi; @@ -139,15 +100,12 @@ static int kvm_arch_set_irq_bypass(struct kvm_kernel_irq_routing_entry *e, #endif /** - * kvm_arch_set_irq_inatomic: fast-path for irqfd injection + * vgic_set_irq_inatomic: fast-path for irqfd injection */ -int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, - struct kvm *kvm, int irq_source_id, int level, - bool line_status) +int vgic_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, int level, + bool line_status) { - if (!level) - return -EWOULDBLOCK; - switch (e->type) { case KVM_IRQ_ROUTING_MSI: { struct kvm_msi msi; @@ -164,12 +122,6 @@ int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, } case KVM_IRQ_ROUTING_IRQCHIP: - /* - * Injecting SPIs is always possible in atomic context - * as long as the damn vgic is initialized. - */ - if (unlikely(!irqchip_finalized(kvm))) - break; return vgic_irqfd_set_irq(e, kvm, irq_source_id, 1, line_status); } diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h index c759bef004ba..2793d88c2c22 100644 --- a/arch/arm64/kvm/vgic/vgic.h +++ b/arch/arm64/kvm/vgic/vgic.h @@ -359,6 +359,16 @@ void vgic_its_invalidate_cache(struct kvm *kvm); int vgic_its_inv_lpi(struct kvm *kvm, struct vgic_irq *irq); int vgic_its_invall(struct kvm_vcpu *vcpu); +int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, + int level, bool line_status); +int vgic_set_msi(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, + int level, bool line_status); +int vgic_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, int level, + bool line_status); + bool vgic_supports_direct_msis(struct kvm *kvm); int vgic_v4_init(struct kvm *kvm); void vgic_v4_teardown(struct kvm *kvm); -- 2.33.0