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>,
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 v9 09/30] KVM: arm64: Rename SVE finalization constants to be more general
Date: Tue, 23 Dec 2025 01:21:03 +0000 [thread overview]
Message-ID: <20251223-kvm-arm64-sme-v9-9-8be3867cb883@kernel.org> (raw)
In-Reply-To: <20251223-kvm-arm64-sme-v9-0-8be3867cb883@kernel.org>
Due to the overlap between SVE and SME vector length configuration
created by streaming mode SVE we will finalize both at once. Rename the
existing finalization to use _VEC (vector) for the naming to avoid
confusion.
Since this includes the userspace API we create an alias
KVM_ARM_VCPU_VEC for the existing KVM_ARM_VCPU_SVE capability, existing
code which does not enable SME will be unaffected and any SME only code
will not need to use SVE constants.
No functional change.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
arch/arm64/include/asm/kvm_host.h | 8 +++++---
arch/arm64/include/uapi/asm/kvm.h | 6 ++++++
arch/arm64/kvm/guest.c | 10 +++++-----
arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 +-
arch/arm64/kvm/reset.c | 20 ++++++++++----------
5 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index e6d25db10a6b..0f3d26467bf0 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -988,8 +988,8 @@ struct kvm_vcpu_arch {
/* KVM_ARM_VCPU_INIT completed */
#define VCPU_INITIALIZED __vcpu_single_flag(cflags, BIT(0))
-/* SVE config completed */
-#define VCPU_SVE_FINALIZED __vcpu_single_flag(cflags, BIT(1))
+/* Vector config completed */
+#define VCPU_VEC_FINALIZED __vcpu_single_flag(cflags, BIT(1))
/* pKVM VCPU setup completed */
#define VCPU_PKVM_FINALIZED __vcpu_single_flag(cflags, BIT(2))
@@ -1062,6 +1062,8 @@ struct kvm_vcpu_arch {
#define vcpu_has_sve(vcpu) kvm_has_sve((vcpu)->kvm)
#endif
+#define vcpu_has_vec(vcpu) vcpu_has_sve(vcpu)
+
#ifdef CONFIG_ARM64_PTR_AUTH
#define vcpu_has_ptrauth(vcpu) \
((cpus_have_final_cap(ARM64_HAS_ADDRESS_AUTH) || \
@@ -1458,7 +1460,7 @@ struct kvm *kvm_arch_alloc_vm(void);
int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature);
bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu);
-#define kvm_arm_vcpu_sve_finalized(vcpu) vcpu_get_flag(vcpu, VCPU_SVE_FINALIZED)
+#define kvm_arm_vcpu_vec_finalized(vcpu) vcpu_get_flag(vcpu, VCPU_VEC_FINALIZED)
#define kvm_has_mte(kvm) \
(system_supports_mte() && \
diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h
index a792a599b9d6..c67564f02981 100644
--- a/arch/arm64/include/uapi/asm/kvm.h
+++ b/arch/arm64/include/uapi/asm/kvm.h
@@ -107,6 +107,12 @@ struct kvm_regs {
#define KVM_ARM_VCPU_HAS_EL2 7 /* Support nested virtualization */
#define KVM_ARM_VCPU_HAS_EL2_E2H0 8 /* Limit NV support to E2H RES0 */
+/*
+ * An alias for _SVE since we finalize VL configuration for both SVE and SME
+ * simultaneously.
+ */
+#define KVM_ARM_VCPU_VEC KVM_ARM_VCPU_SVE
+
struct kvm_vcpu_init {
__u32 target;
__u32 features[7];
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 1c87699fd886..d15aa2da1891 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -342,7 +342,7 @@ static int set_sve_vls(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
if (!vcpu_has_sve(vcpu))
return -ENOENT;
- if (kvm_arm_vcpu_sve_finalized(vcpu))
+ if (kvm_arm_vcpu_vec_finalized(vcpu))
return -EPERM; /* too late! */
if (WARN_ON(vcpu->arch.sve_state))
@@ -497,7 +497,7 @@ static int get_sve_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
if (ret)
return ret;
- if (!kvm_arm_vcpu_sve_finalized(vcpu))
+ if (!kvm_arm_vcpu_vec_finalized(vcpu))
return -EPERM;
if (copy_to_user(uptr, vcpu->arch.sve_state + region.koffset,
@@ -523,7 +523,7 @@ static int set_sve_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
if (ret)
return ret;
- if (!kvm_arm_vcpu_sve_finalized(vcpu))
+ if (!kvm_arm_vcpu_vec_finalized(vcpu))
return -EPERM;
if (copy_from_user(vcpu->arch.sve_state + region.koffset, uptr,
@@ -599,7 +599,7 @@ static unsigned long num_sve_regs(const struct kvm_vcpu *vcpu)
return 0;
/* Policed by KVM_GET_REG_LIST: */
- WARN_ON(!kvm_arm_vcpu_sve_finalized(vcpu));
+ WARN_ON(!kvm_arm_vcpu_vec_finalized(vcpu));
return slices * (SVE_NUM_PREGS + SVE_NUM_ZREGS + 1 /* FFR */)
+ 1; /* KVM_REG_ARM64_SVE_VLS */
@@ -617,7 +617,7 @@ static int copy_sve_reg_indices(const struct kvm_vcpu *vcpu,
return 0;
/* Policed by KVM_GET_REG_LIST: */
- WARN_ON(!kvm_arm_vcpu_sve_finalized(vcpu));
+ WARN_ON(!kvm_arm_vcpu_vec_finalized(vcpu));
/*
* Enumerate this first, so that userspace can save/restore in
diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c
index 8911338961c5..b402dcb7691e 100644
--- a/arch/arm64/kvm/hyp/nvhe/pkvm.c
+++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c
@@ -445,7 +445,7 @@ static int pkvm_vcpu_init_sve(struct pkvm_hyp_vcpu *hyp_vcpu, struct kvm_vcpu *h
int ret = 0;
if (!vcpu_has_feature(vcpu, KVM_ARM_VCPU_SVE)) {
- vcpu_clear_flag(vcpu, VCPU_SVE_FINALIZED);
+ vcpu_clear_flag(vcpu, VCPU_VEC_FINALIZED);
return 0;
}
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index 959532422d3a..f7c63e145d54 100644
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -92,7 +92,7 @@ static void kvm_vcpu_enable_sve(struct kvm_vcpu *vcpu)
* Finalize vcpu's maximum SVE vector length, allocating
* vcpu->arch.sve_state as necessary.
*/
-static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu)
+static int kvm_vcpu_finalize_vec(struct kvm_vcpu *vcpu)
{
void *buf;
unsigned int vl;
@@ -122,21 +122,21 @@ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu)
}
vcpu->arch.sve_state = buf;
- vcpu_set_flag(vcpu, VCPU_SVE_FINALIZED);
+ vcpu_set_flag(vcpu, VCPU_VEC_FINALIZED);
return 0;
}
int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature)
{
switch (feature) {
- case KVM_ARM_VCPU_SVE:
- if (!vcpu_has_sve(vcpu))
+ case KVM_ARM_VCPU_VEC:
+ if (!vcpu_has_vec(vcpu))
return -EINVAL;
- if (kvm_arm_vcpu_sve_finalized(vcpu))
+ if (kvm_arm_vcpu_vec_finalized(vcpu))
return -EPERM;
- return kvm_vcpu_finalize_sve(vcpu);
+ return kvm_vcpu_finalize_vec(vcpu);
}
return -EINVAL;
@@ -144,7 +144,7 @@ int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature)
bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu)
{
- if (vcpu_has_sve(vcpu) && !kvm_arm_vcpu_sve_finalized(vcpu))
+ if (vcpu_has_vec(vcpu) && !kvm_arm_vcpu_vec_finalized(vcpu))
return false;
return true;
@@ -163,7 +163,7 @@ void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu)
kfree(vcpu->arch.ccsidr);
}
-static void kvm_vcpu_reset_sve(struct kvm_vcpu *vcpu)
+static void kvm_vcpu_reset_vec(struct kvm_vcpu *vcpu)
{
if (vcpu_has_sve(vcpu))
memset(vcpu->arch.sve_state, 0, vcpu_sve_state_size(vcpu));
@@ -203,11 +203,11 @@ void kvm_reset_vcpu(struct kvm_vcpu *vcpu)
if (loaded)
kvm_arch_vcpu_put(vcpu);
- if (!kvm_arm_vcpu_sve_finalized(vcpu)) {
+ if (!kvm_arm_vcpu_vec_finalized(vcpu)) {
if (vcpu_has_feature(vcpu, KVM_ARM_VCPU_SVE))
kvm_vcpu_enable_sve(vcpu);
} else {
- kvm_vcpu_reset_sve(vcpu);
+ kvm_vcpu_reset_vec(vcpu);
}
if (vcpu_el1_is_32bit(vcpu))
--
2.47.3
next prev parent reply other threads:[~2025-12-23 1:22 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-23 1:20 [PATCH v9 00/30] KVM: arm64: Implement support for SME Mark Brown
2025-12-23 1:20 ` [PATCH v9 01/30] arm64/sysreg: Update SMIDR_EL1 to DDI0601 2025-06 Mark Brown
2026-01-07 19:24 ` Fuad Tabba
2026-02-03 13:00 ` Alex Bennée
2025-12-23 1:20 ` [PATCH v9 02/30] arm64/fpsimd: Update FA64 and ZT0 enables when loading SME state Mark Brown
2026-01-07 19:25 ` Fuad Tabba
2026-01-08 11:54 ` Mark Brown
2026-01-08 14:09 ` Fuad Tabba
2026-01-08 15:57 ` Mark Brown
2026-01-08 16:19 ` Fuad Tabba
2026-01-08 16:42 ` Mark Brown
2025-12-23 1:20 ` [PATCH v9 03/30] arm64/fpsimd: Decide to save ZT0 and streaming mode FFR at bind time Mark Brown
2026-01-07 19:25 ` Fuad Tabba
2025-12-23 1:20 ` [PATCH v9 04/30] arm64/fpsimd: Check enable bit for FA64 when saving EFI state Mark Brown
2026-01-07 19:25 ` Fuad Tabba
2026-01-29 16:39 ` Alex Bennée
2026-01-29 16:41 ` Mark Brown
2026-01-29 17:29 ` Alex Bennée
2025-12-23 1:20 ` [PATCH v9 05/30] arm64/fpsimd: Determine maximum virtualisable SME vector length Mark Brown
2026-01-07 19:25 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 06/30] KVM: arm64: Pay attention to FFR parameter in SVE save and load Mark Brown
2026-01-08 14:09 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 07/30] KVM: arm64: Pull ctxt_has_ helpers to start of sysreg-sr.h Mark Brown
2026-01-08 14:09 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 08/30] KVM: arm64: Move SVE state access macros after feature test macros Mark Brown
2026-01-08 14:09 ` Fuad Tabba
2025-12-23 1:21 ` Mark Brown [this message]
2026-01-08 14:09 ` [PATCH v9 09/30] KVM: arm64: Rename SVE finalization constants to be more general Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 10/30] KVM: arm64: Document the KVM ABI for SME Mark Brown
2026-01-08 14:10 ` Fuad Tabba
2026-02-09 15:18 ` Peter Maydell
2026-02-16 17:55 ` Mark Brown
2025-12-23 1:21 ` [PATCH v9 11/30] KVM: arm64: Define internal features " Mark Brown
2026-01-09 15:55 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 12/30] KVM: arm64: Rename sve_state_reg_region Mark Brown
2026-01-09 15:55 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 13/30] KVM: arm64: Store vector lengths in an array Mark Brown
2026-01-09 15:55 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 14/30] KVM: arm64: Implement SME vector length configuration Mark Brown
2026-01-09 15:59 ` Fuad Tabba
2026-01-12 13:27 ` Mark Brown
2026-01-12 13:28 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 15/30] KVM: arm64: Support SME control registers Mark Brown
2026-01-09 16:31 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 16/30] KVM: arm64: Support TPIDR2_EL0 Mark Brown
2026-01-09 16:57 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 17/30] KVM: arm64: Support SME identification registers for guests Mark Brown
2026-01-09 18:01 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 18/30] KVM: arm64: Support SME priority registers Mark Brown
2026-01-12 11:59 ` Fuad Tabba
2026-01-13 19:08 ` Mark Brown
2025-12-23 1:21 ` [PATCH v9 19/30] KVM: arm64: Provide assembly for SME register access Mark Brown
2026-01-12 17:59 ` Fuad Tabba
2026-01-13 19:20 ` Mark Brown
2026-01-14 10:08 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 20/30] KVM: arm64: Support userspace access to streaming mode Z and P registers Mark Brown
2026-01-12 18:35 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 21/30] KVM: arm64: Flush register state on writes to SVCR.SM and SVCR.ZA Mark Brown
2026-01-12 19:08 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 22/30] KVM: arm64: Expose SME specific state to userspace Mark Brown
2026-01-13 14:06 ` Fuad Tabba
2026-01-14 17:07 ` Mark Brown
2025-12-23 1:21 ` [PATCH v9 23/30] KVM: arm64: Context switch SME state for guests Mark Brown
2026-01-13 14:24 ` Fuad Tabba
2026-01-14 17:27 ` Mark Brown
2026-01-15 9:02 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 24/30] KVM: arm64: Handle SME exceptions Mark Brown
2026-01-13 14:29 ` Fuad Tabba
2025-12-23 1:21 ` [PATCH v9 25/30] KVM: arm64: Expose SME to nested guests Mark Brown
2026-01-13 14:37 ` Fuad Tabba
2026-01-14 18:22 ` Mark Brown
2025-12-23 1:21 ` [PATCH v9 26/30] KVM: arm64: Provide interface for configuring and enabling SME for guests Mark Brown
2026-01-13 14:40 ` Fuad Tabba
2026-01-14 18:48 ` Mark Brown
2025-12-23 1:21 ` [PATCH v9 27/30] KVM: arm64: selftests: Remove spurious check for single bit safe values Mark Brown
2026-01-13 10:05 ` Ben Horgan
2025-12-23 1:21 ` [PATCH v9 28/30] KVM: arm64: selftests: Skip impossible invalid value tests Mark Brown
2026-01-13 10:52 ` Ben Horgan
2025-12-23 1:21 ` [PATCH v9 29/30] KVM: arm64: selftests: Add SME system registers to get-reg-list Mark Brown
2025-12-23 1:21 ` [PATCH v9 30/30] KVM: arm64: selftests: Add SME to set_id_regs test Mark Brown
2026-01-13 14:58 ` [PATCH v9 00/30] KVM: arm64: Implement support for SME Fuad Tabba
2026-01-13 16:10 ` Mark Brown
2026-03-06 17:08 ` Mark Brown
2026-02-25 9:22 ` Alex Bennée
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=20251223-kvm-arm64-sme-v9-9-8be3867cb883@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=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®