From patchwork Tue Jul 18 16:58:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 9849173 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CA6DF600CC for ; Tue, 18 Jul 2017 17:14:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC7A8285BA for ; Tue, 18 Jul 2017 17:14:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A13B9285CE; Tue, 18 Jul 2017 17:14:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F4107285D9 for ; Tue, 18 Jul 2017 17:14:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751965AbdGRRNT (ORCPT ); Tue, 18 Jul 2017 13:13:19 -0400 Received: from mail-io0-f173.google.com ([209.85.223.173]:35316 "EHLO mail-io0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751671AbdGRQ7i (ORCPT ); Tue, 18 Jul 2017 12:59:38 -0400 Received: by mail-io0-f173.google.com with SMTP id k71so16774775iod.2 for ; Tue, 18 Jul 2017 09:59:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gS4ttO5+VUU0HPCLsGuyaKUxGqZs9JmugC2RyJAHZ70=; b=JuHNthdA7Dpn2XClve7BZQJ/e32R9ockUOcLhDeHQSy/4+Ku0Yv/Rf1+ggX9GA6y8q ljXz2Hbo0XdbiPLOn4HA1oywLxusO02cRHGqg2YUhRT7e+dWiE+uPBf2itHfJ/zzoEvy +nma0oxKavrA79NstL4y3EVcy1ikfgoJ9G4hY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gS4ttO5+VUU0HPCLsGuyaKUxGqZs9JmugC2RyJAHZ70=; b=pa3Xg3l78puXSMuze9ooF+bTiz1Repho7td4fILuBA1qL+/lEJ5sFvT5fPOZxxT7BE B/tMwFBXj4Xkowx/oJtMnJz6ZFLAbCRSjl5ElH8vflOr48efKeYcBK+bd30IIG1iJ1cg 98l5nhj739XFNjo4h3OQxZHrRAtB/EazS4ELnJPMXR6Mgj4kwJKxV+aCDV4w6D2Jd7U7 yj38fvmwsK2rN/qmhNshIY8s/nPz+UDrkIZeEFh1oMv8J2MjAjdpK5zuMt0Gzov0p5s8 NGroZKZZoYcF7ejmXvlZrz3dIXQFrbMBBYS1avRpZ+Uq0pc8SnqCwIZhG70IAwRmqXVF klfg== X-Gm-Message-State: AIVw110gKSnBR0rGsTwbw+Sg0UItzbKZNfFnp0dBWCUVO/VvKN0SYTN7 Kl6sBYjtxeKcweEh X-Received: by 10.107.18.140 with SMTP id 12mr2502422ios.119.1500397177618; Tue, 18 Jul 2017 09:59:37 -0700 (PDT) Received: from node.jintackl-qv26972.kvmarm-pg0.wisc.cloudlab.us (c220g1-030822.wisc.cloudlab.us. [128.104.222.82]) by smtp.gmail.com with ESMTPSA id j96sm1413075ioo.49.2017.07.18.09.59.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 09:59:36 -0700 (PDT) From: Jintack Lim To: kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com Cc: corbet@lwn.net, pbonzini@redhat.com, rkrcmar@redhat.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, akpm@linux-foundation.org, mchehab@kernel.org, cov@codeaurora.org, daniel.lezcano@linaro.org, david.daney@cavium.com, mark.rutland@arm.com, suzuki.poulose@arm.com, stefan@hello-penguin.com, andy.gross@linaro.org, wcohen@redhat.com, ard.biesheuvel@linaro.org, shankerd@codeaurora.org, vladimir.murzin@arm.com, james.morse@arm.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jintack Lim Subject: [RFC PATCH v2 02/38] KVM: arm/arm64: Enable nested virtualization via command-line Date: Tue, 18 Jul 2017 11:58:28 -0500 Message-Id: <1500397144-16232-3-git-send-email-jintack.lim@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1500397144-16232-1-git-send-email-jintack.lim@linaro.org> References: <1500397144-16232-1-git-send-email-jintack.lim@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a new kernel parameter(kvm-arm.nested) to enable KVM/ARM nested virtualization support. This kernel parameter on arm architecture is ignored since nested virtualization is not supported on arm. Note that this kernel parameter will not have any impact until nested virtualization support is completed. Just add this parameter first to use it when implementing nested virtualization support. Signed-off-by: Jintack Lim --- Documentation/admin-guide/kernel-parameters.txt | 4 ++++ arch/arm/include/asm/kvm_host.h | 4 ++++ arch/arm64/include/asm/kvm_host.h | 2 ++ arch/arm64/kvm/Makefile | 2 ++ arch/arm64/kvm/nested.c | 26 +++++++++++++++++++++++++ virt/kvm/arm/arm.c | 2 ++ 6 files changed, 40 insertions(+) create mode 100644 arch/arm64/kvm/nested.c diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index aa8341e..8fb152d 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -1841,6 +1841,10 @@ [KVM,ARM] Trap guest accesses to GICv3 common system registers + kvm-arm.nested= + [KVM,ARM] Allow nested virtualization in KVM/ARM. + Default is 0 (disabled) + kvm-intel.ept= [KVM,Intel] Disable extended page tables (virtualized MMU) support on capable Intel chips. Default is 1 (enabled) diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 127e2dd..00b0f97 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -299,4 +299,8 @@ int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu, int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr); +static inline int __init kvmarm_nested_cfg(char *buf) +{ + return 0; +} #endif /* __ARM_KVM_HOST_H__ */ diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 0c4fd1f..dcc4df8 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -386,4 +386,6 @@ static inline void __cpu_init_stage2(void) "PARange is %d bits, unsupported configuration!", parange); } +int __init kvmarm_nested_cfg(char *buf); + #endif /* __ARM64_KVM_HOST_H__ */ diff --git a/arch/arm64/kvm/Makefile b/arch/arm64/kvm/Makefile index 5d98100..f513047 100644 --- a/arch/arm64/kvm/Makefile +++ b/arch/arm64/kvm/Makefile @@ -35,3 +35,5 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/vgic/vgic-debug.o kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/irqchip.o kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arch_timer.o kvm-$(CONFIG_KVM_ARM_PMU) += $(KVM)/arm/pmu.o + +kvm-$(CONFIG_KVM_ARM_HOST) += nested.o diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c new file mode 100644 index 0000000..79f38da --- /dev/null +++ b/arch/arm64/kvm/nested.c @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2017 - Columbia University and Linaro Ltd. + * Author: Jintack Lim + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +static bool nested_param; + +int __init kvmarm_nested_cfg(char *buf) +{ + return strtobool(buf, &nested_param); +} diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index a39a1e1..1c1c772 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -67,6 +67,8 @@ static DEFINE_PER_CPU(unsigned char, kvm_arm_hardware_enabled); +early_param("kvm-arm.nested", kvmarm_nested_cfg); + static void kvm_arm_set_running_vcpu(struct kvm_vcpu *vcpu) { BUG_ON(preemptible());