From patchwork Tue Jul 18 16:58:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 108148 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp6149145obm; Tue, 18 Jul 2017 10:00:39 -0700 (PDT) X-Received: by 10.84.179.36 with SMTP id a33mr2827523plc.144.1500397239778; Tue, 18 Jul 2017 10:00:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500397239; cv=none; d=google.com; s=arc-20160816; b=HiUCpk7G+YMI4YCyiPPvJMItAhQritY+jxdWxQUJ6yO+GAXQWAkWs6IDSahLLPdn1x 8NsfEHxhTnDJGFcd4kP4XoLMUcq9PEFuSTyzoQUNEOzIbZlOviGNm8TBeyzrzOaWT9ax 1YxXzHSFu8I/IO/V8+xZHtxTTP8J+2opee4nVO2e9pLGUuy3Y2HPu6TFNzX7ltykwy/I t3AzPHnuMqMTIvhNSr8u0vfEsZE5+fKYk/tciLLOdFkZDLnxw7yXpe/vmxfUTs+VHGss 3c8nrxahp3SEUXoSVz4m9YgTvwWOWjuYOGzZ8nHpSPFtydcaM6nI2A/qK0sObtUkjhLy zgwg== 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=gALCH1ZoFT3Icy79Atjbl956taiIBSgeUK/1cf1kfjk=; b=MUWo7FLiAA26xXtnxUPo1KtqynfpjyFj6qViIPck66RS9z6/BFzyuhnwlQL4pKlc3t oZN8MR4zHrB9TNA4GVc2pz8YNORvCi4lhB4A7Res5Cuf/PxUKfj/ax8Y1+xXkiQv93HS 3LkowiWMiNE68qmfUgQrLOWLTJT8QnHWlGSfzi824t/TVXzwrdC5dODSgLXDCsE07N9D tKD0aG0nd9xqfX7BoRnl0yBABRzim01zAYGy1jh6nH86t3e3fNnZ0AGtesfrLV3ns1yz fRV0LCGdX60xCOAM01BmC1RdhAD1QGyQjlYKapPpFVDJ98/ZQtbhoIJS46kQorM39WLB ANNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=AzC5Ax6b; 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 c13si1938721pfl.475.2017.07.18.10.00.39; Tue, 18 Jul 2017 10:00:39 -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=AzC5Ax6b; 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 S1752503AbdGRRAg (ORCPT + 25 others); Tue, 18 Jul 2017 13:00:36 -0400 Received: from mail-io0-f177.google.com ([209.85.223.177]:34668 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752406AbdGRRA1 (ORCPT ); Tue, 18 Jul 2017 13:00:27 -0400 Received: by mail-io0-f177.google.com with SMTP id l7so10058687iof.1 for ; Tue, 18 Jul 2017 10:00:27 -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=gALCH1ZoFT3Icy79Atjbl956taiIBSgeUK/1cf1kfjk=; b=AzC5Ax6bSVyDr0YuARq4LHE9eHy0kgr8Y0N2eAIRsNhWu/yQ1Negd1MC0MwLwgjck6 Naqi5cu12u8kpeJyhFNIeLk9Fm+rmTg/GfGQNGZA7eAhvyNtJeDnGWTaiKrv3g7kot62 7nBpZs3rSmaBJhpB6sokwSteb2wDbpkzhPKI8= 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=gALCH1ZoFT3Icy79Atjbl956taiIBSgeUK/1cf1kfjk=; b=gpFdHB9yo2igAOZA7/EcbqeoTm3Eg1odHdsQCP01uaAbRDXGzb2I0Bn70yXD5OTIuG dgt1M3jblPHEjf6Tw4BsrPsTzjgk5SJA/4QWjuunuU/CB0ObJoX8pCmZcl5fWgzRqt+y ZJ6ZyGrzp5y46RBhY7Hv0u9Y21K+gVwECqPKyJfOggo0xrrhyLC+1iKi2uF2eUfWBJS7 j+3U3MMTFWfUs68c1iBQ0oHVQ5N1Jj8em6i0VrIwHD9gotSV1IFjgEuwrRBE9xfLuxj/ mdGrdaIoFB77Qv34KC4rxP3y1WijfKHHjrorwc27iJZDVFpBU7Djs2616gZC/FmomLlx CcwA== X-Gm-Message-State: AIVw111JKgj4S+pZt6LQ2ElADIxmyMIfOnDrRJFR/JaXgVHmMHkqpNqz ftHlTy4k8sWcX1V9 X-Received: by 10.107.200.211 with SMTP id y202mr2739340iof.16.1500397223819; Tue, 18 Jul 2017 10:00:23 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 10:00:23 -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 28/38] KVM: arm64: Emulate EL12 register accesses from the virtual EL2 Date: Tue, 18 Jul 2017 11:58:54 -0500 Message-Id: <1500397144-16232-29-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 With HCR_EL2.NV bit set, accesses to EL12 registers in the virtual EL2 trap to EL2. Handle those traps just like we do for EL1 registers. One exception is CNTKCTL_EL12. We don't trap on CNTKCTL_EL1 for non-VHE virtual EL2 because we don't have to. However, accessing CNTKCTL_EL12 will trap since it's one of the EL12 registers controlled by HCR_EL2.NV bit. Therefore, add a handler for it and don't treat it as a non-trap-registers when preparing a shadow context. Move EL12 system register macros to a common place to reuse them. Signed-off-by: Jintack Lim --- arch/arm64/include/asm/kvm_hyp.h | 24 ------------------------ arch/arm64/include/asm/sysreg.h | 24 ++++++++++++++++++++++++ arch/arm64/kvm/context.c | 7 +++++++ arch/arm64/kvm/sys_regs.c | 25 +++++++++++++++++++++++++ 4 files changed, 56 insertions(+), 24 deletions(-) -- 1.9.1 diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h index 4572a9b..353b895 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -73,30 +73,6 @@ #define read_sysreg_el1(r) read_sysreg_elx(r, _EL1, _EL12) #define write_sysreg_el1(v,r) write_sysreg_elx(v, r, _EL1, _EL12) -/* The VHE specific system registers and their encoding */ -#define sctlr_EL12 sys_reg(3, 5, 1, 0, 0) -#define cpacr_EL12 sys_reg(3, 5, 1, 0, 2) -#define ttbr0_EL12 sys_reg(3, 5, 2, 0, 0) -#define ttbr1_EL12 sys_reg(3, 5, 2, 0, 1) -#define tcr_EL12 sys_reg(3, 5, 2, 0, 2) -#define afsr0_EL12 sys_reg(3, 5, 5, 1, 0) -#define afsr1_EL12 sys_reg(3, 5, 5, 1, 1) -#define esr_EL12 sys_reg(3, 5, 5, 2, 0) -#define far_EL12 sys_reg(3, 5, 6, 0, 0) -#define mair_EL12 sys_reg(3, 5, 10, 2, 0) -#define amair_EL12 sys_reg(3, 5, 10, 3, 0) -#define vbar_EL12 sys_reg(3, 5, 12, 0, 0) -#define contextidr_EL12 sys_reg(3, 5, 13, 0, 1) -#define cntkctl_EL12 sys_reg(3, 5, 14, 1, 0) -#define cntp_tval_EL02 sys_reg(3, 5, 14, 2, 0) -#define cntp_ctl_EL02 sys_reg(3, 5, 14, 2, 1) -#define cntp_cval_EL02 sys_reg(3, 5, 14, 2, 2) -#define cntv_tval_EL02 sys_reg(3, 5, 14, 3, 0) -#define cntv_ctl_EL02 sys_reg(3, 5, 14, 3, 1) -#define cntv_cval_EL02 sys_reg(3, 5, 14, 3, 2) -#define spsr_EL12 sys_reg(3, 5, 4, 0, 0) -#define elr_EL12 sys_reg(3, 5, 4, 0, 1) - /** * hyp_alternate_select - Generates patchable code sequences that are * used to switch between two implementations of a function, depending diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index b01c608..b8d4d0c 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -338,6 +338,30 @@ #define SYS_CNTVOFF_EL2 sys_reg(3, 4, 14, 0, 3) #define SYS_CNTHCTL_EL2 sys_reg(3, 4, 14, 1, 0) +/* The VHE specific system registers and their encoding */ +#define sctlr_EL12 sys_reg(3, 5, 1, 0, 0) +#define cpacr_EL12 sys_reg(3, 5, 1, 0, 2) +#define ttbr0_EL12 sys_reg(3, 5, 2, 0, 0) +#define ttbr1_EL12 sys_reg(3, 5, 2, 0, 1) +#define tcr_EL12 sys_reg(3, 5, 2, 0, 2) +#define afsr0_EL12 sys_reg(3, 5, 5, 1, 0) +#define afsr1_EL12 sys_reg(3, 5, 5, 1, 1) +#define esr_EL12 sys_reg(3, 5, 5, 2, 0) +#define far_EL12 sys_reg(3, 5, 6, 0, 0) +#define mair_EL12 sys_reg(3, 5, 10, 2, 0) +#define amair_EL12 sys_reg(3, 5, 10, 3, 0) +#define vbar_EL12 sys_reg(3, 5, 12, 0, 0) +#define contextidr_EL12 sys_reg(3, 5, 13, 0, 1) +#define cntkctl_EL12 sys_reg(3, 5, 14, 1, 0) +#define cntp_tval_EL02 sys_reg(3, 5, 14, 2, 0) +#define cntp_ctl_EL02 sys_reg(3, 5, 14, 2, 1) +#define cntp_cval_EL02 sys_reg(3, 5, 14, 2, 2) +#define cntv_tval_EL02 sys_reg(3, 5, 14, 3, 0) +#define cntv_ctl_EL02 sys_reg(3, 5, 14, 3, 1) +#define cntv_cval_EL02 sys_reg(3, 5, 14, 3, 2) +#define spsr_EL12 sys_reg(3, 5, 4, 0, 0) +#define elr_EL12 sys_reg(3, 5, 4, 0, 1) + #define SYS_SP_EL2 sys_reg(3, 6, 4, 1, 0) /* Common SCTLR_ELx flags. */ diff --git a/arch/arm64/kvm/context.c b/arch/arm64/kvm/context.c index e1bc753..f3d3398 100644 --- a/arch/arm64/kvm/context.c +++ b/arch/arm64/kvm/context.c @@ -121,6 +121,13 @@ static void copy_shadow_non_trap_el1_state(struct kvm_vcpu *vcpu, bool setup) for (i = 0; i < ARRAY_SIZE(el1_non_trap_regs); i++) { const int sr = el1_non_trap_regs[i]; + /* + * We trap on cntkctl_el12 accesses from virtual EL2 as suppose + * to not trapping on cntlctl_el1 accesses. + */ + if (vcpu_el2_e2h_is_set(vcpu) && sr == CNTKCTL_EL1) + continue; + if (setup) s_sys_regs[sr] = vcpu_sys_reg(vcpu, sr); else diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index b3e0cb8..2aa922c 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -905,6 +905,14 @@ static inline void access_rw(struct sys_reg_params *p, u64 *sysreg) *sysreg = p->regval; } +static bool access_cntkctl_el12(struct kvm_vcpu *vcpu, + struct sys_reg_params *p, + const struct sys_reg_desc *r) +{ + access_rw(p, &vcpu_sys_reg(vcpu, r->reg)); + return true; +} + static u64 *get_special_reg(struct kvm_vcpu *vcpu, struct sys_reg_params *p) { u64 reg = sys_reg(p->Op0, p->Op1, p->CRn, p->CRm, p->Op2); @@ -1201,6 +1209,23 @@ static bool access_cpacr(struct kvm_vcpu *vcpu, { SYS_DESC(SYS_CNTVOFF_EL2), trap_el2_regs, reset_val, CNTVOFF_EL2, 0 }, { SYS_DESC(SYS_CNTHCTL_EL2), trap_el2_regs, reset_val, CNTHCTL_EL2, 0 }, + { SYS_DESC(sctlr_EL12), access_vm_reg, reset_val, SCTLR_EL1, 0x00C50078 }, + { SYS_DESC(cpacr_EL12), access_cpacr, reset_val, CPACR_EL1, 0 }, + { SYS_DESC(ttbr0_EL12), access_vm_reg, reset_unknown, TTBR0_EL1 }, + { SYS_DESC(ttbr1_EL12), access_vm_reg, reset_unknown, TTBR1_EL1 }, + { SYS_DESC(tcr_EL12), access_vm_reg, reset_val, TCR_EL1, 0 }, + { SYS_DESC(spsr_EL12), access_spsr}, + { SYS_DESC(elr_EL12), access_elr}, + { SYS_DESC(afsr0_EL12), access_vm_reg, reset_unknown, AFSR0_EL1 }, + { SYS_DESC(afsr1_EL12), access_vm_reg, reset_unknown, AFSR1_EL1 }, + { SYS_DESC(esr_EL12), access_vm_reg, reset_unknown, ESR_EL1 }, + { SYS_DESC(far_EL12), access_vm_reg, reset_unknown, FAR_EL1 }, + { SYS_DESC(mair_EL12), access_vm_reg, reset_unknown, MAIR_EL1 }, + { SYS_DESC(amair_EL12), access_vm_reg, reset_amair_el1, AMAIR_EL1 }, + { SYS_DESC(vbar_EL12), access_vbar, reset_val, VBAR_EL1, 0 }, + { SYS_DESC(contextidr_EL12), access_vm_reg, reset_val, CONTEXTIDR_EL1, 0 }, + { SYS_DESC(cntkctl_EL12), access_cntkctl_el12, reset_val, CNTKCTL_EL1, 0 }, + { SYS_DESC(SYS_SP_EL2), NULL, reset_special, SP_EL2, 0}, };