arm64: smccc: Support SMCCC v1.3 SVE register saving hint
Subsystems (2)
PATCH v6 1/1 arm64: smccc: Support SMCCC v1.3 SVE register saving hint
SMCCC v1.2 requires that all SVE state be preserved over SMC calls which introduces substantial overhead in the common case where there is no SVE state in the registers. To avoid this SMCCC v1.3 introduces a flag which allows the caller to say that there is no state that needs to be preserved in the registers. Make use of this flag, setting it if the SMCCC version indicates support for it and the TIF_ flags indicate that there is no live SVE state in the registers, this avoids placing any constraints on when SMCCC calls can be done or triggering extra saving and reloading of SVE register state in the kernel.
This would be straightforward enough except for the rather entertaining inline assembly we use to do SMCCC v1.1 calls to allow us to take advantage of the limited number of registers it clobbers. Deal with this by having a function which we call immediately before issuing the SMCCC call to make our checks and set the flag. Using alternatives the overhead if SVE is supported but not detected at runtime can be reduced to a single NOP.
---
v6:
- Prototype __arm_smccc_sve_check add add the _arm to the name to fix issues with symbol versioning.
v5:
- Use x30 rather than lr in the clobber for wider toolchain compatibility.
v4:
- Also clobber cc as per suggestion from Ard.
- Rebase onto v5.13-rc3.
arch/arm64/kernel/smccc-call.S | 26 ++++++++++++++++++++++++++ drivers/firmware/smccc/smccc.c | 4 ++++ include/linux/arm-smccc.h | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 2 deletions(-)
arch/arm64/kernel/smccc-call.S +26 -0
@@ -7,8 +7,34 @@ #include <asm/asm-offsets.h> #include <asm/assembler.h> +#include <asm/thread_info.h> + +/* + * If we have SMCCC v1.3 and (as is likely) no SVE state in + * the registers then set the SMCCC hint bit to say there's no + * need to preserve it. Do this by directly adjusting the SMCCC + * function value which is already stored in x0 ready to be called. + */ +SYM_FUNC_START(__arm_smccc_sve_check) + + ldr_l x16, smccc_has_sve_hint + cbz x16, 2f + + get_current_task x16 + ldr x16, [x16, #TSK_TI_FLAGS] + tbnz x16, #TIF_FOREIGN_FPSTATE, 1f // Any live FP state? + tbnz x16, #TIF_SVE, 2f // Does that state include SVE? + +1: orr x0, x0, ARM_SMCCC_1_3_SVE_HINT + +2: ret +SYM_FUNC_END(__arm_smccc_sve_check) +EXPORT_SYMBOL(__arm_smccc_sve_check) .macro SMCCC instr +alternative_if ARM64_SVE + bl __arm_smccc_sve_check +alternative_else_nop_endif \instr #0 ldr x4, [sp] stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS]
drivers/firmware/smccc/smccc.c +4 -0
@@ -15,6 +15,7 @@ static u32 smccc_version = ARM_SMCCC_VERSION_1_0;static enum arm_smccc_conduit smccc_conduit =SMCCC_CONDUIT_NONE ;bool __ro_after_init smccc_trng_available = false; +u64 __ro_after_init smccc_has_sve_hint = false;void __init arm_smccc_version_init (u32 version,enum arm_smccc_conduit conduit) {
@@ -22,6 +23,9 @@ void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit) smccc_conduit = conduit; smccc_trng_available =smccc_probe_trng (); +if (IS_ENABLED (CONFIG_ARM64_SVE ) && + smccc_version >=ARM_SMCCC_VERSION_1_3 ) + smccc_has_sve_hint = true; }enum arm_smccc_conduit arm_smccc_1_1_get_conduit (void )
include/linux/arm-smccc.h +31 -2
@@ -63,6 +63,9 @@#define ARM_SMCCC_VERSION_1_0 0x10000#define ARM_SMCCC_VERSION_1_1 0x10001#define ARM_SMCCC_VERSION_1_2 0x10002 +#define ARM_SMCCC_VERSION_1_3 0x10003 + +#define ARM_SMCCC_1_3_SVE_HINT 0x10000#define ARM_SMCCC_VERSION_FUNC_ID \ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
@@ -216,6 +219,8 @@ u32 arm_smccc_get_version(void);void __init arm_smccc_version_init (u32 version,enum arm_smccc_conduit conduit); +extern u64 smccc_has_sve_hint; +/** * struct arm_smccc_res - Result from SMC/HVC call * @a0-a3 result values from registers 0 to 3
@@ -240,6 +245,15 @@ struct arm_smccc_quirk { } state; }; +/** +* __arm_smccc_sve_check() - Set the SVE hint bit when doing SMC calls +* +* Sets the SMCCC hint bit to indicate if there is live state in the SVE +* registers, this modifies x0 in place and should never be called from C +* code. +*/ +asmlinkage unsigned long __arm_smccc_sve_check (unsigned long x0); +/** * __arm_smccc_smc() - make SMC calls * @a0-a7: arguments passed in registers 0 to 7
@@ -297,6 +311,20 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,#endif +/* nVHE hypervisor doesn't have a current thread so needs separate checks */ +#if defined(CONFIG_ARM64_SVE ) && !defined(__KVM_NVHE_HYPERVISOR__) + +#define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __arm_smccc_sve_check \n", \ + ARM64_SVE) +#define smccc_sve_clobbers "x16", "x30", "cc", + +#else + +#define SMCCC_SVE_CHECK +#define smccc_sve_clobbers + +#endif +#define ___count_args (_0, _1, _2, _3, _4, _5, _6, _7, _8, x, ...) x#define __count_args (...) \
@@ -364,7 +392,7 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,#define ___constraints (count) \ : __constraint_read_ ## count \ - : "memory" + : smccc_sve_clobbers "memory"#define __constraints (count) ___constraints(count)/*
@@ -379,7 +407,8 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1, registerunsigned long r2 asm("r2" ); \ registerunsigned long r3 asm("r3" ); \__declare_args (__count_args (__VA_ARGS__), __VA_ARGS__); \ - asmvolatile (inst"\n" : \ + asmvolatile (SMCCC_SVE_CHECK \ + inst "\n" : \"=r" (r0),"=r" (r1),"=r" (r2),"=r" (r3) \ __constraints(__count_args(__VA_ARGS__))); \if (___res) \
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerQuoted 17 lines · Mark Brown
SMCCC v1.2 requires that all SVE state be preserved over SMC calls which introduces substantial overhead in the common case where there is no SVE state in the registers. To avoid this SMCCC v1.3 introduces a flag which allows the caller to say that there is no state that needs to be preserved in the registers. Make use of this flag, setting it if the SMCCC version indicates support for it and the
TIF_flags indicate that there is no live SVE state in the registers, this avoids placing any constraints on when SMCCC calls can be done or triggering extra saving and reloading of SVE register state in the kernel.This would be straightforward enough except for the rather entertaining inline assembly we use to do SMCCC v1.1 calls to allow us to take advantage of the limited number of registers it clobbers. Deal with this by having a function which we call immediately before issuing the SMCCC call to make our checks and set the flag. Using alternatives the overhead if SVE is supported but not detected at runtime can be reduced to a single NOP.
Quoted 8 lines
Signed-off-by Mark Brown <[email protected]>Reviewed-by Ard Biesheuvel <[email protected]>Reviewed-by Marc Zyngier <[email protected]>---
v6:
- Prototype__arm_smccc_sve_checkadd add the_armto the name to fix issues with symbol versioning.
Can you elaborate on what was going wrong with symbol versioning, please? Are we papering over another genksyms bug here?
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 11 lines · Will Deacon
Quoted 7 lines · Mark Brown
SMCCC v1.2 requires that all SVE state be preserved over SMC calls which introduces substantial overhead in the common case where there is no SVE state in the registers. To avoid this SMCCC v1.3 introduces a flag which
v6:
- Prototype__arm_smccc_sve_checkadd add the_armto the name to fix issues with symbol versioning.Can you elaborate on what was going wrong with symbol versioning, please? Are we papering over another genksyms bug here?
There's a requirement for a prototype to appear in asm-prototypes.h for any symbol that's exported, even if it is never and should never be referenced from C code. I don't know if it's papering over a bug, looks more like it's how things are supposed to work but just not documented well (and symbol versions aren't turned on in defconfig).
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Will Deacon
maintainerQuoted 10 lines · Mark Brown
Quoted 8 lines · Will Deacon
Quoted 7 lines · Mark Brown
SMCCC v1.2 requires that all SVE state be preserved over SMC calls which introduces substantial overhead in the common case where there is no SVE state in the registers. To avoid this SMCCC v1.3 introduces a flag which
v6:
- Prototype__arm_smccc_sve_checkadd add the_armto the name to fix issues with symbol versioning.
Quoted 8 lines
Quoted 2 lines
Can you elaborate on what was going wrong with symbol versioning, please? Are we papering over another genksyms bug here?
There's a requirement for a prototype to appear in
asm-prototypes.hfor any symbol that's exported, even if it is never and should never be referenced from C code. I don't know if it's papering over a bug, looks more like it's how things are supposed to work but just not documented well (and symbol versions aren't turned on in defconfig).
Gotcha, thanks. I was worried that somehow the '_arm' prefix was causing genksyms to start working, but it was the missing prototype that caused the problem.
I'll pick this up.
Will
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 3 lines · Will Deacon
Gotcha, thanks. I was worried that somehow the '
_arm' prefix was causing genksyms to start working, but it was the missing prototype that caused the problem.
Ah, the changelog was a bit unclear here - I added the _arm since it ended up sitting next to a bunch of other prototypes that had the _arm in there so it looked less weird.
Quoted 1 line
I'll pick this up.
Hopefully I didn't miss any more build configs this time :/
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 11 lines · Mark Brown
SMCCC v1.2 requires that all SVE state be preserved over SMC calls which introduces substantial overhead in the common case where there is no SVE state in the registers. To avoid this SMCCC v1.3 introduces a flag which allows the caller to say that there is no state that needs to be preserved in the registers. Make use of this flag, setting it if the SMCCC version indicates support for it and the
TIF_flags indicate that there is no live SVE state in the registers, this avoids placing any constraints on when SMCCC calls can be done or triggering extra saving and reloading of SVE register state in the kernel.[...]
Applied to arm64 (for-next/smccc), thanks!
[1/1] arm64: smccc: Support SMCCC v1.3 SVE register saving hint
https://git.kernel.org/arm64/c/cfa7ff959a78
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