From patchwork Tue Jul 18 16:58:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 108147 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp6148947obm; Tue, 18 Jul 2017 10:00:29 -0700 (PDT) X-Received: by 10.101.89.6 with SMTP id f6mr2748387pgu.270.1500397229360; Tue, 18 Jul 2017 10:00:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500397229; cv=none; d=google.com; s=arc-20160816; b=G8DblqX/CNHEe/liuiNY7qfX6V6M+iYM36epKfZKjXnFTSpmTE53/9OR25z0aadhkg p6HbcqsxYX0bPU/5l0v57tLnIMFPuU+FeR0fNFj4yHqz3izEbYUcgEvZ09hD1VxOeOp9 dfd8WjD4xFS4npYJfKSqqTk8ptRVvfusGlhIpwrqH5EccO/VaA22/YE882DZKvpka+ww kjSRtS5YoIpqFbxOQCoXSjQ24AI3PKK+3M4Uj2IMO8cGu75JrVGJW2x1lPDcMOjWIX6D PprncI+3uvYeq5dbEphmiDI6Ihy7k0s1eb6dLhbsvLJFe2tN02uDaC7qebKWX8T15tkU vw8Q== 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=HD6tiVnPQXrP5ruY0ol51yXrKvh5Xohm2NIzSxIZQ3Y=; b=cNBfioB0ZRJy4kK98+x/2tNAo3VX7veBzKCTJ9YaPvw799e37dHIm1mBaoc6kHKFH+ AEWYOk/1vUUYjMPPHFafzfHen70C/rUJ9LhMufigLbCgJzN40//6U0Z+IGsRFE9cY0vO UsfqbJ/JcCN/95aUiQdM2jZGLWOPy2miOusgREGCizLWKAQBZYkMFfVXHcyVxMJ9FBok z/QFVLBrc/Yi18dg6SZZhE0srYiYKexztHmWI0AciW2YJUxUFbn6PVklviAvzh7Rw1uR 6YJCs3KKM89v2Ay18noOQ/tsx2awOJxG7BGTr/FJxFqKHc2zYh07M6Ih8Gm8h+pUEtkb e1nQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=jafG7YUK; 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 c9si2215482plk.459.2017.07.18.10.00.29; Tue, 18 Jul 2017 10:00:29 -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=jafG7YUK; 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 S1752402AbdGRRAZ (ORCPT + 25 others); Tue, 18 Jul 2017 13:00:25 -0400 Received: from mail-io0-f176.google.com ([209.85.223.176]:36480 "EHLO mail-io0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752358AbdGRRAT (ORCPT ); Tue, 18 Jul 2017 13:00:19 -0400 Received: by mail-io0-f176.google.com with SMTP id z62so17075007ioi.3 for ; Tue, 18 Jul 2017 10:00:19 -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=HD6tiVnPQXrP5ruY0ol51yXrKvh5Xohm2NIzSxIZQ3Y=; b=jafG7YUK+DQ3X03hYXGXZp5KqNOJFsxz7/eCl6cP7RFF7fPBZ8zfaRfk38Pov1Czal eb+MUHi6iYGuTrE+Q6VC/MmmClY6XsNikyAZGmBS6twxgBRfjTNc78MFc08i8LHvSuTg flGVcXXMRFx15gwh3VcEzA7h3DDLpautpE6AI= 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=HD6tiVnPQXrP5ruY0ol51yXrKvh5Xohm2NIzSxIZQ3Y=; b=s+goSsAlqWU50UDUlOSJFA+rslGRi+yozrRrrHzLmGOQSh5DnRy2rXNi/edtmQoZU6 CrsZ5DolJZiP3k25wXBIc+OSY6XJRJ/sXo8saM/kRtQwLeVMPfgRl4/4vwAGksypqZ3Z PEYCA+Mr9Ysba9dWSma8i5D72ZbYfdhDEwzFGhwe6yP21Ug0HsQIkdhAo2/lQB2SohvF H/GJ4aLJoRBzsUyn2id4+DlkFbgPRKSocj0DpyD9N+4/ugSYaxITpq7m0tiDaJOBL7Kh 8bF8SQOIKE6sDw7y0VgU2B4Uv7jzCntU+mDtuJDz+uFnFp6qMOYMbjc7HX4re1GpoP5i 6m0w== X-Gm-Message-State: AIVw11345IO+mAIfAhmX0wZCGESUHYQCXrQJX0n54bn0idxUMNtUZ2XC aUjTdBTcP4mvcqSJ X-Received: by 10.107.190.197 with SMTP id o188mr2646791iof.160.1500397218022; Tue, 18 Jul 2017 10:00:18 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 10:00:17 -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 25/38] KVM: arm64: Respect virtual CPTR_EL2.TFP setting Date: Tue, 18 Jul 2017 11:58:51 -0500 Message-Id: <1500397144-16232-26-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 traps due to FP/ASIMD register accesses to the virtual EL2 if virtual CPTR_EL2.TFP is set. Note that if TFP bit is set, then even accesses to FP/ASIMD register from EL2 as well as NS EL0/1 will trap to EL2. So, we don't check the VM's exception level. Signed-off-by: Jintack Lim --- arch/arm64/kernel/asm-offsets.c | 1 + arch/arm64/kvm/handle_exit.c | 15 +++++++++++---- arch/arm64/kvm/hyp/entry.S | 13 +++++++++++++ arch/arm64/kvm/hyp/hyp-entry.S | 2 +- 4 files changed, 26 insertions(+), 5 deletions(-) -- 1.9.1 diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index b3bb7ef..f5117a3 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -134,6 +134,7 @@ int main(void) DEFINE(CPU_FP_REGS, offsetof(struct kvm_regs, fp_regs)); DEFINE(VCPU_FPEXC32_EL2, offsetof(struct kvm_vcpu, arch.ctxt.sys_regs[FPEXC32_EL2])); DEFINE(VCPU_HOST_CONTEXT, offsetof(struct kvm_vcpu, arch.host_cpu_context)); + DEFINE(VIRTUAL_CPTR_EL2, offsetof(struct kvm_vcpu, arch.ctxt.sys_regs[CPTR_EL2])); #endif #ifdef CONFIG_CPU_PM DEFINE(CPU_SUSPEND_SZ, sizeof(struct cpu_suspend_ctx)); diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 25ec824..d4e7b2b 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -84,11 +84,18 @@ static int handle_smc(struct kvm_vcpu *vcpu, struct kvm_run *run) } /* - * Guest access to FP/ASIMD registers are routed to this handler only - * when the system doesn't support FP/ASIMD. + * When the system supports FP/ASMID and we are NOT running nested + * virtualization, FP/ASMID traps are handled in EL2 directly. + * This handler handles the cases those are not belong to the above case. */ -static int handle_no_fpsimd(struct kvm_vcpu *vcpu, struct kvm_run *run) +static int kvm_handle_fpasimd(struct kvm_vcpu *vcpu, struct kvm_run *run) { + + /* This is for nested virtualization */ + if (vcpu_sys_reg(vcpu, CPTR_EL2) & CPTR_EL2_TFP) + return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + + /* This is the case when the system doesn't support FP/ASIMD. */ kvm_inject_undefined(vcpu); return 1; } @@ -220,7 +227,7 @@ static int kvm_handle_eret(struct kvm_vcpu *vcpu, struct kvm_run *run) [ESR_ELx_EC_BREAKPT_LOW]= kvm_handle_guest_debug, [ESR_ELx_EC_BKPT32] = kvm_handle_guest_debug, [ESR_ELx_EC_BRK64] = kvm_handle_guest_debug, - [ESR_ELx_EC_FP_ASIMD] = handle_no_fpsimd, + [ESR_ELx_EC_FP_ASIMD] = kvm_handle_fpasimd, }; static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu) diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index 12ee62d..95af673 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -158,6 +158,19 @@ abort_guest_exit_end: 1: ret ENDPROC(__guest_exit) +ENTRY(__fpsimd_guest_trap) + // If virtual CPTR_EL2.TFP is set, then forward the trap to the + // virtual EL2. For the non-nested case, this bit is always 0. + mrs x1, tpidr_el2 + ldr x0, [x1, #VIRTUAL_CPTR_EL2] + and x0, x0, #CPTR_EL2_TFP + cbnz x0, 1f + b __fpsimd_guest_restore +1: + mov x0, #ARM_EXCEPTION_TRAP + b __guest_exit +ENDPROC(__fpsimd_guest_trap) + ENTRY(__fpsimd_guest_restore) stp x2, x3, [sp, #-16]! stp x4, lr, [sp, #-16]! diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index 5170ce1..ab169fd 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -113,7 +113,7 @@ el1_trap: */ alternative_if_not ARM64_HAS_NO_FPSIMD cmp x0, #ESR_ELx_EC_FP_ASIMD - b.eq __fpsimd_guest_restore + b.eq __fpsimd_guest_trap alternative_else_nop_endif mrs x1, tpidr_el2