[PATCH 1/2] selftests/mm: use selftests framework to print test result.

[PATCH 1/2] selftests/mm: use selftests framework to print test result.

[Zi Yan]

Otherwise the number of tests does not match the reality.

Fixes: 391e86971161 ("mm: selftest to verify zero-filled pages are mapped to zeropage")
Signed-off-by: Zi Yan <ziy@nvidia.com>
---
 .../selftests/mm/split_huge_page_test.c       | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
index 84b1251666aa..128004308233 100644
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c
@@ -108,38 +108,28 @@ static void verify_rss_anon_split_huge_page_all_zeroes(char *one_page, size_t le
 	unsigned long rss_anon_before, rss_anon_after;
 	size_t i;
 
-	if (!check_huge_anon(one_page, 4, pmd_pagesize)) {
-		printf("No THP is allocated\n");
-		exit(EXIT_FAILURE);
-	}
+	if (!check_huge_anon(one_page, 4, pmd_pagesize))
+		ksft_exit_fail_msg("No THP is allocated\n");
 
 	rss_anon_before = rss_anon();
-	if (!rss_anon_before) {
-		printf("No RssAnon is allocated before split\n");
-		exit(EXIT_FAILURE);
-	}
+	if (!rss_anon_before)
+		ksft_exit_fail_msg("No RssAnon is allocated before split\n");
 
 	/* split all THPs */
 	write_debugfs(PID_FMT, getpid(), (uint64_t)one_page,
 		      (uint64_t)one_page + len, 0);
 
 	for (i = 0; i < len; i++)
-		if (one_page[i] != (char)0) {
-			printf("%ld byte corrupted\n", i);
-			exit(EXIT_FAILURE);
-		}
+		if (one_page[i] != (char)0)
+			ksft_exit_fail_msg("%ld byte corrupted\n", i);
 
-	if (!check_huge_anon(one_page, 0, pmd_pagesize)) {
-		printf("Still AnonHugePages not split\n");
-		exit(EXIT_FAILURE);
-	}
+	if (!check_huge_anon(one_page, 0, pmd_pagesize))
+		ksft_exit_fail_msg("Still AnonHugePages not split\n");
 
 	rss_anon_after = rss_anon();
-	if (rss_anon_after >= rss_anon_before) {
-		printf("Incorrect RssAnon value. Before: %ld After: %ld\n",
+	if (rss_anon_after >= rss_anon_before)
+		ksft_exit_fail_msg("Incorrect RssAnon value. Before: %ld After: %ld\n",
 		       rss_anon_before, rss_anon_after);
-		exit(EXIT_FAILURE);
-	}
 }
 
 void split_pmd_zero_pages(void)
@@ -150,7 +140,7 @@ void split_pmd_zero_pages(void)
 
 	one_page = allocate_zero_filled_hugepage(len);
 	verify_rss_anon_split_huge_page_all_zeroes(one_page, len);
-	printf("Split zero filled huge pages successful\n");
+	ksft_test_result_pass("Split zero filled huge pages successful\n");
 	free(one_page);
 }
 
@@ -491,7 +481,7 @@ int main(int argc, char **argv)
 	if (argc > 1)
 		optional_xfs_path = argv[1];
 
-	ksft_set_plan(3+9);
+	ksft_set_plan(4+9);
 
 	pagesize = getpagesize();
 	pageshift = ffs(pagesize) - 1;
-- 
2.45.2

[PATCH 2/2] selftests/mm: add tests for splitting pmd THPs to all lower orders.

[Zi Yan]

Kernel already supports splitting a folio to any lower order. Test it.

Signed-off-by: Zi Yan <ziy@nvidia.com>
---
 tools/testing/selftests/mm/split_huge_page_test.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
index 128004308233..3d3bc40a268b 100644
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c
@@ -144,7 +144,7 @@ void split_pmd_zero_pages(void)
 	free(one_page);
 }
 
-void split_pmd_thp(void)
+void split_pmd_thp_to_order(int order)
 {
 	char *one_page;
 	size_t len = 4 * pmd_pagesize;
@@ -164,7 +164,7 @@ void split_pmd_thp(void)
 
 	/* split all THPs */
 	write_debugfs(PID_FMT, getpid(), (uint64_t)one_page,
-		(uint64_t)one_page + len, 0);
+		(uint64_t)one_page + len, order);
 
 	for (i = 0; i < len; i++)
 		if (one_page[i] != (char)i)
@@ -174,7 +174,7 @@ void split_pmd_thp(void)
 	if (!check_huge_anon(one_page, 0, pmd_pagesize))
 		ksft_exit_fail_msg("Still AnonHugePages not split\n");
 
-	ksft_test_result_pass("Split huge pages successful\n");
+	ksft_test_result_pass("Split huge pages to order %d successful\n", order);
 	free(one_page);
 }
 
@@ -481,7 +481,7 @@ int main(int argc, char **argv)
 	if (argc > 1)
 		optional_xfs_path = argv[1];
 
-	ksft_set_plan(4+9);
+	ksft_set_plan(1+9+2+9);
 
 	pagesize = getpagesize();
 	pageshift = ffs(pagesize) - 1;
@@ -492,7 +492,10 @@ int main(int argc, char **argv)
 	fd_size = 2 * pmd_pagesize;
 
 	split_pmd_zero_pages();
-	split_pmd_thp();
+
+	for (i = 0; i < 9; i++)
+		split_pmd_thp_to_order(i);
+
 	split_pte_mapped_thp();
 	split_file_backed_thp();
 
-- 
2.45.2

Re: [PATCH 2/2] selftests/mm: add tests for splitting pmd THPs to all lower orders.

[Zi Yan]

On 10 Jan 2025, at 18:50, Zi Yan wrote:

> Kernel already supports splitting a folio to any lower order. Test it.
>
> Signed-off-by: Zi Yan <ziy@nvidia.com>
> ---
>  tools/testing/selftests/mm/split_huge_page_test.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
> index 128004308233..3d3bc40a268b 100644
> --- a/tools/testing/selftests/mm/split_huge_page_test.c
> +++ b/tools/testing/selftests/mm/split_huge_page_test.c
> @@ -144,7 +144,7 @@ void split_pmd_zero_pages(void)
>  	free(one_page);
>  }
>
> -void split_pmd_thp(void)
> +void split_pmd_thp_to_order(int order)
>  {
>  	char *one_page;
>  	size_t len = 4 * pmd_pagesize;
> @@ -164,7 +164,7 @@ void split_pmd_thp(void)
>
>  	/* split all THPs */
>  	write_debugfs(PID_FMT, getpid(), (uint64_t)one_page,
> -		(uint64_t)one_page + len, 0);
> +		(uint64_t)one_page + len, order);
>
>  	for (i = 0; i < len; i++)
>  		if (one_page[i] != (char)i)
> @@ -174,7 +174,7 @@ void split_pmd_thp(void)
>  	if (!check_huge_anon(one_page, 0, pmd_pagesize))
>  		ksft_exit_fail_msg("Still AnonHugePages not split\n");
>
> -	ksft_test_result_pass("Split huge pages successful\n");
> +	ksft_test_result_pass("Split huge pages to order %d successful\n", order);
>  	free(one_page);
>  }
>
> @@ -481,7 +481,7 @@ int main(int argc, char **argv)
>  	if (argc > 1)
>  		optional_xfs_path = argv[1];
>
> -	ksft_set_plan(4+9);
> +	ksft_set_plan(1+9+2+9);
>
>  	pagesize = getpagesize();
>  	pageshift = ffs(pagesize) - 1;
> @@ -492,7 +492,10 @@ int main(int argc, char **argv)
>  	fd_size = 2 * pmd_pagesize;
>
>  	split_pmd_zero_pages();
> -	split_pmd_thp();
> +
> +	for (i = 0; i < 9; i++)
> +		split_pmd_thp_to_order(i);
> +
>  	split_pte_mapped_thp();
>  	split_file_backed_thp();
>

Hi Andrew,

Can you fold the patch below into this one? Anonymous memory does not
support order-1 folio, so there is no need to test splitting to order-1.
Kernel will WARN_ONCE for split_pmd_thp_to_order(1) test and the whole
test will fail at that point.

Thanks.

diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
index 3d3bc40a268b..4b47ab544a0c 100644
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c
@@ -494,7 +494,8 @@ int main(int argc, char **argv)
 	split_pmd_zero_pages();

 	for (i = 0; i < 9; i++)
-		split_pmd_thp_to_order(i);
+		if (i != 1)
+			split_pmd_thp_to_order(i);

 	split_pte_mapped_thp();
 	split_file_backed_thp();


--
Best Regards,
Yan, Zi

Re: [PATCH 2/2] selftests/mm: add tests for splitting pmd THPs to all lower orders.

[Zi Yan]

On 15 Jan 2025, at 21:52, Zi Yan wrote:

> On 10 Jan 2025, at 18:50, Zi Yan wrote:
>
>> Kernel already supports splitting a folio to any lower order. Test it.
>>
>> Signed-off-by: Zi Yan <ziy@nvidia.com>
>> ---
>>  tools/testing/selftests/mm/split_huge_page_test.c | 13 ++++++++-----
>>  1 file changed, 8 insertions(+), 5 deletions(-)
>>
>> diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
>> index 128004308233..3d3bc40a268b 100644
>> --- a/tools/testing/selftests/mm/split_huge_page_test.c
>> +++ b/tools/testing/selftests/mm/split_huge_page_test.c
>> @@ -144,7 +144,7 @@ void split_pmd_zero_pages(void)
>>  	free(one_page);
>>  }
>>
>> -void split_pmd_thp(void)
>> +void split_pmd_thp_to_order(int order)
>>  {
>>  	char *one_page;
>>  	size_t len = 4 * pmd_pagesize;
>> @@ -164,7 +164,7 @@ void split_pmd_thp(void)
>>
>>  	/* split all THPs */
>>  	write_debugfs(PID_FMT, getpid(), (uint64_t)one_page,
>> -		(uint64_t)one_page + len, 0);
>> +		(uint64_t)one_page + len, order);
>>
>>  	for (i = 0; i < len; i++)
>>  		if (one_page[i] != (char)i)
>> @@ -174,7 +174,7 @@ void split_pmd_thp(void)
>>  	if (!check_huge_anon(one_page, 0, pmd_pagesize))
>>  		ksft_exit_fail_msg("Still AnonHugePages not split\n");
>>
>> -	ksft_test_result_pass("Split huge pages successful\n");
>> +	ksft_test_result_pass("Split huge pages to order %d successful\n", order);
>>  	free(one_page);
>>  }
>>
>> @@ -481,7 +481,7 @@ int main(int argc, char **argv)
>>  	if (argc > 1)
>>  		optional_xfs_path = argv[1];
>>
>> -	ksft_set_plan(4+9);
>> +	ksft_set_plan(1+9+2+9);
>>
>>  	pagesize = getpagesize();
>>  	pageshift = ffs(pagesize) - 1;
>> @@ -492,7 +492,10 @@ int main(int argc, char **argv)
>>  	fd_size = 2 * pmd_pagesize;
>>
>>  	split_pmd_zero_pages();
>> -	split_pmd_thp();
>> +
>> +	for (i = 0; i < 9; i++)
>> +		split_pmd_thp_to_order(i);
>> +
>>  	split_pte_mapped_thp();
>>  	split_file_backed_thp();
>>
>
> Hi Andrew,
>
> Can you fold the patch below into this one? Anonymous memory does not
> support order-1 folio, so there is no need to test splitting to order-1.
> Kernel will WARN_ONCE for split_pmd_thp_to_order(1) test and the whole
> test will fail at that point.

Please use the one below, since the number of total tests should be adjusted
as well. Sorry about the noise.


diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
index 3d3bc40a268b..dedab4059c4c 100644
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c
@@ -481,7 +481,7 @@ int main(int argc, char **argv)
 	if (argc > 1)
 		optional_xfs_path = argv[1];

-	ksft_set_plan(1+9+2+9);
+	ksft_set_plan(1+8+2+9);

 	pagesize = getpagesize();
 	pageshift = ffs(pagesize) - 1;
@@ -494,7 +494,8 @@ int main(int argc, char **argv)
 	split_pmd_zero_pages();

 	for (i = 0; i < 9; i++)
-		split_pmd_thp_to_order(i);
+		if (i != 1)
+			split_pmd_thp_to_order(i);

 	split_pte_mapped_thp();
 	split_file_backed_thp();



--
Best Regards,
Yan, Zi