From patchwork Tue Jul 18 16:59:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jintack Lim X-Patchwork-Id: 108153 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp6149974obm; Tue, 18 Jul 2017 10:01:20 -0700 (PDT) X-Received: by 10.84.128.9 with SMTP id 9mr2701454pla.61.1500397280215; Tue, 18 Jul 2017 10:01:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500397280; cv=none; d=google.com; s=arc-20160816; b=b4puTSQ9J9XDJUePBSa9Q0Ayv/rTF9fw21jyR0xBfozMihEgY/0autAdFPGEMyrQBJ 3kH1Oee0ok6v9FB4OUnV6nrqfkbURuJ209buAmwi37h/wpNss5ILIHQ9tWurGj4ph6Al AiozAaPtw8oAeqZLYtnoM2xWg1mrS7m8QUIUQYKVhyQNciyo0eVhDUDcW3rB4knjMeQL JyHPO3FC49BLX6E50oVY0KaKDOwPHnURXf7PLUyype15mjc4u7wmtIHG/r1foBaIADk2 hI4ks2AK/EFDXd8zURtjz/TQ4u2s+iR0vEIK7i4SwTInsBC8QvL7kiLiqAsXQJiB7xY4 bWdQ== 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=L9cgc0L6RjcLZisZBC8Z3TKkptdPzDjn9YtsY+MrqEY=; b=OFPMof+1SQQh5pUTltk6zKeoCS/jUlkTN2AtjDIe8gJh4NPnW5smCA4yEH+SQ9gBQ+ 6nR4P+mX9mnZiTz19fGDzXko14OGqbS2zb9ohifZD2qSK9SXtaubKh4f0fWgmUp3xoJx zLlEUmOFFlCDIwvpytsc9/eF9B/kaKdvEbElOdxEKrIK0rct2Mq2KkfOEeR2+0Xh3RK1 3fDDVSb4eCJPWjiKqrmFFnroGzIQQRUQXeI5e1YBTEYZwR85eIa+ADtBPQ1JWJ6YEwzs sRJVVajpwsQhI5VlHcqywRhzy79F1N/0Pp09SE3F7Ut+C15QdFbt9QQSdkByI2648AN8 u1xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=A8xGIR8c; 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 8si2124343pfs.181.2017.07.18.10.01.19; Tue, 18 Jul 2017 10:01:20 -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=A8xGIR8c; 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 S1752617AbdGRRBQ (ORCPT + 25 others); Tue, 18 Jul 2017 13:01:16 -0400 Received: from mail-io0-f176.google.com ([209.85.223.176]:35732 "EHLO mail-io0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434AbdGRRAo (ORCPT ); Tue, 18 Jul 2017 13:00:44 -0400 Received: by mail-io0-f176.google.com with SMTP id k71so16793139iod.2 for ; Tue, 18 Jul 2017 10:00:44 -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=L9cgc0L6RjcLZisZBC8Z3TKkptdPzDjn9YtsY+MrqEY=; b=A8xGIR8cjFvMpb4NlKe88YwCdmdzskf5EnsJ8u0sGEt8agMBtL2HA/rsSbAByz4sGn ovD4D98urI/LmkZTnCAytUvNbCVSa1JmGZQDyILbkbifa3SFr/Hx+lzK694Gdr8cNU6A cOQecI45VFrvYP34/Np9nOMFNFfZfrVInKyZc= 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=L9cgc0L6RjcLZisZBC8Z3TKkptdPzDjn9YtsY+MrqEY=; b=phsRmDcrbMwZ8GfKRGYT2PT1Hi4nF6RP17GAoUkWQadyDKK3rMh4mVAZ/QISMYREfX SlyEHbmINQvbT759bZVs+LZpYbIdBqmrX4AccGwUhDnKt3mhsX8m5QbyQ72PhdzK+it5 m9XwF82e9l2XhODFIdDw27TWjh2emABlv/0v2YPNZwZn/LL5xOia5wIG89yCkAnhR9yg 6Zsnt5l1WPoKFRvHU4rs+va8wV3DKfEvQOdqvQX9tqi7At3PCrZliqjyEndavZlvExBi n83Lc041Be/qnMiV39oEa1Dg2tmB3jXyWB24LvByu0VvBrHrUcqcTitDQd7iSnqLPV6e R7ug== X-Gm-Message-State: AIVw11200E75RbJ958TCzofYTwFmPwHWfj+J/x65JtN46jYXoi1wc5Uy 5KKNl3CuEtVe3UyV X-Received: by 10.107.136.220 with SMTP id s89mr2544824ioi.143.1500397242820; Tue, 18 Jul 2017 10:00:42 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 18 Jul 2017 10:00:42 -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 38/38] KVM: arm64: Respect the virtual CPTR_EL2.TCPAC setting Date: Tue, 18 Jul 2017 11:59:04 -0500 Message-Id: <1500397144-16232-39-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 CPACR_EL1 traps to the virtual EL2 if virtual CPTR_EL2 is configured to trap CPACR_EL1 accesses from EL1. This is for recursive nested virtualization. Signed-off-by: Jintack Lim --- arch/arm64/kvm/sys_regs.c | 5 +++++ 1 file changed, 5 insertions(+) -- 1.9.1 diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index 6f67666..ba2966d 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -1091,6 +1091,11 @@ static bool access_cpacr(struct kvm_vcpu *vcpu, if (el12_reg(p) && forward_nv_traps(vcpu)) return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + /* Forward this trap to the virtual EL2 if CPTR_EL2.TCPAC is set*/ + if (!el12_reg(p) && !vcpu_mode_el2(vcpu) && + (vcpu_sys_reg(vcpu, CPTR_EL2) & CPTR_EL2_TCPAC)) + return kvm_inject_nested_sync(vcpu, kvm_vcpu_get_hsr(vcpu)); + /* * When the virtual HCR_EL2.E2H == 1, an access to CPACR_EL1 * in the virtual EL2 is to access CPTR_EL2.