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

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

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



For getting the active state of a mapped IRQ, we actually only need
the virtual IRQ number, not the pointer to the mapping entry.
Pass the virtual IRQ number from the arch timer to the VGIC directly.

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 4f551a3d

include/kvm/arm_vgic.h

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ 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);

bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, struct irq_phys_map *map);

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



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

#define vgic_initialized(k)	(!!((k)->arch.vgic.nr_cpus))

virt/kvm/arm/arch_timer.c

+2 −4
Original line number Diff line number Diff line
@@ -274,10 +274,8 @@ void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) 
	* to ensure that hardware interrupts from the timer triggers a guest

	* exit.

	*/

	if (timer->irq.level || kvm_vgic_map_is_active(vcpu, timer->map))

		phys_active = true;

	else

		phys_active = false;

	phys_active = timer->irq.level ||

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



	/*

	 * We want to avoid hitting the (re)distributor as much as

virt/kvm/arm/vgic.c

+3 −3
Original line number Diff line number Diff line
@@ -1102,18 +1102,18 @@ static bool dist_active_irq(struct kvm_vcpu *vcpu) 
	return test_bit(vcpu->vcpu_id, dist->irq_active_on_cpu);

}



bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, struct irq_phys_map *map)

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

{

	int i;



	for (i = 0; i < vcpu->arch.vgic_cpu.nr_lr; i++) {

		struct vgic_lr vlr = vgic_get_lr(vcpu, i);



		if (vlr.irq == map->virt_irq && vlr.state & LR_STATE_ACTIVE)

		if (vlr.irq == virt_irq && vlr.state & LR_STATE_ACTIVE)

			return true;

	}



	return vgic_irq_is_active(vcpu, map->virt_irq);

	return vgic_irq_is_active(vcpu, virt_irq);

}



/*