[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20150115110615.GQ26222@cbox>
Date: Thu, 15 Jan 2015 12:06:15 +0100
From: Christoffer Dall <christoffer.dall@...aro.org>
To: Eric Auger <eric.auger@...aro.org>
Cc: eric.auger@...com, marc.zyngier@....com, andre.przywara@....com,
linux-arm-kernel@...ts.infradead.org, kvmarm@...ts.cs.columbia.edu,
kvm@...r.kernel.org, alex.williamson@...hat.com, agraf@...e.de,
joel.schopp@....com, kim.phillips@...escale.com, paulus@...ba.org,
gleb@...nel.org, pbonzini@...hat.com, borntraeger@...ibm.com,
cornelia.huck@...ibm.com, linux-kernel@...r.kernel.org,
patches@...aro.org, will.deacon@....com,
a.motakis@...tualopensystems.com, a.rigo@...tualopensystems.com,
john.liuli@...wei.com, ming.lei@...onical.com, feng.wu@...el.com,
b.reynal@...tualopensystems.com
Subject: Re: [PATCH v6 3/4] KVM: arm/arm64: implement
kvm_arch_intc_initialized and use it in irqfd
On Tue, Jan 13, 2015 at 06:33:39PM +0100, Eric Auger wrote:
> On arm/arm64 the VGIC is dynamically instantiated and it is useful
> to expose its state, especially for irqfd setup.
>
> This patch defines __KVM_HAVE_ARCH_INTC_INITIALIZED and
> implements kvm_arch_intc_initialized.
>
> The new function can now be used by irqfd to check whether the
> virtual interrupt controller is ready on KVM_IRQFD request. If not,
> KVM_IRQFD returns -EAGAIN
>
> Signed-off-by: Eric Auger <eric.auger@...aro.org>
>
> ---
>
> v5 -> v6:
> - remove kvm_arch_intc_initialized declaration from
> architecture specific kvm_host.h since it is now in
> generic kvm_host.h
> - squash v5 patch files 3 & 4
> ---
> arch/arm/include/asm/kvm_host.h | 2 ++
> arch/arm/kvm/arm.c | 5 +++++
> arch/arm64/include/asm/kvm_host.h | 2 ++
> virt/kvm/eventfd.c | 3 +++
> 4 files changed, 12 insertions(+)
>
> diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
> index 254e065..8f87259 100644
> --- a/arch/arm/include/asm/kvm_host.h
> +++ b/arch/arm/include/asm/kvm_host.h
> @@ -27,6 +27,8 @@
> #include <asm/fpstate.h>
> #include <kvm/arm_arch_timer.h>
>
> +#define __KVM_HAVE_ARCH_INTC_INITIALIZED
> +
> #if defined(CONFIG_KVM_ARM_MAX_VCPUS)
> #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS
> #else
> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
> index 2d6d910..9c905b4 100644
> --- a/arch/arm/kvm/arm.c
> +++ b/arch/arm/kvm/arm.c
> @@ -454,6 +454,11 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
> return 0;
> }
>
> +bool kvm_arch_intc_initialized(struct kvm *kvm)
> +{
> + return vgic_initialized(kvm);
> +}
> +
> static void vcpu_pause(struct kvm_vcpu *vcpu)
> {
> wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu);
> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
> index 0b7dfdb..dfb6135 100644
> --- a/arch/arm64/include/asm/kvm_host.h
> +++ b/arch/arm64/include/asm/kvm_host.h
> @@ -28,6 +28,8 @@
> #include <asm/kvm_asm.h>
> #include <asm/kvm_mmio.h>
>
> +#define __KVM_HAVE_ARCH_INTC_INITIALIZED
> +
> #if defined(CONFIG_KVM_ARM_MAX_VCPUS)
> #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS
> #else
> diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
> index 148b239..fc5f43e 100644
> --- a/virt/kvm/eventfd.c
> +++ b/virt/kvm/eventfd.c
> @@ -311,6 +311,9 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
> unsigned int events;
> int idx;
>
> + if (!kvm_arch_intc_initialized(kvm))
> + return -EAGAIN;
> +
I think this hunk should go in patch 2 instead, split up the generic and
arch-specific parts.
> irqfd = kzalloc(sizeof(*irqfd), GFP_KERNEL);
> if (!irqfd)
> return -ENOMEM;
> --
> 1.9.1
>
Assuming you fix that:
Acked-by: Christoffer Dall <christoffer.dall@...aro.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists