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

arm64: alternative: constify alternative_has_feature_* argument

Inspired by x86 commit 864b435514b2("x86/jump_label: Mark arguments as
const to satisfy asm constraints"), constify alternative_has_feature_*
argument to satisfy asm constraints. And Steven in [1] also pointed
out that "The "i" constraint needs to be a constant."

Tested with building a simple external kernel module with "O0".

Before the patch, got similar gcc warnings and errors as below:

In file included from <command-line>:
In function ‘alternative_has_feature_likely’,
inlined from ‘system_capabilities_finalized’ at
arch/arm64/include/asm/cpufeature.h:440:9,
inlined from ‘arm64_preempt_schedule_irq’ at
arch/arm64/kernel/entry-common.c:264:6:
include/linux/compiler_types.h:285:33: warning:
‘asm’ operand 0 probably does not match constraints
285 | #define asm_volatile_goto(x...) asm goto(x)
| ^~~
arch/arm64/include/asm/alternative-macros.h:232:9:
note: in expansion of macro ‘asm_volatile_goto’
232 | asm_volatile_goto(
| ^~~~~~~~~~~~~~~~~
include/linux/compiler_types.h:285:33: error:
impossible constraint in ‘asm’
285 | #define asm_volatile_goto(x...) asm goto(x)
| ^~~
arch/arm64/include/asm/alternative-macros.h:232:9:
note: in expansion of macro ‘asm_volatile_goto’
232 | asm_volatile_goto(
| ^~~~~~~~~~~~~~~~~

After the patch, the simple external test kernel module is built fine
with "-O0".

[1]https://lore.kernel.org/all/20210212094059.5f8d05e8@gandalf.local.home/

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Link: https://lore.kernel.org/r/20221006075542.2658-3-jszhang@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>

authored by

Jisheng Zhang and committed by
Will Deacon
b9024f87 efbc9578

+2 -2
+2 -2
arch/arm64/include/asm/alternative-macros.h
··· 224 224 #include <linux/types.h> 225 225 226 226 static __always_inline bool 227 - alternative_has_feature_likely(unsigned long feature) 227 + alternative_has_feature_likely(const unsigned long feature) 228 228 { 229 229 compiletime_assert(feature < ARM64_NCAPS, 230 230 "feature must be < ARM64_NCAPS"); ··· 242 242 } 243 243 244 244 static __always_inline bool 245 - alternative_has_feature_unlikely(unsigned long feature) 245 + alternative_has_feature_unlikely(const unsigned long feature) 246 246 { 247 247 compiletime_assert(feature < ARM64_NCAPS, 248 248 "feature must be < ARM64_NCAPS");