Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63306c28 authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

KVM: arm/arm64: vgic: avoid map in kvm_vgic_unmap_phys_irq() 



kvm_vgic_unmap_phys_irq() only needs the virtual IRQ number, so let's
just pass that between the arch timer and the VGIC to get rid of
the irq_phys_map pointer.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarEric Auger <eric.auger@linaro.org>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent e262f419

include/kvm/arm_vgic.h

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg); 
int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu);

struct irq_phys_map *kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu,

					   int virt_irq, int irq);

int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, struct irq_phys_map *map);

int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int virt_irq);

bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq);



#define irqchip_in_kernel(k)	(!!((k)->arch.vgic.in_kernel))

virt/kvm/arm/arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) 


	timer_disarm(timer);

	if (timer->map)

		kvm_vgic_unmap_phys_irq(vcpu, timer->map);

		kvm_vgic_unmap_phys_irq(vcpu, timer->map->virt_irq);

}



void kvm_timer_enable(struct kvm *kvm)

virt/kvm/arm/vgic.c

+4 −7
Original line number Diff line number Diff line
@@ -1812,25 +1812,22 @@ static void vgic_free_phys_irq_map_rcu(struct rcu_head *rcu) 
/**

 * kvm_vgic_unmap_phys_irq - Remove a virtual to physical IRQ mapping

 * @vcpu: The VCPU pointer

 * @map: The pointer to a mapping obtained through kvm_vgic_map_phys_irq

 * @virt_irq: The virtual IRQ number to be unmapped

 *

 * Remove an existing mapping between virtual and physical interrupts.

 */

int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, struct irq_phys_map *map)

int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int virt_irq)

{

	struct vgic_dist *dist = &vcpu->kvm->arch.vgic;

	struct irq_phys_map_entry *entry;

	struct list_head *root;



	if (!map)

		return -EINVAL;



	root = vgic_get_irq_phys_map_list(vcpu, map->virt_irq);

	root = vgic_get_irq_phys_map_list(vcpu, virt_irq);



	spin_lock(&dist->irq_phys_map_lock);



	list_for_each_entry(entry, root, entry) {

		if (&entry->map == map) {

		if (entry->map.virt_irq == virt_irq) {

			list_del_rcu(&entry->entry);

			call_rcu(&entry->rcu, vgic_free_phys_irq_map_rcu);

			break;