On Fri, Mar 06, 2026 at 05:00:54PM +0000, Mark Brown wrote:
> Currently we enable EL0 and EL1 access to FA64 and ZT0 at boot and leave
> them enabled throughout the runtime of the system. When we add KVM support
> we will need to make this configuration dynamic, these features may be
> disabled for some KVM guests. Since the host kernel saves the floating
> point state for non-protected guests and we wish to avoid KVM having to
> reload the floating point state needlessly on guest reentry let's move the
> configuration of these enables to the floating point state reload.
>
> We provide a helper which does the configuration as part of a
> read/modify/write operation along with the configuration of the task VL,
> then update the floating point state load and SME access trap to use it.
> We also remove the setting of the enable bits from the CPU feature
> identification and resume paths. There will be a small overhead from
> setting the enables one at a time but this should be negligible in the
> context of the state load or access trap. In order to avoid compiler
> warnings due to unused variables in !CONFIG_ARM64_SME cases we avoid
> storing the vector length in temporary variables.
>
> Signed-off-by: Mark Brown <[email protected]>
> ---
> arch/arm64/include/asm/fpsimd.h | 18 ++++++++++++++++
> arch/arm64/kernel/cpufeature.c | 2 --
> arch/arm64/kernel/fpsimd.c | 47
> +++++++++++------------------------------
> 3 files changed, 30 insertions(+), 37 deletions(-)
>
> diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h
> index 1d2e33559bd5..7361b3b4a5f5 100644
> --- a/arch/arm64/include/asm/fpsimd.h
> +++ b/arch/arm64/include/asm/fpsimd.h
> @@ -428,6 +428,22 @@ static inline size_t sme_state_size(struct task_struct
> const *task)
> return __sme_state_size(task_get_sme_vl(task));
> }
>
> +/*
> + * Note that unlike SVE we have additional feature bits for FA64 and
> + * ZT0 as well as the VL.
> + */
> +#define sme_cond_update_smcr(vl, fa64, zt0, reg) \
> + do { \
> + u64 __old = read_sysreg_s((reg)); \
> + u64 __new = vl & SMCR_ELx_LEN_MASK; \
Nit: this isn't VL, it's VQ - 1.
If that value is bigger than SMCR_ELx_LEN_MASK to begin with, there's a
latent bug in the caller, and silently masking the value is just hiding the
problem.
> + if (fa64) \
> + __new |= SMCR_ELx_FA64; \
> + if (zt0) \
> + __new |= SMCR_ELx_EZT0; \
> + if (__old != __new) \
> + write_sysreg_s(__new, (reg)); \
> + } while (0)
> +
I'd strongly prefer that we make it the caller's responsiblity to track
all the bits within SMCR, rather than requiring each caller to pass a
bag of booleans.
Either we can store the full SMCR value in the task, or we can have
something like:
unsigned long __task_smcr(const struct task_struct *tsk)
{
unsigned long vq = sve_vq_from_vl(task_get_sme_vl(tsk));
unsigned long smcr = vq - 1;
if (system_supports_fa64())
smcr |= SMCR_ELx_FA64;
if (system_supports_sme2())
smcr |= SMCR_ELx_EZT0;
return smcr;
}
... and if we need a helper for a conditional update, we can have
generic versions:
#define sysreg_cond_update(sysreg, val) \
sysreg_clear_set(syreg, ~0UL, val)
#define sysreg_cond_update_s(sysreg, val) \
sysreg_clear_set_s(syreg, ~0UL, val)
That way task_fpsimd_load() and do_sme_acc() don't need to duplicate all
the system_supports_XXX() checks, and both can have:
sysreg_cond_update_s(SYS_SMCR_EL1, __task_smcr(current));
... which keeps all the points of use simpler and consistent with one
another, and keeps the logic in the helper far more legibile and robust
(e.g. no macro variable shadowing).
We can do the same for ZCR, e.g.
unsigned long __task_zcr(const struct task_struct *tsk)
{
unsigned long vq = sve_vq_from_vl(task_get_sve_vl(tsk));
unsigned long zcr = vq - 1;
return zcr;
}
[...]
> diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
> index 9de1d8a604cb..cf419319f077 100644
> --- a/arch/arm64/kernel/fpsimd.c
> +++ b/arch/arm64/kernel/fpsimd.c
> @@ -398,11 +398,15 @@ static void task_fpsimd_load(void)
>
> /* Restore SME, override SVE register configuration if needed */
> if (system_supports_sme()) {
> - unsigned long sme_vl = task_get_sme_vl(current);
> -
> - /* Ensure VL is set up for restoring data */
> + /*
> + * Ensure VL is set up for restoring data. KVM might
> + * disable subfeatures so we reset them each time.
> + */
> if (test_thread_flag(TIF_SME))
> - sme_set_vq(sve_vq_from_vl(sme_vl) - 1);
> +
> sme_cond_update_smcr(sve_vq_from_vl(task_get_sme_vl(current)) - 1,
> + system_supports_fa64(),
> + system_supports_sme2(),
> + SYS_SMCR_EL1);
>
> write_sysreg_s(current->thread.svcr, SYS_SVCR);
With the proposal above, this would become:
if (system_supports_sme()) {
/*
* Ensure any SME controls are configured appropriately
* before restoring state.
*/
if (test_thread_flag(TIF_SME))
sysreg_cond_update_s(SYS_SMCR_EL1,
__task_smcr(current));
[...]
}
[...]
> @@ -1400,9 +1376,10 @@ void do_sme_acc(unsigned long esr, struct pt_regs
> *regs)
> WARN_ON(1);
>
> if (!test_thread_flag(TIF_FOREIGN_FPSTATE)) {
> - unsigned long vq_minus_one =
> - sve_vq_from_vl(task_get_sme_vl(current)) - 1;
> - sme_set_vq(vq_minus_one);
> + sme_cond_update_smcr(sve_vq_from_vl(task_get_sme_vl(current)) -
> 1,
> + system_supports_fa64(),
> + system_supports_sme2(),
> + SYS_SMCR_EL1);
>
> fpsimd_bind_task_to_cpu();
> } else {
Likewise, with the proposal above, this would become:
if (!test_thread_flag(TIF_FOREIGN_FPSTATE)) {
sysreg_cond_update_s(SYS_SMCR_EL1, __task_smcr(current));
fpsimd_bind_task_to_cpu();
} else {
[...]
}
Mark.
