From patchwork Tue Jul 18 16:59:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 108150 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp6149335obm; Tue, 18 Jul 2017 10:00:51 -0700 (PDT) X-Received: by 10.99.165.3 with SMTP id n3mr2668018pgf.233.1500397251190; Tue, 18 Jul 2017 10:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500397251; cv=none; d=google.com; s=arc-20160816; b=YY+lOl823S96mVTTjV8sm31l5xZALwUxldgPitUcZCbWHSLxLdi+H3V3XmcMOO13bH QFrDEnhKRZTLP3TiNX/2ZGREy2huKgw/Y45kCCn+7qSSNQph9KAtsGDh/fgH+K8fDglS 1PooaVHdWo+LOrBPLWDlHGt5GIULaaip1iWc9EnCkyZAYeAUb64/H8BdObw9DhtlmSou xivv9Apypn+bV/CaQ8LIoZ27oIddQebGQo/jtOHDCfNo7vaX1GwWiqoXrU3DpqCPuWp6 G8nvyZ66VSqX8aRI+ACcXGdLLn7fwOfGvvtTcfwsnRGnMfxcWa+kVySxxiLjqmvDEV/J AGFg== 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=lR027f7qZ5QxO56n6CVZjTMOUH7Ve3W0xSMbpyCKRcM=; b=urVDsxod9a60kEjZe+WD2rn9wfc3ExM03dLp70LI+rGYxChJMItrk05e3jXbZX41l1 8hRe+Fd1OWyKhVHCuuG1vGsw6S83t/R9nW61c49QYpGFogWnSwkZhGJ99ivWnFTEMJZV m4jUnO374z7C69zdCsFoA/yNOQsweocCOIyYaEHUPCZksj+WKVn0fiROgT8T0JwgYJXT W5nZ9C19wtz0oWjrkWLjFQcG6BcX4WPLzCShSYDuA8jRK1+h0XHjByQ0pM5UEH6Xd9Re HQrtLL55kpNcli++DiSITQ4sywyg9bbFi5AcFuti6NfTCmWOsYVMdbXMuT18VwvmmlcQ fCmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=fWzLUxN9; 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 67si2215908pla.640.2017.07.18.10.00.50; Tue, 18 Jul 2017 10:00:51 -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=fWzLUxN9; 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 S1752616AbdGRRAs (ORCPT + 25 others); Tue, 18 Jul 2017 13:00:48 -0400 Received: from mail-io0-f173.google.com ([209.85.223.173]:35730 "EHLO mail-io0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752560AbdGRRAo (ORCPT ); Tue, 18 Jul 2017 13:00:44 -0400 Received: by mail-io0-f173.google.com with SMTP id k71so16793045iod.2 for ; Tue, 18 Jul 2017 10:00:43 -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=lR027f7qZ5QxO56n6CVZjTMOUH7Ve3W0xSMbpyCKRcM=; b=fWzLUxN9HzwwzaERqQ7mHD3muw6Wbr/PMN3jfFQWHrrgIWhb1Segs/q5v33HxiikdY i1cPSLyCQYti6W0uDMLFG+GmUjAmGD4f28bs6CbAMg2dRg3Q4JODzM3b2aNBO+PVGR9k 14lqALi35OGLZdRG2Foy1zfkstz0e2tNw15tw= 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=lR027f7qZ5QxO56n6CVZjTMOUH7Ve3W0xSMbpyCKRcM=; b=WaQpjEku2pR9bseRbLMqGRS9NGwzMBPVbyYUzHnyFnrJOoYsqBQklo2hye6UUmFao2 nnjejsx654N4Gxj0fDA3lggexATEdjGDH7cqOUm2B59iu4K7dpGCpoeUqVt/b/ZYo4Gn I9RCJt3De9N4mA/TTcEGLNpks4U1c6YgsFYwB+6nT46cTWjXxN+9EcvLh7Xdxp1CTpri DhK14epW9uPoREzmKkeuF2cLlJD7x8HqutgeqkJLuD1hZh97kjybMPxeERcmLwNcTWxZ WWCUfGHADU00zP9aOXsG8wD0zxpHK6ZkU93djj6s3x4l10qh8Jf9Jc6ar1OQuDDYA/oX j0qw== X-Gm-Message-State: AIVw110nJ2+A5hCHBl5KY1rU6BuQCkKAcWCVGt2NiD8nXVHmUO2IKp91 U12QLcGPvWSbN2zl X-Received: by 10.107.190.197 with SMTP id o188mr2649325iof.160.1500397241165; Tue, 18 Jul 2017 10:00: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.10.00.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 10:00: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 , Jintack Lim Subject: [RFC PATCH v2 37/38] KVM: arm64: Respect the virtual HCR_EL2.NV1 bit setting Date: Tue, 18 Jul 2017 11:59:03 -0500 Message-Id: <1500397144-16232-38-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 Forward ELR_EL1, SPSR_EL1 and VBAR_EL1 traps to the virtual EL2 if the virtual HCR_EL2.NV bit is set. This is for recursive nested virtualization. Signed-off-by: Jintack Lim --- arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/kvm/sys_regs.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) -- 1.9.1 diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index aeaac4e..a1274b7 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -23,6 +23,7 @@ #include /* Hyp Configuration Register (HCR) bits */ +#define HCR_NV1 (UL(1) << 43) #define HCR_NV (UL(1) << 42) #define HCR_E2H (UL(1) << 34) #define HCR_ID (UL(1) << 33) diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 3e4ec5e..6f67666 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1031,6 +1031,15 @@ static bool trap_el2_regs(struct kvm_vcpu *vcpu, return true; } +/* This function is to support the recursive nested virtualization */ +static bool forward_nv1_traps(struct kvm_vcpu *vcpu, struct sys_reg_params *p) +{ + if (!vcpu_mode_el2(vcpu) && (vcpu_sys_reg(vcpu, HCR_EL2) & HCR_NV1)) + return true; + + return false; +} + static bool access_elr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, const struct sys_reg_desc *r) @@ -1038,6 +1047,9 @@ static bool access_elr(struct kvm_vcpu *vcpu, if (el12_reg(p) && forward_nv_traps(vcpu)) return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + if (!el12_reg(p) && forward_nv1_traps(vcpu, p)) + return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + access_rw(p, &vcpu->arch.ctxt.gp_regs.elr_el1); return true; } @@ -1049,6 +1061,9 @@ static bool access_spsr(struct kvm_vcpu *vcpu, if (el12_reg(p) && forward_nv_traps(vcpu)) return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + if (!el12_reg(p) && forward_nv1_traps(vcpu, p)) + return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + access_rw(p, &vcpu->arch.ctxt.gp_regs.spsr[KVM_SPSR_EL1]); return true; } @@ -1060,6 +1075,9 @@ static bool access_vbar(struct kvm_vcpu *vcpu, if (el12_reg(p) && forward_nv_traps(vcpu)) return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + if (!el12_reg(p) && forward_nv1_traps(vcpu, p)) + return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + access_rw(p, &vcpu_sys_reg(vcpu, r->reg)); return true; }