]> www.infradead.org Git - users/jedix/linux-maple.git/commit
arm64: alternative: make alternative_has_cap_likely() VDSO compatible
authorMark Rutland <mark.rutland@arm.com>
Tue, 3 Sep 2024 12:09:16 +0000 (12:09 +0000)
committerJason A. Donenfeld <Jason@zx2c4.com>
Fri, 13 Sep 2024 15:28:35 +0000 (17:28 +0200)
commit2c2ca3416b4090aef8c646adccfc3be4b712db8a
treec9908b18616ffc15076576903763d423c2ce5ffe
parentbb10ffe01bf2d2436190958c7eae694515e1ebb7
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>
arch/arm64/include/asm/alternative-macros.h