From: Mark Brown <broonie@kernel.org>
To: Marc Zyngier <maz@kernel.org>, Joey Gouly <joey.gouly@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Will Deacon <will@kernel.org>,
Paolo Bonzini <pbonzini@redhat.com>,
Jonathan Corbet <corbet@lwn.net>, Shuah Khan <shuah@kernel.org>,
Oliver Upton <oupton@kernel.org>
Cc: Dave Martin <Dave.Martin@arm.com>, Fuad Tabba <tabba@google.com>,
Mark Rutland <mark.rutland@arm.com>,
Ben Horgan <ben.horgan@arm.com>,
Jean-Philippe Brucker <jpb@kernel.org>,
linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org,
Peter Maydell <peter.maydell@linaro.org>,
Eric Auger <eric.auger@redhat.com>,
Mark Brown <broonie@kernel.org>
Subject: [PATCH v13 23/32] KVM: arm64: Flush register state on writes to SVCR.SM and SVCR.ZA
Date: Mon, 20 Jul 2026 00:07:50 +0100 [thread overview]
Message-ID: <20260720-kvm-arm64-sme-v13-23-d9abd3ffa245@kernel.org> (raw)
In-Reply-To: <20260720-kvm-arm64-sme-v13-0-d9abd3ffa245@kernel.org>
Writes to the physical SVCR.SM and SVCR.ZA change the state of PSTATE.SM
and PSTATE.ZA, causing other floating point state to reset. Emulate this
behaviour for writes done via the KVM userspace ABI.
Setting PSTATE.ZA to 1 causes ZA and ZT0 to be reset to 0, these are stored
in sme_state. Setting PSTATE.ZA to 0 causes ZA and ZT0 to become inaccessible
so no reset is needed.
Any change in PSTATE.SM causes the V, Z, P, FFR and FPMR registers to be
reset to 0 and FPSR to be reset to 0x800009f.
Rather than introduce a requirement that the vector configuration be
finalised before writing to SVCR we check for this before updating the
SVE and SME specific state, when finalisation happens they will be
allocated with an initial state of 0.
Similarly in order to avoid ordering requirements between finalisation
and writes to the ID registers we always allocate space for ZT0 if the
hardware supports it, this is 512 bits per vCPU. The overwhelming
majority of practical systems with SME are expected to want use SME2,
there is very little practical reason to disable it other than for
feature testing, and the additional complexity seems more likely to lead
to bugs than deliver practical benefits.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/asm/kvm_host.h | 28 ++++++++++++++++++++++++++++
arch/arm64/include/asm/sysreg.h | 2 ++
arch/arm64/kvm/sys_regs.c | 30 +++++++++++++++++++++++++++++-
3 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 6574c286f50f..cafc43776ac3 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -1142,6 +1142,34 @@ struct kvm_vcpu_arch {
#define vcpu_sve_state_size(vcpu) sve_state_size_from_vl(vcpu_sve_max_vl(vcpu))
+#define vcpu_sme_state(vcpu) (kern_hyp_va((vcpu)->arch.sme_state))
+
+#define sme_state_size_from_vl(vl, sme2) ({ \
+ size_t __size_ret; \
+ unsigned int __vq; \
+ \
+ if (WARN_ON(!sve_vl_valid(vl))) { \
+ __size_ret = 0; \
+ } else { \
+ __vq = sve_vq_from_vl(vl); \
+ __size_ret = ZA_SIG_REGS_SIZE(__vq); \
+ if (sme2) \
+ __size_ret += ZT_SIG_REG_BYTES; \
+ } \
+ \
+ __size_ret; \
+})
+
+/*
+ * Always provide space for ZT0 to avoid ordering requirements with ID
+ * register writes and vector finalization.
+ */
+#define vcpu_sme_state_size(vcpu) ({ \
+ unsigned long __vl; \
+ __vl = (vcpu)->arch.max_vl[ARM64_VEC_SME]; \
+ sme_state_size_from_vl(__vl, system_supports_sme2()); \
+})
+
#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \
KVM_GUESTDBG_USE_SW_BP | \
KVM_GUESTDBG_USE_HW | \
diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
index 4b96449e0ffa..b434320de1a7 100644
--- a/arch/arm64/include/asm/sysreg.h
+++ b/arch/arm64/include/asm/sysreg.h
@@ -1108,6 +1108,8 @@
#define gicr_insn(insn) read_sysreg_s(GICV5_OP_GICR_##insn)
#define gic_insn(v, insn) write_sysreg_s(v, GICV5_OP_GIC_##insn)
+#define FPSR_RESET_VALUE 0x800009f
+
#ifdef __ASSEMBLER__
.macro mrs_s, rt, sreg
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 827502e3249a..f55a8d65cfc2 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -1015,6 +1015,34 @@ static unsigned int hidden_visibility(const struct kvm_vcpu *vcpu,
return REG_HIDDEN;
}
+static int set_svcr(struct kvm_vcpu *vcpu, const struct sys_reg_desc *rd,
+ u64 val)
+{
+ u64 old = __vcpu_sys_reg(vcpu, rd->reg);
+
+ if (val & SVCR_RES0)
+ return -EINVAL;
+
+ if ((val & SVCR_ZA) && !(old & SVCR_ZA) &&
+ kvm_arm_vcpu_vec_finalized(vcpu))
+ memset(vcpu->arch.sme_state, 0, vcpu_sme_state_size(vcpu));
+
+ if ((val & SVCR_SM) != (old & SVCR_SM)) {
+ memset(vcpu->arch.ctxt.fp_regs.vregs, 0,
+ sizeof(vcpu->arch.ctxt.fp_regs.vregs));
+
+ if (kvm_arm_vcpu_vec_finalized(vcpu))
+ memset(vcpu->arch.sve_state, 0,
+ vcpu_sve_state_size(vcpu));
+
+ __vcpu_assign_sys_reg(vcpu, FPMR, 0);
+ vcpu->arch.ctxt.fp_regs.fpsr = FPSR_RESET_VALUE;
+ }
+
+ __vcpu_assign_sys_reg(vcpu, rd->reg, val);
+ return 0;
+}
+
static unsigned int pmu_visibility(const struct kvm_vcpu *vcpu,
const struct sys_reg_desc *r)
{
@@ -3616,7 +3644,7 @@ static const struct sys_reg_desc sys_reg_descs[] = {
CTR_EL0_DminLine_MASK |
CTR_EL0_L1Ip_MASK |
CTR_EL0_IminLine_MASK),
- { SYS_DESC(SYS_SVCR), undef_access, reset_val, SVCR, 0, .visibility = sme_visibility },
+ { SYS_DESC(SYS_SVCR), undef_access, reset_val, SVCR, 0, .visibility = sme_visibility, .set_user = set_svcr },
{ SYS_DESC(SYS_FPMR), undef_access, reset_val, FPMR, 0, .visibility = fp8_visibility },
{ PMU_SYS_REG(PMCR_EL0), .access = access_pmcr, .reset = reset_pmcr,
--
2.47.3
next prev parent reply other threads:[~2026-07-19 23:11 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-19 23:07 [PATCH v13 00/32] KVM: arm64: Implement support for SME Mark Brown
2026-07-19 23:07 ` [PATCH v13 01/32] arm64/sysreg: Define full value read/modify/write helpers Mark Brown
2026-07-19 23:07 ` [PATCH v13 02/32] arm64/fpsimd: Ensure all of ZCR_EL1 is initialised from idle Mark Brown
2026-07-23 12:58 ` Mark Rutland
2026-07-24 15:16 ` Mark Rutland
2026-07-19 23:07 ` [PATCH v13 03/32] arm64/fpsimd: Configure all ZCR/SMCR bits when loading task state Mark Brown
2026-07-19 23:07 ` [PATCH v13 04/32] arm64/fpsimd: Decide to save ZT0 and streaming mode FFR at bind time Mark Brown
2026-07-19 23:07 ` [PATCH v13 05/32] arm64/sve: Factor virtualizable VL discovery out of SVE specific code Mark Brown
2026-07-19 23:07 ` [PATCH v13 06/32] arm64/fpsimd: Determine maximum virtualisable SME vector length Mark Brown
2026-07-19 23:07 ` [PATCH v13 07/32] KVM: arm64: Remove bitrotted comment on handle_sve() Mark Brown
2026-07-19 23:07 ` [PATCH v13 08/32] KVM: arm64: Handle FEAT_IDST for guest accesses to hidden registers Mark Brown
2026-07-19 23:07 ` [PATCH v13 09/32] KVM: arm64: Pull ctxt_has_ helpers to start of sysreg-sr.h Mark Brown
2026-07-19 23:07 ` [PATCH v13 10/32] KVM: arm64: Rename SVE finalization constants to be more general Mark Brown
2026-07-19 23:07 ` [PATCH v13 11/32] KVM: arm64: Remove special case for FP state loading from ZCR_EL2 traps Mark Brown
2026-07-19 23:07 ` [PATCH v13 12/32] KVM: arm64: Define internal features for SME Mark Brown
2026-07-19 23:07 ` [PATCH v13 13/32] KVM: arm64: Rename sve_state_reg_region Mark Brown
2026-07-19 23:07 ` [PATCH v13 14/32] KVM: arm64: Store vector lengths in an array Mark Brown
2026-07-19 23:07 ` [PATCH v13 15/32] KVM: arm64: Factor SVE code out of fpsimd_lazy_switch_to_host() Mark Brown
2026-07-19 23:07 ` [PATCH v13 16/32] KVM: arm64: Document the KVM ABI for SME Mark Brown
2026-07-19 23:07 ` [PATCH v13 17/32] KVM: arm64: Implement SME vector length configuration Mark Brown
2026-07-19 23:07 ` [PATCH v13 18/32] KVM: arm64: Support SME control registers Mark Brown
2026-07-19 23:07 ` [PATCH v13 19/32] KVM: arm64: Support TPIDR2_EL0 Mark Brown
2026-07-19 23:07 ` [PATCH v13 20/32] KVM: arm64: Support SME identification registers for guests Mark Brown
2026-07-19 23:07 ` [PATCH v13 21/32] KVM: arm64: Support SME priority registers Mark Brown
2026-07-19 23:07 ` [PATCH v13 22/32] KVM: arm64: Support userspace access to streaming mode Z and P registers Mark Brown
2026-07-19 23:07 ` Mark Brown [this message]
2026-07-19 23:07 ` [PATCH v13 24/32] KVM: arm64: Expose SME specific state to userspace Mark Brown
2026-07-19 23:07 ` [PATCH v13 25/32] KVM: arm64: Context switch SME state for guests Mark Brown
2026-07-19 23:07 ` [PATCH v13 26/32] KVM: arm64: Handle SME exceptions Mark Brown
2026-07-19 23:07 ` [PATCH v13 27/32] KVM: arm64: Expose SME to nested guests Mark Brown
2026-07-19 23:07 ` [PATCH v13 28/32] KVM: arm64: Provide interface for configuring and enabling SME for guests Mark Brown
2026-07-19 23:07 ` [PATCH v13 29/32] KVM: arm64: selftests: Remove spurious check for single bit safe values Mark Brown
2026-07-19 23:07 ` [PATCH v13 30/32] KVM: arm64: selftests: Skip impossible invalid value tests Mark Brown
2026-07-19 23:07 ` [PATCH v13 31/32] KVM: arm64: selftests: Add SME system registers to get-reg-list Mark Brown
2026-07-19 23:07 ` [PATCH v13 32/32] KVM: arm64: selftests: Add SME to set_id_regs test Mark Brown
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=20260720-kvm-arm64-sme-v13-23-d9abd3ffa245@kernel.org \
--to=broonie@kernel.org \
--cc=Dave.Martin@arm.com \
--cc=ben.horgan@arm.com \
--cc=catalin.marinas@arm.com \
--cc=corbet@lwn.net \
--cc=eric.auger@redhat.com \
--cc=joey.gouly@arm.com \
--cc=jpb@kernel.org \
--cc=kvm@vger.kernel.org \
--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=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=oupton@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=shuah@kernel.org \
--cc=suzuki.poulose@arm.com \
--cc=tabba@google.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
all inboxes | Powered by JetHome®