diff options
| author | Linus Walleij <[email protected]> | 2024-05-02 08:13:24 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <[email protected]> | 2024-05-07 10:30:24 +0100 |
| commit | 7b749aad1faa5bcb23b45b7126f677ab17324c40 (patch) | |
| tree | 7d21e5dc3cbd404c82c83434835850a0e2c8d7c1 /arch/arm/mm/cache-v4wb.S | |
| parent | 1a4fec49efe5273eb2fcf575175a117745f76f97 (diff) | |
ARM: 9393/1: mm: Use conditionals for CFI branches
Commit 9385/2 introduced a few branches inside function
prototypes when using CFI in order to deal with the situation
where CFI inserts a few bytes of function information in front
of the symbol.
This is not good for older CPUs where every cycle counts.
Commit 9386/2 alleviated the situation a bit by using aliases
for the cache functions with identical signatures.
This leaves the coherent cache flush functions
*_coherent_kern_range() with these branches to the corresponing
*_coherent_user_range() around, since their return type differ and
they therefore cannot be aliased.
Solve this by a simple ifdef so at least we can use fallthroughs
when compiling without CFI enabled.
Link: https://lore.kernel.org/linux-arm-kernel/Zi+e9M%2Ff5b%[email protected]/
Suggested-by: Ard Biesheuvel <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Signed-off-by: Russell King (Oracle) <[email protected]>
Diffstat (limited to 'arch/arm/mm/cache-v4wb.S')
| -rw-r--r-- | arch/arm/mm/cache-v4wb.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/cache-v4wb.S b/arch/arm/mm/cache-v4wb.S index 1912f559968c..ce55a2eef5da 100644 --- a/arch/arm/mm/cache-v4wb.S +++ b/arch/arm/mm/cache-v4wb.S @@ -136,7 +136,9 @@ SYM_FUNC_END(v4wb_flush_user_cache_range) */ SYM_TYPED_FUNC_START(v4wb_flush_kern_dcache_area) add r1, r0, r1 +#ifdef CONFIG_CFI_CLANG /* Fallthrough if !CFI */ b v4wb_coherent_user_range +#endif SYM_FUNC_END(v4wb_flush_kern_dcache_area) /* @@ -150,7 +152,9 @@ SYM_FUNC_END(v4wb_flush_kern_dcache_area) * - end - virtual end address */ SYM_TYPED_FUNC_START(v4wb_coherent_kern_range) +#ifdef CONFIG_CFI_CLANG /* Fallthrough if !CFI */ b v4wb_coherent_user_range +#endif SYM_FUNC_END(v4wb_coherent_kern_range) /* |