Skip to content

Commit b3d6121

Browse files
mrutland-armctmarinas
authored andcommitted
arm64: fix selection of HAVE_DYNAMIC_FTRACE_WITH_ARGS
The Kconfig logic to select HAVE_DYNAMIC_FTRACE_WITH_ARGS is incorrect, and HAVE_DYNAMIC_FTRACE_WITH_ARGS may be selected when it is not supported by the combination of clang and GNU LD, resulting in link-time errors: aarch64-linux-gnu-ld: .init.data has both ordered [`__patchable_function_entries' in init/main.o] and unordered [`.meminit.data' in mm/sparse.o] sections aarch64-linux-gnu-ld: final link failed: bad value ... which can be seen when building with CC=clang using a binutils version older than 2.36. We originally fixed that in commit: 45bd895 ("arm64: Improve HAVE_DYNAMIC_FTRACE_WITH_REGS selection for clang") ... by splitting the "select HAVE_DYNAMIC_FTRACE_WITH_ARGS" statement into separete CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS and GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS options which individually select HAVE_DYNAMIC_FTRACE_WITH_ARGS. Subsequently we accidentally re-introduced the common "select HAVE_DYNAMIC_FTRACE_WITH_ARGS" statement in commit: 26299b3 ("ftrace: arm64: move from REGS to ARGS") ... then we removed it again in commit: 68a63a4 ("arm64: Fix build with CC=clang, CONFIG_FTRACE=y and CONFIG_STACK_TRACER=y") ... then we accidentally re-introduced it again in commit: 2aa6ac0 ("arm64: ftrace: Add direct call support") Fix this for the third time by keeping the unified select statement and making this depend onf either GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS or CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS. This is more consistent with usual style and less likely to go wrong in future. Fixes: 2aa6ac0 ("arm64: ftrace: Add direct call support") Cc: <[email protected]> # 6.4.x Signed-off-by: Mark Rutland <[email protected]> Cc: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 081eb79 commit b3d6121

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

arch/arm64/Kconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,8 @@ config ARM64
200200
select HAVE_DMA_CONTIGUOUS
201201
select HAVE_DYNAMIC_FTRACE
202202
select HAVE_DYNAMIC_FTRACE_WITH_ARGS \
203-
if $(cc-option,-fpatchable-function-entry=2)
203+
if (GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS || \
204+
CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS)
204205
select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS \
205206
if DYNAMIC_FTRACE_WITH_ARGS && DYNAMIC_FTRACE_WITH_CALL_OPS
206207
select HAVE_DYNAMIC_FTRACE_WITH_CALL_OPS \
@@ -286,12 +287,10 @@ config CLANG_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS
286287
def_bool CC_IS_CLANG
287288
# https://github.com/ClangBuiltLinux/linux/issues/1507
288289
depends on AS_IS_GNU || (AS_IS_LLVM && (LD_IS_LLD || LD_VERSION >= 23600))
289-
select HAVE_DYNAMIC_FTRACE_WITH_ARGS
290290

291291
config GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS
292292
def_bool CC_IS_GCC
293293
depends on $(cc-option,-fpatchable-function-entry=2)
294-
select HAVE_DYNAMIC_FTRACE_WITH_ARGS
295294

296295
config 64BIT
297296
def_bool y

0 commit comments

Comments
 (0)