From patchwork Tue Jul 18 16:58:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 108180 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp6193664qge; Tue, 18 Jul 2017 10:12:49 -0700 (PDT) X-Received: by 10.98.67.82 with SMTP id q79mr2745768pfa.121.1500397969388; Tue, 18 Jul 2017 10:12:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500397969; cv=none; d=google.com; s=arc-20160816; b=BO8Rq4OVjhdREt4d1BVwFf6tkwJvamUTeLAywz4M2/9g5soi8SdBorhb3R+QaRzx06 vHKRZBcFtBrMbqRswdoZXkoXw6ZY1RnZOY44EXGUlQnQcCW7alXegGP91j1Y8m5NfMuE v3oOuS0/8KQdS9FmGgjkb54MnVXUqJG1IBPCRQX1XRWRLC8PTFJ/RGiNg52vyp3LJAgw P+F5Kg7IevDY/FN4m5gZvV/6E880UAij4Q/bUSJ2VR5cue4dttvMkNJL6b5wfiP2a4AS j5Lx4mJSdnvRkDaiS/YjUOAJyebJG9RsfOZ+Jm0fUnugyJMsFMZ5wfvxVvFaHz4G8OL+ ldXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=xzZF34TOJYqmhTjpA6ipdsQmbyVV8Q6Nja1JgJcypaI=; b=LseAOgXMVccocmrKfmuPmXuWG7XCa0D8zwcm7oefC2jnRwJafL+DW9nUW4Y2duBwwK E1OBG3olGiuAnZ5pyjb9d6OpR2bg5XivaRxhKgn7Zzc610ZJHNMT6KHng1EQsKtIteaL 7A/44x5t4zjgPu5OsdKAYNzU2w9KzRiWgfFeixnXpR1gtXQaxwHcI5Oa58I0u4ykbuqJ DxuuUU8i5PcKI8mjaQ/bdU5FgjJe3+qRaDyHPMqyIwkFVxC6JYabNoLV8z3HkUXcsMrd jSWLDsaMh20QGxHiriPl2Y6f2Q2ansD3JVxTdi/WbiuwM0WLrHUpd0xaB1eNIa9eolIO PAug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=UgKXjw5F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k190si2196735pgc.39.2017.07.18.10.12.49; Tue, 18 Jul 2017 10:12:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=UgKXjw5F; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751912AbdGRRMq (ORCPT + 25 others); Tue, 18 Jul 2017 13:12:46 -0400 Received: from mail-io0-f180.google.com ([209.85.223.180]:36236 "EHLO mail-io0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751846AbdGRQ7l (ORCPT ); Tue, 18 Jul 2017 12:59:41 -0400 Received: by mail-io0-f180.google.com with SMTP id z62so17064639ioi.3 for ; Tue, 18 Jul 2017 09:59:41 -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=xzZF34TOJYqmhTjpA6ipdsQmbyVV8Q6Nja1JgJcypaI=; b=UgKXjw5FU2KWb9V74cKvtcY7hsUkIBZpvc+3ITx4C6/wTy6XVEsMR0cgCd+ZRgGFRR qUtl/m4JPJ4vjwTvlhtOzA3NTeWPZcD6zVUKsiAMd+nUmhvO1s8/NmI1tKC1fQB+ERDw SSJacCNSsbHxUeFHh/WFatIMa9Z50CC6ECey0= 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=xzZF34TOJYqmhTjpA6ipdsQmbyVV8Q6Nja1JgJcypaI=; b=WEJv7UrM0AuMrki5o8uhGszl5Tl4eGANvKGYkdUwDFxNsuPJn2cjb9nNzm9qLncWgO HL9yTfCGFEqGCHgh7EJE8v8Owp106clvwoYxF+oO1L+lFj/Buw38TX1zuVqhaQklObsu HgqUjfCN52boxCgrFBfZLfSmCweFNIJBrqxtE+HUnThyxHw/dNi2QppZAIygbeaeCcmf qgJ3RHLUnWMEQHoi1ieiLXKLatZ9QH5PisXVUmNxHAvezQnCIyAYRpDmk68KW9dOIVpg gWao3Eo06kUz0dYGpnc49rvFB5zTaCcPIteevSK2qHDDcou443r+Lfn3fPWZ6bNmF1ZM BNbg== X-Gm-Message-State: AIVw111yaTvWE3Jq93eiU7G9qyWe9WC8o+37NxnHuaPKoUk4n/4tuWjV gHckYft3DUOoq/2Q X-Received: by 10.107.7.33 with SMTP id 33mr1921566ioh.5.1500397181108; Tue, 18 Jul 2017 09:59:41 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 09:59:40 -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 04/38] KVM: arm/arm64: Check if nested virtualization is in use Date: Tue, 18 Jul 2017 11:58:30 -0500 Message-Id: <1500397144-16232-5-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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Nested virtualizaion is in use only if all three conditions are met: - The architecture supports nested virtualization. - The kernel parameter is set. - The userspace uses nested virtualiztion feature. Signed-off-by: Jintack Lim --- arch/arm/include/asm/kvm_host.h | 11 +++++++++++ arch/arm64/include/asm/kvm_host.h | 2 ++ arch/arm64/kvm/nested.c | 17 +++++++++++++++++ virt/kvm/arm/arm.c | 4 ++++ 4 files changed, 34 insertions(+) -- 1.9.1 diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 00b0f97..7e9e6c8 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -303,4 +303,15 @@ static inline int __init kvmarm_nested_cfg(char *buf) { return 0; } + +static inline int init_nested_virt(void) +{ + return 0; +} + +static inline bool nested_virt_in_use(struct kvm_vcpu *vcpu) +{ + return false; +} + #endif /* __ARM_KVM_HOST_H__ */ diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 6df0c7c..86d4b6c 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -387,5 +387,7 @@ static inline void __cpu_init_stage2(void) } int __init kvmarm_nested_cfg(char *buf); +int init_nested_virt(void); +bool nested_virt_in_use(struct kvm_vcpu *vcpu); #endif /* __ARM64_KVM_HOST_H__ */ diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 79f38da..9a05c76 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -24,3 +24,20 @@ int __init kvmarm_nested_cfg(char *buf) { return strtobool(buf, &nested_param); } + +int init_nested_virt(void) +{ + if (nested_param && cpus_have_const_cap(ARM64_HAS_NESTED_VIRT)) + kvm_info("Nested virtualization is supported\n"); + + return 0; +} + +bool nested_virt_in_use(struct kvm_vcpu *vcpu) +{ + if (nested_param && cpus_have_const_cap(ARM64_HAS_NESTED_VIRT) + && test_bit(KVM_ARM_VCPU_NESTED_VIRT, vcpu->arch.features)) + return true; + + return false; +} diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 1c1c772..36aae3a 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -1478,6 +1478,10 @@ int kvm_arch_init(void *opaque) if (err) goto out_err; + err = init_nested_virt(); + if (err) + return err; + err = init_subsystems(); if (err) goto out_hyp;