[RFC v2 4/4] KVM: arm: vgic: cleanup forwarded IRQs on destroy

Eric Auger
2015-02-11T08:23:34Z

When the VGIC is destroyed it must take care of
- restoring the forwarded IRQs in non forwarded state,
- deactivating the IRQ in case the guest left without doing it
- cleaning nodes of the phys_map rbtree

Signed-off-by: Eric Auger <eric.auger@linaro.org>

---

v1 -> v2:
- remove vgic_clean_irq_phys_map call in kvm_vgic_destroy
(useless since already called in kvm_vgic_vcpu_destroy)
---
virt/kvm/arm/vgic.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index dd72ca2..ace8e46 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -32,6 +32,7 @@
#include <asm/kvm_emulate.h>
#include <asm/kvm_arm.h>
#include <asm/kvm_mmu.h>
+#include <linux/spinlock.h>

/*
* How the whole thing works (courtesy of Christoffer Dall):
@@ -103,6 +104,8 @@ static struct vgic_lr vgic_get_lr(const struct kvm_vcpu *vcpu, int lr);
static void vgic_set_lr(struct kvm_vcpu *vcpu, int lr, struct vgic_lr lr_desc);
static void vgic_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
static void vgic_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
+static void vgic_clean_irq_phys_map(struct kvm_vcpu *vcpu,
+ struct rb_root *root);

static const struct vgic_ops *vgic_ops;
static const struct vgic_params *vgic;
@@ -1819,6 +1822,36 @@ static struct irq_phys_map *vgic_irq_map_search(struct kvm_vcpu *vcpu,
return NULL;
}

+static void vgic_clean_irq_phys_map(struct kvm_vcpu *vcpu,
+ struct rb_root *root)
+{
+ unsigned long flags;
+
+ while (1) {
+ struct rb_node *node = rb_first(root);
+ struct irq_phys_map *map;
+ struct irq_desc *desc;
+ struct irq_data *d;
+ struct irq_chip *chip;
+
+ if (!node)
+ break;
+
+ map = container_of(node, struct irq_phys_map, node);
+ desc = irq_to_desc(map->phys_irq);
+
+ raw_spin_lock_irqsave(&desc->lock, flags);
+ d = &desc->irq_data;
+ chip = desc->irq_data.chip;
+ irqd_clr_irq_forwarded(d);
+ chip->irq_eoi(d);
+ raw_spin_unlock_irqrestore(&desc->lock, flags);
+
+ rb_erase(node, root);
+ kfree(map);
+ }
+}
+
int vgic_get_phys_irq(struct kvm_vcpu *vcpu, int virt_irq)
{
struct irq_phys_map *map;
@@ -1861,6 +1894,7 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)
{
struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;

+ vgic_clean_irq_phys_map(vcpu, &vgic_cpu->irq_phys_map);
kfree(vgic_cpu->pending_shared);
kfree(vgic_cpu->vgic_irq_lr_map);
vgic_cpu->pending_shared = NULL;
--
1.9.1