From patchwork Thu Jun 19 09:45:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 4381961 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9B5559F383 for ; Thu, 19 Jun 2014 09:46:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B323220377 for ; Thu, 19 Jun 2014 09:46:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4FC4202EB for ; Thu, 19 Jun 2014 09:46:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932357AbaFSJqe (ORCPT ); Thu, 19 Jun 2014 05:46:34 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:60772 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932327AbaFSJqa (ORCPT ); Thu, 19 Jun 2014 05:46:30 -0400 Received: from e106785-lin.cambridge.arm.com (e106785-lin.cambridge.arm.com [10.1.209.161]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s5J9jqwu010894; Thu, 19 Jun 2014 10:45:53 +0100 (BST) From: Andre Przywara To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: marc.zyngier@arm.com, christoffer.dall@linaro.org Subject: [PATCH 06/14] arm/arm64: KVM: make the maximum number of vCPUs a per-VM value Date: Thu, 19 Jun 2014 10:45:44 +0100 Message-Id: <1403171152-24067-7-git-send-email-andre.przywara@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403171152-24067-1-git-send-email-andre.przywara@arm.com> References: <1403171152-24067-1-git-send-email-andre.przywara@arm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently the maximum number of vCPUs supported is a global value limited by the used GIC model. GICv3 will lift this limit, but we still need to observe it for guests using GICv2. So the maximum number of vCPUs is per-VM value, depending on the GIC model the guest uses. Store and check the value in struct kvm_arch, but keep it down to 8 for now. Signed-off-by: Andre Przywara --- arch/arm/include/asm/kvm_host.h | 1 + arch/arm/kvm/arm.c | 6 ++++++ arch/arm64/include/asm/kvm_host.h | 3 +++ virt/kvm/arm/vgic-v2.c | 5 +++++ virt/kvm/arm/vgic-v3.c | 6 ++++++ 5 files changed, 21 insertions(+) diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 8d30f05..49c07ea 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -67,6 +67,7 @@ struct kvm_arch { /* Interrupt controller */ struct vgic_dist vgic; + int max_vcpus; }; #define KVM_NR_MEM_OBJS 40 diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index fa37fa1..a291e63 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -142,6 +142,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) /* Mark the initial VMID generation invalid */ kvm->arch.vmid_gen = 0; + kvm->arch.max_vcpus = CONFIG_KVM_ARM_MAX_VCPUS; return ret; out_free_stage2_pgd: @@ -260,6 +261,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) int err; struct kvm_vcpu *vcpu; + if (id >= kvm->arch.max_vcpus) { + err = -EINVAL; + goto out; + } + vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL); if (!vcpu) { err = -ENOMEM; diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 4c84250..eef63b1 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -58,6 +58,9 @@ struct kvm_arch { /* VTTBR value associated with above pgd and vmid */ u64 vttbr; + /* The maximum number of vCPUs depends on the used GIC model */ + int max_vcpus; + /* Interrupt controller */ struct vgic_dist vgic; diff --git a/virt/kvm/arm/vgic-v2.c b/virt/kvm/arm/vgic-v2.c index f2c214a..4091078 100644 --- a/virt/kvm/arm/vgic-v2.c +++ b/virt/kvm/arm/vgic-v2.c @@ -164,11 +164,16 @@ static struct vgic_params vgic_v2_params; static bool vgic_v2_init_emul(struct kvm *kvm, int type) { struct vgic_vm_ops *vm_ops = &kvm->arch.vgic.vm_ops; + int nr_vcpus; switch (type) { case KVM_DEV_TYPE_ARM_VGIC_V2: + nr_vcpus = atomic_read(&kvm->online_vcpus); + if (nr_vcpus > 8) + return false; vm_ops->get_lr = vgic_v2_get_lr; vm_ops->set_lr = vgic_v2_set_lr; + kvm->arch.max_vcpus = 8; return true; } diff --git a/virt/kvm/arm/vgic-v3.c b/virt/kvm/arm/vgic-v3.c index f42961c..40d6817 100644 --- a/virt/kvm/arm/vgic-v3.c +++ b/virt/kvm/arm/vgic-v3.c @@ -171,11 +171,17 @@ static const struct vgic_ops vgic_v3_ops = { static bool vgic_v3_init_emul_compat(struct kvm *kvm, int type) { struct vgic_vm_ops *vm_ops = &kvm->arch.vgic.vm_ops; + int nr_vcpus; switch (type) { case KVM_DEV_TYPE_ARM_VGIC_V2: + nr_vcpus = atomic_read(&kvm->online_vcpus); + if (nr_vcpus > 8) + return false; + vm_ops->get_lr = vgic_v3_get_lr; vm_ops->set_lr = vgic_v3_set_lr; + kvm->arch.max_vcpus = 8; return true; } return false;