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

arm64: alternative: make alternative_has_cap_likely() VDSO compatible

Currently alternative_has_cap_unlikely() can be used in VDSO code, but
alternative_has_cap_likely() cannot as it references alt_cb_patch_nops,
which is not available when linking the VDSO. This is unfortunate as it
would be useful to have alternative_has_cap_likely() available in VDSO
code.

The use of alt_cb_patch_nops was added in commit:

d926079f17bf8aa4 ("arm64: alternatives: add shared NOP callback")

... as removing duplicate NOPs within the kernel Image saved areasonable
amount of space.

Given the VDSO code will have nowhere near as many alternative branches
as the main kernel image, this isn't much of a concern, and a few extra
nops isn't a massive problem.

Change alternative_has_cap_likely() to only use alt_cb_patch_nops for
the main kernel image, and allow duplicate NOPs in VDSO code.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Acked-by: Will Deacon <will@kernel.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

authored by

Mark Rutland and committed by
Jason A. Donenfeld
2c2ca341 bb10ffe0

+4
+4
arch/arm64/include/asm/alternative-macros.h
··· 230 230 return false; 231 231 232 232 asm goto( 233 + #ifdef BUILD_VDSO 234 + ALTERNATIVE("b %l[l_no]", "nop", %[cpucap]) 235 + #else 233 236 ALTERNATIVE_CB("b %l[l_no]", %[cpucap], alt_cb_patch_nops) 237 + #endif 234 238 : 235 239 : [cpucap] "i" (cpucap) 236 240 :