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

Commit b452cb52 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: arm/arm64: Remove the IRQ field from struct irq_phys_map 



The communication of a Linux IRQ number from outside the VGIC to the
vgic was a leftover from the day when the vgic code cared about how a
particular device injects virtual interrupts mapped to a physical
interrupt.

We can safely remove this notion, leaving all physical IRQ handling to
be done in the device driver (the arch timer in this case), which makes
room for a saner API for the new VGIC.

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

include/kvm/arm_vgic.h

+1 −2
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ struct vgic_io_device { 
struct irq_phys_map {

	u32			virt_irq;

	u32			phys_irq;

	u32			irq;

};



struct irq_phys_map_entry {
@@ -346,7 +345,7 @@ int kvm_vgic_inject_mapped_irq(struct kvm *kvm, int cpuid, 
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 virt_irq, int phys_irq);

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);

virt/kvm/arm/arch_timer.c

+21 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/kvm.h>

#include <linux/kvm_host.h>

#include <linux/interrupt.h>

#include <linux/irq.h>



#include <clocksource/arm_arch_timer.h>

#include <asm/arch_timer.h>
@@ -300,7 +301,7 @@ void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) 
	if (timer->active_cleared_last && !phys_active)

		return;



	ret = irq_set_irqchip_state(timer->map->irq,

	ret = irq_set_irqchip_state(host_vtimer_irq,

				    IRQCHIP_STATE_ACTIVE,

				    phys_active);

	WARN_ON(ret);
@@ -333,6 +334,9 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
{

	struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu;

	struct irq_phys_map *map;

	struct irq_desc *desc;

	struct irq_data *data;

	int phys_irq;



	/*

	 * The vcpu timer irq number cannot be determined in
@@ -351,11 +355,26 @@ int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu, 
	timer->cntv_ctl = 0;

	kvm_timer_update_state(vcpu);



	/*

	 * 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.

	 */

	map = kvm_vgic_map_phys_irq(vcpu, irq->irq, host_vtimer_irq);

	map = kvm_vgic_map_phys_irq(vcpu, irq->irq, phys_irq);

	if (WARN_ON(IS_ERR(map)))

		return PTR_ERR(map);

virt/kvm/arm/vgic.c

+6 −22
Original line number Diff line number Diff line
@@ -1711,38 +1711,24 @@ static struct list_head *vgic_get_irq_phys_map_list(struct kvm_vcpu *vcpu, 
/**

 * kvm_vgic_map_phys_irq - map a virtual IRQ to a physical IRQ

 * @vcpu: The VCPU pointer

 * @virt_irq: The virtual irq number

 * @irq: The Linux IRQ number

 * @virt_irq: The virtual IRQ number for the guest

 * @phys_irq: The hardware IRQ number of the host

 *

 * Establish a mapping between a guest visible irq (@virt_irq) and a

 * Linux irq (@irq). On injection, @virt_irq will be associated with

 * the physical interrupt represented by @irq. This mapping can be

 * hardware irq (@phys_irq). On injection, @virt_irq will be associated with

 * the physical interrupt represented by @phys_irq. This mapping can be

 * established multiple times as long as the parameters are the same.

 *

 * Returns a valid pointer on success, and an error pointer otherwise

 */

struct irq_phys_map *kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu,

					   int virt_irq, int irq)

					   int virt_irq, int phys_irq)

{

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

	struct list_head *root = vgic_get_irq_phys_map_list(vcpu, virt_irq);

	struct irq_phys_map *map;

	struct irq_phys_map_entry *entry;

	struct irq_desc *desc;

	struct irq_data *data;

	int phys_irq;



	desc = irq_to_desc(irq);

	if (!desc) {

		kvm_err("%s: no interrupt descriptor\n", __func__);

		return ERR_PTR(-EINVAL);

	}



	data = irq_desc_get_irq_data(desc);

	while (data->parent_data)

		data = data->parent_data;



	phys_irq = data->hwirq;



	/* Create a new mapping */

	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
@@ -1755,8 +1741,7 @@ struct irq_phys_map *kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, 
	map = vgic_irq_map_search(vcpu, virt_irq);

	if (map) {

		/* Make sure this mapping matches */

		if (map->phys_irq != phys_irq	||

		    map->irq      != irq)

		if (map->phys_irq != phys_irq)

			map = ERR_PTR(-EINVAL);



		/* Found an existing, valid mapping */
@@ -1766,7 +1751,6 @@ struct irq_phys_map *kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, 
	map           = &entry->map;

	map->virt_irq = virt_irq;

	map->phys_irq = phys_irq;

	map->irq      = irq;



	list_add_tail_rcu(&entry->entry, root);