From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>, Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
Joey Gouly <joey.gouly@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Shuah Khan <shuah@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org,
kvmarm@lists.linux.dev, linux-kselftest@vger.kernel.org,
linux-kernel@vger.kernel.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH v16 4/6] KVM: arm64: Validate GCS exception lock when emulating ERET
Date: Fri, 12 Sep 2025 10:25:30 +0100 [thread overview]
Message-ID: <20250912-arm64-gcs-v16-4-6435e5ec37db@kernel.org> (raw)
In-Reply-To: <20250912-arm64-gcs-v16-0-6435e5ec37db@kernel.org>
As per DDI0487 R_TYTWB GCS adds an additional case where an illegal
exception return can be generated. If all of:
- PSTATE.EXLOCK is 0.
- The EL is not being changed by the ERET.
- GCSCR_ELx.EXLOCKEN is 1.
are true then the return is illegal. Emulate this behaviour when
emulating ERET for nested guests.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/kvm/emulate-nested.c | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kvm/emulate-nested.c b/arch/arm64/kvm/emulate-nested.c
index 90cb4b7ae0ff..9b02b85eda64 100644
--- a/arch/arm64/kvm/emulate-nested.c
+++ b/arch/arm64/kvm/emulate-nested.c
@@ -2632,6 +2632,41 @@ bool forward_debug_exception(struct kvm_vcpu *vcpu)
return forward_mdcr_traps(vcpu, MDCR_EL2_TDE);
}
+/*
+ * A subset of the pseudocode ELFromSPSR(), validity checks are
+ * assumed to have been done in code that is not GCS specific.
+ */
+static inline int exlock_el_from_spsr(u64 spsr)
+{
+ return FIELD_GET(GENMASK(3, 2), spsr);
+}
+
+/* See IllegalExceptionReturn() pseudocode */
+static bool kvm_check_illegal_exlock_return(struct kvm_vcpu *vcpu, u64 spsr)
+{
+ u64 cur_el, target_el;
+ u64 gcscr;
+
+ if (!kvm_has_gcs(vcpu->kvm))
+ return false;
+
+ if (spsr & PSR_EXLOCK_BIT)
+ return false;
+
+ cur_el = exlock_el_from_spsr(vcpu->arch.ctxt.regs.pstate);
+ target_el = exlock_el_from_spsr(spsr);
+
+ if (cur_el != target_el)
+ return false;
+
+ if (vcpu_is_el2(vcpu))
+ gcscr = __vcpu_sys_reg(vcpu, GCSCR_EL2);
+ else
+ gcscr = __vcpu_sys_reg(vcpu, GCSCR_EL1);
+
+ return gcscr & GCSCR_ELx_EXLOCKEN;
+}
+
static u64 kvm_check_illegal_exception_return(struct kvm_vcpu *vcpu, u64 spsr)
{
u64 mode = spsr & PSR_MODE_MASK;
@@ -2642,12 +2677,15 @@ static u64 kvm_check_illegal_exception_return(struct kvm_vcpu *vcpu, u64 spsr)
* - trying to return to an illegal M value
* - trying to return to a 32bit EL
* - trying to return to EL1 with HCR_EL2.TGE set
+ * - GCSCR_ELx.EXLOCKEN is 1 and PSTATE.EXLOCK is 0 when attempting
+ * to return from ELx the same EL.
*/
if (mode == PSR_MODE_EL3t || mode == PSR_MODE_EL3h ||
mode == 0b00001 || (mode & BIT(1)) ||
(spsr & PSR_MODE32_BIT) ||
(vcpu_el2_tge_is_set(vcpu) && (mode == PSR_MODE_EL1t ||
- mode == PSR_MODE_EL1h))) {
+ mode == PSR_MODE_EL1h)) ||
+ kvm_check_illegal_exlock_return(vcpu, spsr)) {
/*
* The guest is playing with our nerves. Preserve EL, SP,
* masks, flags from the existing PSTATE, and set IL.
--
2.47.2
next prev parent reply other threads:[~2025-09-12 11:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-12 9:25 [PATCH v16 0/6] KVM: arm64: Provide guest support for GCS Mark Brown
2025-09-12 9:25 ` [PATCH v16 1/6] arm64/gcs: Ensure FGTs for EL1 GCS instructions are disabled Mark Brown
2025-09-12 9:25 ` [PATCH v16 2/6] KVM: arm64: Manage GCS access and registers for guests Mark Brown
2025-09-12 11:59 ` Marc Zyngier
2025-09-12 16:33 ` Mark Brown
2025-09-12 17:14 ` Mark Brown
2025-09-12 21:30 ` Marc Zyngier
2025-09-12 9:25 ` [PATCH v16 3/6] KVM: arm64: Set PSTATE.EXLOCK when entering an exception Mark Brown
2025-09-12 9:25 ` Mark Brown [this message]
2025-09-12 12:06 ` [PATCH v16 4/6] KVM: arm64: Validate GCS exception lock when emulating ERET Marc Zyngier
2025-09-12 9:25 ` [PATCH v16 5/6] KVM: arm64: Allow GCS to be enabled for guests Mark Brown
2025-09-12 21:44 ` Marc Zyngier
2025-09-12 9:25 ` [PATCH v16 6/6] KVM: selftests: arm64: Add GCS registers to get-reg-list Mark Brown
2025-09-12 21:46 ` 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=20250912-arm64-gcs-v16-4-6435e5ec37db@kernel.org \
--to=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=joey.gouly@arm.com \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=shuah@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
/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).