Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210603184118.15090-1-broonie@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>

authored by

Mark Brown and committed by
Will Deacon
cfa7ff95 57ad4fe0

+61 -2
+26
arch/arm64/kernel/smccc-call.S
··· 7 7 8 8 #include <asm/asm-offsets.h> 9 9 #include <asm/assembler.h> 10 + #include <asm/thread_info.h> 11 + 12 + /* 13 + * If we have SMCCC v1.3 and (as is likely) no SVE state in 14 + * the registers then set the SMCCC hint bit to say there's no 15 + * need to preserve it. Do this by directly adjusting the SMCCC 16 + * function value which is already stored in x0 ready to be called. 17 + */ 18 + SYM_FUNC_START(__arm_smccc_sve_check) 19 + 20 + ldr_l x16, smccc_has_sve_hint 21 + cbz x16, 2f 22 + 23 + get_current_task x16 24 + ldr x16, [x16, #TSK_TI_FLAGS] 25 + tbnz x16, #TIF_FOREIGN_FPSTATE, 1f // Any live FP state? 26 + tbnz x16, #TIF_SVE, 2f // Does that state include SVE? 27 + 28 + 1: orr x0, x0, ARM_SMCCC_1_3_SVE_HINT 29 + 30 + 2: ret 31 + SYM_FUNC_END(__arm_smccc_sve_check) 32 + EXPORT_SYMBOL(__arm_smccc_sve_check) 10 33 11 34 .macro SMCCC instr 35 + alternative_if ARM64_SVE 36 + bl __arm_smccc_sve_check 37 + alternative_else_nop_endif 12 38 \instr #0 13 39 ldr x4, [sp] 14 40 stp x0, x1, [x4, #ARM_SMCCC_RES_X0_OFFS]
+4
drivers/firmware/smccc/smccc.c
··· 15 15 static enum arm_smccc_conduit smccc_conduit = SMCCC_CONDUIT_NONE; 16 16 17 17 bool __ro_after_init smccc_trng_available = false; 18 + u64 __ro_after_init smccc_has_sve_hint = false; 18 19 19 20 void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit) 20 21 { ··· 23 22 smccc_conduit = conduit; 24 23 25 24 smccc_trng_available = smccc_probe_trng(); 25 + if (IS_ENABLED(CONFIG_ARM64_SVE) && 26 + smccc_version >= ARM_SMCCC_VERSION_1_3) 27 + smccc_has_sve_hint = true; 26 28 } 27 29 28 30 enum arm_smccc_conduit arm_smccc_1_1_get_conduit(void)
+31 -2
include/linux/arm-smccc.h
··· 63 63 #define ARM_SMCCC_VERSION_1_0 0x10000 64 64 #define ARM_SMCCC_VERSION_1_1 0x10001 65 65 #define ARM_SMCCC_VERSION_1_2 0x10002 66 + #define ARM_SMCCC_VERSION_1_3 0x10003 67 + 68 + #define ARM_SMCCC_1_3_SVE_HINT 0x10000 66 69 67 70 #define ARM_SMCCC_VERSION_FUNC_ID \ 68 71 ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ ··· 219 216 220 217 void __init arm_smccc_version_init(u32 version, enum arm_smccc_conduit conduit); 221 218 219 + extern u64 smccc_has_sve_hint; 220 + 222 221 /** 223 222 * struct arm_smccc_res - Result from SMC/HVC call 224 223 * @a0-a3 result values from registers 0 to 3 ··· 301 296 }; 302 297 303 298 /** 299 + * __arm_smccc_sve_check() - Set the SVE hint bit when doing SMC calls 300 + * 301 + * Sets the SMCCC hint bit to indicate if there is live state in the SVE 302 + * registers, this modifies x0 in place and should never be called from C 303 + * code. 304 + */ 305 + asmlinkage unsigned long __arm_smccc_sve_check(unsigned long x0); 306 + 307 + /** 304 308 * __arm_smccc_smc() - make SMC calls 305 309 * @a0-a7: arguments passed in registers 0 to 7 306 310 * @res: result values from registers 0 to 3 ··· 363 349 364 350 #define SMCCC_SMC_INST __SMC(0) 365 351 #define SMCCC_HVC_INST __HVC(0) 352 + 353 + #endif 354 + 355 + /* nVHE hypervisor doesn't have a current thread so needs separate checks */ 356 + #if defined(CONFIG_ARM64_SVE) && !defined(__KVM_NVHE_HYPERVISOR__) 357 + 358 + #define SMCCC_SVE_CHECK ALTERNATIVE("nop \n", "bl __arm_smccc_sve_check \n", \ 359 + ARM64_SVE) 360 + #define smccc_sve_clobbers "x16", "x30", "cc", 361 + 362 + #else 363 + 364 + #define SMCCC_SVE_CHECK 365 + #define smccc_sve_clobbers 366 366 367 367 #endif 368 368 ··· 447 419 448 420 #define ___constraints(count) \ 449 421 : __constraint_read_ ## count \ 450 - : "memory" 422 + : smccc_sve_clobbers "memory" 451 423 #define __constraints(count) ___constraints(count) 452 424 453 425 /* ··· 462 434 register unsigned long r2 asm("r2"); \ 463 435 register unsigned long r3 asm("r3"); \ 464 436 __declare_args(__count_args(__VA_ARGS__), __VA_ARGS__); \ 465 - asm volatile(inst "\n" : \ 437 + asm volatile(SMCCC_SVE_CHECK \ 438 + inst "\n" : \ 466 439 "=r" (r0), "=r" (r1), "=r" (r2), "=r" (r3) \ 467 440 __constraints(__count_args(__VA_ARGS__))); \ 468 441 if (___res) \