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

Commit 2412405b authored by Eric Auger's avatar Eric Auger Committed by Christoffer Dall
Browse files

KVM: arm/arm64: register irq bypass consumer on ARM/ARM64 



This patch selects IRQ_BYPASS_MANAGER and HAVE_KVM_IRQ_BYPASS
configs for ARM/ARM64.

kvm_arch_has_irq_bypass() now is implemented and returns true.
As a consequence the irq bypass consumer will be registered for
ARM/ARM64 with the forwarding callbacks:

- stop/start: halt/resume guest execution
- add/del_producer: set/unset forwarding at vgic/irqchip level

We don't have any actual support yet, so nothing gets actually
forwarded.

Acked-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
[maz: dropped the DEOI stuff for the time being in order to
      reduce the dependency chain, amended commit message]
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 80f77e54

arch/arm/kvm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#



source "virt/kvm/Kconfig"

source "virt/lib/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"
@@ -35,6 +36,8 @@ config KVM 
	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select HAVE_KVM_MSI

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	depends on ARM_VIRT_EXT && ARM_LPAE && ARM_ARCH_TIMER

	---help---

	  Support hosting virtualized guest machines.

arch/arm64/kvm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#



source "virt/kvm/Kconfig"

source "virt/lib/Kconfig"



menuconfig VIRTUALIZATION

	bool "Virtualization"
@@ -35,6 +36,8 @@ config KVM 
	select HAVE_KVM_MSI

	select HAVE_KVM_IRQCHIP

	select HAVE_KVM_IRQ_ROUTING

	select IRQ_BYPASS_MANAGER

	select HAVE_KVM_IRQ_BYPASS

	---help---

	  Support hosting virtualized guest machines.

	  We don't support KVM with 16K page tables yet, due to the multiple

virt/kvm/arm/arm.c

+40 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <linux/mman.h>

#include <linux/sched.h>

#include <linux/kvm.h>

#include <linux/kvm_irqfd.h>

#include <linux/irqbypass.h>

#include <trace/events/kvm.h>

#include <kvm/arm_pmu.h>
@@ -1458,6 +1460,44 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr) 
	return NULL;

}



bool kvm_arch_has_irq_bypass(void)

{

	return true;

}



int kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons,

				      struct irq_bypass_producer *prod)

{

	struct kvm_kernel_irqfd *irqfd =

		container_of(cons, struct kvm_kernel_irqfd, consumer);



	return 0;

}

void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,

				      struct irq_bypass_producer *prod)

{

	struct kvm_kernel_irqfd *irqfd =

		container_of(cons, struct kvm_kernel_irqfd, consumer);



	return;

}



void kvm_arch_irq_bypass_stop(struct irq_bypass_consumer *cons)

{

	struct kvm_kernel_irqfd *irqfd =

		container_of(cons, struct kvm_kernel_irqfd, consumer);



	kvm_arm_halt_guest(irqfd->kvm);

}



void kvm_arch_irq_bypass_start(struct irq_bypass_consumer *cons)

{

	struct kvm_kernel_irqfd *irqfd =

		container_of(cons, struct kvm_kernel_irqfd, consumer);



	kvm_arm_resume_guest(irqfd->kvm);

}



/**

 * Initialize Hyp-mode and memory mappings on all CPUs.

 */