KVM: arm/arm64: vgic: restructure kvm_vgic_(un)map_phys_irq

We want to reuse the core of the map/unmap functions for IRQ
forwarding. Let's move the computation of the hwirq in
kvm_vgic_map_phys_irq and pass the linux IRQ as parameter.
the host_irq is added to struct vgic_irq.

We introduce kvm_vgic_map/unmap_irq which take a struct vgic_irq
handle as a parameter.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>

2 files changed, 46 insertions, 38 deletions

diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c
index 4db54ff08d9e..4151250ce8da 100644
--- a/virt/kvm/arm/arch_timer.c
+++ b/virt/kvm/arm/arch_timer.c
@@ -817,9 +817,6 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu)
 {
         struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;
         struct arch_timer_context *vtimer = vcpu_vtimer(vcpu);
-        struct irq_desc *desc;
-        struct irq_data *data;
-        int phys_irq;
         int ret;
 
         if (timer->enabled)
@@ -837,26 +834,7 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu)
                 return -EINVAL;
         }
 
-        /*
-         * Find the physical IRQ number corresponding to the host_vtimer_irq
-         */
-        desc = irq_to_desc(host_vtimer_irq);
-        if (!desc) {
-                kvm_err("%s: no interrupt descriptor\n", __func__);
-                return -EINVAL;
-        }
-
-        data = irq_desc_get_irq_data(desc);
-        while (data->parent_data)
-                data = data->parent_data;
-
-        phys_irq = data->hwirq;
-
-        /*
-         * Tell the VGIC that the virtual interrupt is tied to a
-         * physical interrupt. We do that once per VCPU.
-         */
-        ret = kvm_vgic_map_phys_irq(vcpu, vtimer->irq.irq, phys_irq);
+        ret = kvm_vgic_map_phys_irq(vcpu, host_vtimer_irq, vtimer->irq.irq);
         if (ret)
                 return ret;
 
diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
index e54ef2fdf73d..a05a5700910b 100644
--- a/virt/kvm/arm/vgic/vgic.c
+++ b/virt/kvm/arm/vgic/vgic.c
@@ -17,6 +17,8 @@
 #include <linux/kvm.h>
 #include <linux/kvm_host.h>
 #include <linux/list_sort.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include "vgic.h"
 
@@ -409,25 +411,56 @@ int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int intid,
         return 0;
 }
 
-int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, u32 virt_irq, u32 phys_irq)
+/* @irq->irq_lock must be held */
+static int kvm_vgic_map_irq(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
+                            unsigned int host_irq)
 {
-        struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, virt_irq);
+        struct irq_desc *desc;
+        struct irq_data *data;
+
+        /*
+         * Find the physical IRQ number corresponding to @host_irq
+         */
+        desc = irq_to_desc(host_irq);
+        if (!desc) {
+                kvm_err("%s: no interrupt descriptor\n", __func__);
+                return -EINVAL;
+        }
+        data = irq_desc_get_irq_data(desc);
+        while (data->parent_data)
+                data = data->parent_data;
+
+        irq->hw = true;
+        irq->host_irq = host_irq;
+        irq->hwintid = data->hwirq;
+        return 0;
+}
+
+/* @irq->irq_lock must be held */
+static inline void kvm_vgic_unmap_irq(struct vgic_irq *irq)
+{
+        irq->hw = false;
+        irq->hwintid = 0;
+}
+
+int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, unsigned int host_irq,
+                          u32 vintid)
+{
+        struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, vintid);
         unsigned long flags;
+        int ret;
 
         BUG_ON(!irq);
 
         spin_lock_irqsave(&irq->irq_lock, flags);
-
-        irq->hw = true;
-        irq->hwintid = phys_irq;
-
+        ret = kvm_vgic_map_irq(vcpu, irq, host_irq);
         spin_unlock_irqrestore(&irq->irq_lock, flags);
         vgic_put_irq(vcpu->kvm, irq);
 
-        return 0;
+        return ret;
 }
 
-int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int virt_irq)
+int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int vintid)
 {
         struct vgic_irq *irq;
         unsigned long flags;
@@ -435,14 +468,11 @@ int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int virt_irq)
         if (!vgic_initialized(vcpu->kvm))
                 return -EAGAIN;
 
-        irq = vgic_get_irq(vcpu->kvm, vcpu, virt_irq);
+        irq = vgic_get_irq(vcpu->kvm, vcpu, vintid);
         BUG_ON(!irq);
 
         spin_lock_irqsave(&irq->irq_lock, flags);
-
-        irq->hw = false;
-        irq->hwintid = 0;
-
+        kvm_vgic_unmap_irq(irq);
         spin_unlock_irqrestore(&irq->irq_lock, flags);
         vgic_put_irq(vcpu->kvm, irq);
 
@@ -784,9 +814,9 @@ void vgic_kick_vcpus(struct kvm *kvm)
         }
 }
 
-bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq)
+bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int vintid)
 {
-        struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, virt_irq);
+        struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, vintid);
         bool map_is_active;
         unsigned long flags;