linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Marc Zyngier <maz@kernel.org>
To: kvmarm@lists.linux.dev, kvm@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Cc: James Morse <james.morse@arm.com>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Oliver Upton <oliver.upton@linux.dev>,
	Zenghui Yu <yuzenghui@huawei.com>, Will Deacon <will@kernel.org>,
	Catalin Marinas <catalin.marinas@arm.com>
Subject: [PATCH 07/13] KVM: arm64: nv: Honor HFGITR_EL2.ERET being set
Date: Mon, 19 Feb 2024 09:20:08 +0000	[thread overview]
Message-ID: <20240219092014.783809-8-maz@kernel.org> (raw)
In-Reply-To: <20240219092014.783809-1-maz@kernel.org>

If the L1 hypervisor decides to trap ERETs while running L2,
make sure we don't try to emulate it, just like we wouldn't
if it had its NV bit set.

The exception will be reinjected from the core handler.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 arch/arm64/kvm/hyp/vhe/switch.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c
index 0c175516d114..a6c61d2ffc35 100644
--- a/arch/arm64/kvm/hyp/vhe/switch.c
+++ b/arch/arm64/kvm/hyp/vhe/switch.c
@@ -219,7 +219,8 @@ static bool kvm_hyp_handle_eret(struct kvm_vcpu *vcpu, u64 *exit_code)
 	 * Unless the trap has to be forwarded further down the line,
 	 * of course...
 	 */
-	if (__vcpu_sys_reg(vcpu, HCR_EL2) & HCR_NV)
+	if ((__vcpu_sys_reg(vcpu, HCR_EL2) & HCR_NV) ||
+	    (__vcpu_sys_reg(vcpu, HFGITR_EL2) & HFGITR_EL2_ERET))
 		return false;
 
 	spsr = read_sysreg_el1(SYS_SPSR);
-- 
2.39.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2024-02-19  9:21 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-19  9:20 [PATCH 00/13] KVM/arm64: Add NV support for ERET and PAuth Marc Zyngier
2024-02-19  9:20 ` [PATCH 01/13] KVM: arm64: Harden __ctxt_sys_reg() against out-of-range values Marc Zyngier
2024-02-20 11:20   ` Joey Gouly
2024-02-20 11:57     ` Marc Zyngier
2024-02-20 13:17       ` Joey Gouly
2024-02-19  9:20 ` [PATCH 02/13] KVM: arm64: Clarify ESR_ELx_ERET_ISS_ERET* Marc Zyngier
2024-02-20 11:31   ` Joey Gouly
2024-02-20 12:29     ` Marc Zyngier
2024-02-20 13:23       ` Joey Gouly
2024-02-20 13:41         ` Marc Zyngier
2024-02-20 15:18           ` Joey Gouly
2024-02-19  9:20 ` [PATCH 03/13] KVM: arm64: nv: Drop VCPU_HYP_CONTEXT flag Marc Zyngier
2024-02-20 11:58   ` Joey Gouly
2024-02-19  9:20 ` [PATCH 04/13] KVM: arm64: nv: Configure HCR_EL2 for FEAT_NV2 Marc Zyngier
2024-02-20 15:16   ` Joey Gouly
2024-02-20 15:41     ` Marc Zyngier
2024-02-19  9:20 ` [PATCH 05/13] KVM: arm64: nv: Add trap forwarding for ERET and SMC Marc Zyngier
2024-02-22 11:05   ` Joey Gouly
2024-02-19  9:20 ` [PATCH 06/13] KVM: arm64: nv: Fast-track 'InHost' exception returns Marc Zyngier
2024-02-19  9:20 ` Marc Zyngier [this message]
2024-02-19  9:20 ` [PATCH 08/13] KVM: arm64: nv: Handle HCR_EL2.{API,APK} independantly Marc Zyngier
2024-02-19  9:20 ` [PATCH 09/13] KVM: arm64: nv: Reinject PAC exceptions caused by HCR_EL2.API==0 Marc Zyngier
2024-02-19  9:20 ` [PATCH 10/13] KVM: arm64: nv: Add kvm_has_pauth() helper Marc Zyngier
2024-02-19  9:20 ` [PATCH 11/13] KVM: arm64: nv: Add emulation for ERETAx instructions Marc Zyngier
2024-02-19  9:20 ` [PATCH 12/13] KVM: arm64: nv: Handle ERETA[AB] instructions Marc Zyngier
2024-02-19  9:20 ` [PATCH 13/13] KVM: arm64: nv: Advertise support for PAuth Marc Zyngier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240219092014.783809-8-maz@kernel.org \
    --to=maz@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=james.morse@arm.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.linux.dev \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=oliver.upton@linux.dev \
    --cc=suzuki.poulose@arm.com \
    --cc=will@kernel.org \
    --cc=yuzenghui@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).