Re: [LTP] [PATCH] hugemmap24: Exclude RISC-V from the powerpc slice layout

[Andrea Cervesato via ltp <ltp@lists.linux.it>]

Hi Vitor,

> Exclude RISC-V with the same way loongarch is excluded from the powerpc
> 1TB slices branch.
> 
> Signed-off-by: Victor Cheng-Yen Yang <cyyang772@andestech.com>
> ---
>  testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c
> index 0de44d58a..882752792 100644
> --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c
> +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c
> @@ -28,7 +28,8 @@ static int init_slice_boundary(int fd)
>  	unsigned long slice_size;
>  	void *p, *heap;
>  	int i;
> -#if defined(__LP64__) && !defined(__aarch64__) && !defined(__loongarch__)
> +#if defined(__LP64__) && !defined(__aarch64__) && !defined(__loongarch__) && \
> +	!defined(__riscv)

This is getting bigger. We can change it by inverting the exclusion.

Instead of expanding a blacklist of non-PowerPC architectures, invert the check
to whitelist the only architecture where 1 TB slices actually exist: 64-bit
PowerPC (similar to how hugemmap07.c checks #ifdef __powerpc64__).

WDYT?

diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c
index 0de44d58a..1d141e6ce 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap24.c
@@ -28,11 +28,11 @@ static int init_slice_boundary(int fd)
 	unsigned long slice_size;
 	void *p, *heap;
 	int i;
-#if defined(__LP64__) && !defined(__aarch64__) && !defined(__loongarch__)
+#if defined(__powerpc64__) || (defined(__powerpc__) && defined(__LP64__))
 	/* powerpc: 1TB slices starting at 1 TB */
 	slice_boundary = 0x10000000000;
 	slice_size = 0x10000000000;
 #else
-	/* powerpc: 256MB slices up to 4GB */
+	/* powerpc (32-bit) and other arches: 256MB slices up to 4GB */
 	slice_boundary = 0x00000000;
 	slice_size = 0x10000000;
 #endif

--
Andrea Cervesato
SUSE QE Automation Engineer Linux
andrea.cervesato@suse.com

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp