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

Commit 74fe55dc authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

KVM: arm/arm64: GICv4: Add init/teardown of the per-VM vPE irq domain 



In order to control the GICv4 view of virtual CPUs, we rely
on an irqdomain allocated for that purpose. Let's add a couple
of helpers to that effect.

At the same time, the vgic data structures gain new fields to
track all this... erm... wonderful stuff.

The way we hook into the vgic init is slightly convoluted. We
need the vgic to be initialized (in order to guarantee that
the number of vcpus is now fixed), and we must have a vITS
(otherwise this is all very pointless). So we end-up calling
the init from both vgic_init and vgic_its_create.

Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent e7c48059

arch/arm/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ obj-y += $(KVM)/arm/vgic/vgic-init.o 
obj-y += $(KVM)/arm/vgic/vgic-irqfd.o

obj-y += $(KVM)/arm/vgic/vgic-v2.o

obj-y += $(KVM)/arm/vgic/vgic-v3.o

obj-y += $(KVM)/arm/vgic/vgic-v4.o

obj-y += $(KVM)/arm/vgic/vgic-mmio.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v2.o

obj-y += $(KVM)/arm/vgic/vgic-mmio-v3.o

arch/arm64/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-init.o 
kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-irqfd.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v2.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v3.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-v4.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v2.o

kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-mmio-v3.o

include/kvm/arm_vgic.h

+19 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/list.h>

#include <linux/jump_label.h>



#include <linux/irqchip/arm-gic-v4.h>



#define VGIC_V3_MAX_CPUS	255

#define VGIC_V2_MAX_CPUS	8

#define VGIC_NR_IRQS_LEGACY     256
@@ -236,6 +238,15 @@ struct vgic_dist { 


	/* used by vgic-debug */

	struct vgic_state_iter *iter;



	/*

	 * GICv4 ITS per-VM data, containing the IRQ domain, the VPE

	 * array, the property table pointer as well as allocation

	 * data. This essentially ties the Linux IRQ core and ITS

	 * together, and avoids leaking KVM's data structures anywhere

	 * else.

	 */

	struct its_vm		its_vm;

};



struct vgic_v2_cpu_if {
@@ -254,6 +265,14 @@ struct vgic_v3_cpu_if { 
	u32		vgic_ap0r[4];

	u32		vgic_ap1r[4];

	u64		vgic_lr[VGIC_V3_MAX_LRS];



	/*

	 * GICv4 ITS per-VPE data, containing the doorbell IRQ, the

	 * pending table pointer, the its_vm pointer and a few other

	 * HW specific things. As for the its_vm structure, this is

	 * linking the Linux IRQ subsystem and the ITS together.

	 */

	struct its_vpe	its_vpe;

};



struct vgic_cpu {

virt/kvm/arm/vgic/vgic-init.c

+9 −0
Original line number Diff line number Diff line
@@ -285,6 +285,12 @@ int vgic_init(struct kvm *kvm) 
	if (ret)

		goto out;



	if (vgic_supports_direct_msis(kvm)) {

		ret = vgic_v4_init(kvm);

		if (ret)

			goto out;

	}



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_vgic_vcpu_enable(vcpu);
@@ -320,6 +326,9 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) 


	kfree(dist->spis);

	dist->nr_spis = 0;



	if (vgic_supports_direct_msis(kvm))

		vgic_v4_teardown(kvm);

}



void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)

virt/kvm/arm/vgic/vgic-its.c

+8 −0
Original line number Diff line number Diff line
@@ -1638,6 +1638,14 @@ static int vgic_its_create(struct kvm_device *dev, u32 type) 
	if (!its)

		return -ENOMEM;



	if (vgic_initialized(dev->kvm)) {

		int ret = vgic_v4_init(dev->kvm);

		if (ret) {

			kfree(its);

			return ret;

		}

	}



	mutex_init(&its->its_lock);

	mutex_init(&its->cmd_lock);