From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752463AbdJ3Grs (ORCPT ); Mon, 30 Oct 2017 02:47:48 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:50552 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751540AbdJ3Grq (ORCPT ); Mon, 30 Oct 2017 02:47:46 -0400 X-Google-Smtp-Source: ABhQp+RdZ41BCeiKPfg88xOBp4TnTvwfl8rws00BfHoANTtunxVlgVreP011cN9FPMWQfsX/Nv/bxw== Date: Mon, 30 Oct 2017 07:47:36 +0100 From: Christoffer Dall To: Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Christoffer Dall , Eric Auger , Shanker Donthineni , Mark Rutland , Shameerali Kolothum Thodi , Andre Przywara Subject: Re: [PATCH v5 02/26] KVM: arm/arm64: register irq bypass consumer on ARM/ARM64 Message-ID: <20171030064736.GN2166@lvm> References: <20171027142855.21584-1-marc.zyngier@arm.com> <20171027142855.21584-3-marc.zyngier@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171027142855.21584-3-marc.zyngier@arm.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 27, 2017 at 03:28:31PM +0100, Marc Zyngier wrote: > From: Eric Auger > > 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: Christoffer Dall > Signed-off-by: Eric Auger > [maz: dropped the DEOI stuff for the time being in order to > reduce the dependency chain, amended commit message] > Signed-off-by: Marc Zyngier > --- > arch/arm/kvm/Kconfig | 3 +++ > arch/arm64/kvm/Kconfig | 3 +++ > virt/kvm/arm/arm.c | 40 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 46 insertions(+) > > diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig > index 90d0176fb30d..4e2b192a030a 100644 > --- a/arch/arm/kvm/Kconfig > +++ b/arch/arm/kvm/Kconfig > @@ -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. > diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig > index 52cb7ad9b2fd..7e0d6e63cc71 100644 > --- a/arch/arm64/kvm/Kconfig > +++ b/arch/arm64/kvm/Kconfig > @@ -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 > diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c > index b9f68e4add71..7ac4ecba9ebd 100644 > --- a/virt/kvm/arm/arm.c > +++ b/virt/kvm/arm/arm.c > @@ -27,6 +27,8 @@ > #include > #include > #include > +#include > +#include > #include > #include > > @@ -1449,6 +1451,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. > */ > -- > 2.11.0 >