From patchwork Tue Jul 18 16:58:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 108142 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp6148156obm; Tue, 18 Jul 2017 09:59:46 -0700 (PDT) X-Received: by 10.99.52.72 with SMTP id b69mr2735329pga.240.1500397186071; Tue, 18 Jul 2017 09:59:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500397186; cv=none; d=google.com; s=arc-20160816; b=ntci4HpRg87A/7flkqQYHNhmn1RHjtz0OANhlN2Pu3VbkclbAr3SQwOsGeMexewOrd EVhS9serObBx00ohUNZcuxCvETaEJXcCSJXI6hYmat6B0kczyVBHHSYOn1RRxTBN+jm6 n4M4HuGesZ2drib4WZqxA3GAjqu7TWDl9n3FPzAFWuOIizrVubi6+tLE0b19ze99YCKY hXACzgTofgGTOJ12caFgLTKePRrYGOF1jEFcBnuA/jdERt9ZG4ZpyDSU+WkTtPNh6kw5 yrzY0c36Lk5qGdfukFmq8h6h0aAU1A225qJTPQifPdm1/ydOFfDreegtqYHgocfC/cuu 90Mg== 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=NHh5RazUl2Nkio6vZFiVbdU8c6ChO4/5Unh/TqNnEvc=; b=u/4aG6bC23l0WuMrsjYk5+WVLIVqPYQ390uRDIN1cVgKcvS0f9TrTqmoGXsHpKBQ9d vQSgZ2Dn2tXemeacCOfWFkmdrzJBvlZggwQvV4XAsHEuNCK5BxAkSjWvsGK81DD83r46 1rQAk4rz6MYi6JOsksAkZzkXcSYQ0iisya+PpXGv8zmq1PVbTSQnauPK4dbZTQXxkkN/ gfwcvOTRmctAZaCEu1vDJrecWRsga8+5qYGz5gGPtIolsgQYQvY5mHGMx96y8jHRbvuy RZVSObYTdu6ROPjhbvd6p15FsyqEz8wmBcbKhudD9s7l9+8OMO/hr70LpHd2G1o1ICLw 8BSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=Lijnh/uv; 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 33si2196043plk.13.2017.07.18.09.59.45; Tue, 18 Jul 2017 09:59:46 -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=Lijnh/uv; 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 S1751864AbdGRQ7m (ORCPT + 25 others); Tue, 18 Jul 2017 12:59:42 -0400 Received: from mail-io0-f178.google.com ([209.85.223.178]:34374 "EHLO mail-io0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751557AbdGRQ7j (ORCPT ); Tue, 18 Jul 2017 12:59:39 -0400 Received: by mail-io0-f178.google.com with SMTP id l7so10046303iof.1 for ; Tue, 18 Jul 2017 09:59:39 -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=NHh5RazUl2Nkio6vZFiVbdU8c6ChO4/5Unh/TqNnEvc=; b=Lijnh/uvn7vrGAesLBXAvisCnI3zV4rEYAy0mj+uVHPbt/s/aVl9gVq8M9Zf5HqBho bU2BBYAdsfg9IvH6Agi5pGBLArZ47ZqpVyYg1gtd5dgeG2/ji9QUBJ6rhOKOdjsilTST 1ztWX+KUHLY9zgCiJ0bwNZ9LAxqu7xG3bTXf4= 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=NHh5RazUl2Nkio6vZFiVbdU8c6ChO4/5Unh/TqNnEvc=; b=UjkLvlxmkz2lCl3cdmfhacMWXdAVZQfjvBNbeHrG1lK9ZCGiOBsfrpH0IbUEERHEBV weiINt3Z/GcWAJZk7aGfh3UXVzREdT09TrbVe8JtLZ9zNCLvJZpRWckZgtiyZcIbC9OE Bo98mT5Mpq/DTF7E1g+Gjy+wP6nonDyUCX9nsEztbtqzuL6uTnX5NLJn4DRDxTUpDdZl EJ1VE0yY8/OMbnDfIkhwZHxwg63C8EwfgZghiBU9hQ+qIWinHqcJlDnv7N+G1H+lyRu0 ZMwnu0uNlkg4FcRXcbYPBpCDkWGZtPoBdgDegNhV7QRNkhuoMQqibC2tnryAxyVdyWQb dlRw== X-Gm-Message-State: AIVw11184Nhhq5vbTPitVBxESQ8Kg30bxUm5CNd6libb41nc0jZM6jSX iTVobhjM4gKkbY22 X-Received: by 10.107.205.136 with SMTP id d130mr2613826iog.109.1500397179316; Tue, 18 Jul 2017 09:59:39 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 09:59:38 -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 03/38] KVM: arm64: Add KVM nesting feature Date: Tue, 18 Jul 2017 11:58:29 -0500 Message-Id: <1500397144-16232-4-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 From: Christoffer Dall Set the initial exception level of the guest to EL2 if nested virtualization feature is enabled. Signed-off-by: Christoffer Dall Signed-off-by: Jintack Lim --- arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/include/uapi/asm/kvm.h | 1 + arch/arm64/kvm/reset.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index dcc4df8..6df0c7c 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -39,7 +39,7 @@ #define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS -#define KVM_VCPU_MAX_FEATURES 4 +#define KVM_VCPU_MAX_FEATURES 5 #define KVM_REQ_SLEEP \ KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 9f3ca24..4a71a72 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -99,6 +99,7 @@ struct kvm_regs { #define KVM_ARM_VCPU_EL1_32BIT 1 /* CPU running a 32bit VM */ #define KVM_ARM_VCPU_PSCI_0_2 2 /* CPU uses PSCI v0.2 */ #define KVM_ARM_VCPU_PMU_V3 3 /* Support guest PMUv3 */ +#define KVM_ARM_VCPU_NESTED_VIRT 4 /* Support nested virtualization */ struct kvm_vcpu_init { __u32 target; diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index 3256b92..1353516 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -41,6 +41,11 @@ PSR_F_BIT | PSR_D_BIT), }; +static const struct kvm_regs default_regs_reset_el2 = { + .regs.pstate = (PSR_MODE_EL2h | PSR_A_BIT | PSR_I_BIT | + PSR_F_BIT | PSR_D_BIT), +}; + static const struct kvm_regs default_regs_reset32 = { .regs.pstate = (COMPAT_PSR_MODE_SVC | COMPAT_PSR_A_BIT | COMPAT_PSR_I_BIT | COMPAT_PSR_F_BIT), @@ -106,6 +111,9 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu) if (!cpu_has_32bit_el1()) return -EINVAL; cpu_reset = &default_regs_reset32; + } else if (test_bit(KVM_ARM_VCPU_NESTED_VIRT, + vcpu->arch.features)) { + cpu_reset = &default_regs_reset_el2; } else { cpu_reset = &default_regs_reset; }