[PATCH 2/2] selftests/mm: Fix a build failure on powerpc
Donet Tom
donettom at linux.ibm.com
Tue Apr 29 03:13:38 AEST 2025
On 4/28/25 6:49 PM, Nysal Jan K.A. wrote:
> The compiler is unaware of the size of code generated by the ".rept"
> assembler directive. This results in the compiler emitting branch
> instructions where the offset to branch to exceeds the maximum allowed
> value, resulting in build failures like the following:
>
> CC protection_keys
> /tmp/ccypKWAE.s: Assembler messages:
> /tmp/ccypKWAE.s:2073: Error: operand out of range (0x0000000000020158
> is not between 0xffffffffffff8000 and 0x0000000000007ffc)
> /tmp/ccypKWAE.s:2509: Error: operand out of range (0x0000000000020130
> is not between 0xffffffffffff8000 and 0x0000000000007ffc)
>
> Fix the issue by manually adding nop instructions using the preprocessor.
>
> Fixes: 46036188ea1f5 ("selftests/mm: build with -O2")
> Reported-by: Madhavan Srinivasan <maddy at linux.ibm.com>
> Signed-off-by: Nysal Jan K.A. <nysal at linux.ibm.com>
> ---
> tools/testing/selftests/mm/pkey-powerpc.h | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/mm/pkey-powerpc.h b/tools/testing/selftests/mm/pkey-powerpc.h
> index d8ec906b8120..17bf2d1b0192 100644
> --- a/tools/testing/selftests/mm/pkey-powerpc.h
> +++ b/tools/testing/selftests/mm/pkey-powerpc.h
> @@ -104,8 +104,18 @@ static inline void expect_fault_on_read_execonly_key(void *p1, int pkey)
> return;
> }
>
> +#define REPEAT_8(s) s s s s s s s s
> +#define REPEAT_64(s) REPEAT_8(s) REPEAT_8(s) REPEAT_8(s) REPEAT_8(s) \
> + REPEAT_8(s) REPEAT_8(s) REPEAT_8(s) REPEAT_8(s)
> +#define REPEAT_512(s) REPEAT_64(s) REPEAT_64(s) REPEAT_64(s) REPEAT_64(s) \
> + REPEAT_64(s) REPEAT_64(s) REPEAT_64(s) REPEAT_64(s)
> +#define REPEAT_4096(s) REPEAT_512(s) REPEAT_512(s) REPEAT_512(s) REPEAT_512(s) \
> + REPEAT_512(s) REPEAT_512(s) REPEAT_512(s) REPEAT_512(s)
> +#define REPEAT_16384(s) REPEAT_4096(s) REPEAT_4096(s) \
> + REPEAT_4096(s) REPEAT_4096(s)
> +
Hi Nysal,
This change looks good to me. I tested in on power and the error is not seen.
CC droppable
CC guard-regions
CC soft-dirty
CC protection_keys
CC va_high_addr_switch
CC virtual_address_range
CC write_to_hugetlbfs
Reviewed-by:Donet Tom <donettom at linux.ibm.com>
Tested-by: Donet Tom <donettom at linux.ibm.com>
> /* 4-byte instructions * 16384 = 64K page */
> -#define __page_o_noops() asm(".rept 16384 ; nop; .endr")
> +#define __page_o_noops() asm(REPEAT_16384("nop\n"))
>
> static inline void *malloc_pkey_with_mprotect_subpage(long size, int prot, u16 pkey)
> {
More information about the Linuxppc-dev
mailing list