arm64/signal: Clean up SVE/SME feature checking inconsistency
PATCH v3 1/1 arm64/signal: Clean up SVE/SME feature checking inconsistency
Currently when restoring signal state we check to see if SVE is supported in restore_sigframe() but check to see if SVE is supported inside restore_sve_fpsimd_context(). This makes no real difference since SVE is always supported in systems with SME but looks a bit untidy and makes things slightly harder to follow, move the SVE check next to the SME one in restore_sve_fpsimd_context().
---
v3:
- Make stub function WARN and error if it ever ends up being called.
v2:
- Add a stub restore_sve_fpsimd_context() to hopefully fix an allnoconfig issue, I can't reproduce locally.
arch/arm64/kernel/signal.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
arch/arm64/kernel/signal.c +12 -8
@@ -280,6 +280,9 @@ static int restore_sve_fpsimd_context(struct user_ctxs *user) vl =task_get_sme_vl (current); }else { +if (!system_supports_sve ()) +return -EINVAL ; + vl =task_get_sve_vl (current); }
@@ -342,9 +345,14 @@ static int restore_sve_fpsimd_context(struct user_ctxs *user)#else /* ! CONFIG_ARM64_SVE */ -/* Turn any non-optimised out attempts to use these into a link error: */ +static int restore_sve_fpsimd_context (struct user_ctxs *user) +{ +WARN_ON_ONCE (1 ); +return -EINVAL ; +} + +/* Turn any non-optimised out attempts to use this into a link error: */ extern int preserve_sve_context (void __user *ctx); -extern int restore_sve_fpsimd_context (struct user_ctxs *user);#endif /* ! CONFIG_ARM64_SVE */
@@ -649,14 +657,10 @@ static int restore_sigframe(struct pt_regs *regs,if (!user.fpsimd)return -EINVAL ; -if (user.sve) { -if (!system_supports_sve ()) -return -EINVAL ; - +if (user.sve) err =restore_sve_fpsimd_context (&user); - }else { +else err =restore_fpsimd_context (user.fpsimd); - } }if (err ==0 &&system_supports_sme () && user.za)
Signature · 7 lines
2.30.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 8 lines · Mark Brown
Currently when restoring signal state we check to see if SVE is supported in
restore_sigframe()but check to see if SVE is supported insiderestore_sve_fpsimd_context(). This makes no real difference since SVE is always supported in systems with SME but looks a bit untidy and makes things slightly harder to follow, move the SVE check next to the SME one inrestore_sve_fpsimd_context().[...]
Applied to arm64 (for-next/sme), thanks!
[1/1] arm64/signal: Clean up SVE/SME feature checking inconsistency
https://git.kernel.org/arm64/c/df07443f477a
Cheers,
Signature · 10 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel