[v4] Better split_huge_page_test result check

[PATCH v4 2/5] selftests/mm: mark all functions static in split_huge_page_test.c

Posted by Zi Yan 5 months, 4 weeks ago

All functions are only used within the file.

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

diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
index 5d07b0b89226..89d3dc08fe4c 100644
--- a/tools/testing/selftests/mm/split_huge_page_test.c
+++ b/tools/testing/selftests/mm/split_huge_page_test.c
@@ -38,7 +38,7 @@ uint64_t pmd_pagesize;
 #define KPF_THP      (1UL<<22)
 #define GET_ORDER(nr_pages)    (31 - __builtin_clz(nr_pages))
 
-int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)
+static int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)
 {
 	uint64_t paddr;
 	uint64_t page_flags;
@@ -136,7 +136,7 @@ static void verify_rss_anon_split_huge_page_all_zeroes(char *one_page, int nr_hp
 		       rss_anon_before, rss_anon_after);
 }
 
-void split_pmd_zero_pages(void)
+static void split_pmd_zero_pages(void)
 {
 	char *one_page;
 	int nr_hpages = 4;
@@ -148,7 +148,7 @@ void split_pmd_zero_pages(void)
 	free(one_page);
 }
 
-void split_pmd_thp_to_order(int order)
+static void split_pmd_thp_to_order(int order)
 {
 	char *one_page;
 	size_t len = 4 * pmd_pagesize;
@@ -182,7 +182,7 @@ void split_pmd_thp_to_order(int order)
 	free(one_page);
 }
 
-void split_pte_mapped_thp(void)
+static void split_pte_mapped_thp(void)
 {
 	char *one_page, *pte_mapped, *pte_mapped2;
 	size_t len = 4 * pmd_pagesize;
@@ -265,7 +265,7 @@ void split_pte_mapped_thp(void)
 	close(kpageflags_fd);
 }
 
-void split_file_backed_thp(int order)
+static void split_file_backed_thp(int order)
 {
 	int status;
 	int fd;
@@ -365,7 +365,7 @@ void split_file_backed_thp(int order)
 	ksft_exit_fail_msg("Error occurred\n");
 }
 
-bool prepare_thp_fs(const char *xfs_path, char *thp_fs_template,
+static bool prepare_thp_fs(const char *xfs_path, char *thp_fs_template,
 		const char **thp_fs_loc)
 {
 	if (xfs_path) {
@@ -381,7 +381,7 @@ bool prepare_thp_fs(const char *xfs_path, char *thp_fs_template,
 	return true;
 }
 
-void cleanup_thp_fs(const char *thp_fs_loc, bool created_tmp)
+static void cleanup_thp_fs(const char *thp_fs_loc, bool created_tmp)
 {
 	int status;
 
@@ -394,8 +394,8 @@ void cleanup_thp_fs(const char *thp_fs_loc, bool created_tmp)
 				   strerror(errno));
 }
 
-int create_pagecache_thp_and_fd(const char *testfile, size_t fd_size, int *fd,
-		char **addr)
+static int create_pagecache_thp_and_fd(const char *testfile, size_t fd_size,
+		int *fd, char **addr)
 {
 	size_t i;
 	unsigned char buf[1024];
@@ -461,8 +461,8 @@ int create_pagecache_thp_and_fd(const char *testfile, size_t fd_size, int *fd,
 	return -1;
 }
 
-void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc,
-		int order, int offset)
+static void split_thp_in_pagecache_to_order_at(size_t fd_size,
+		const char *fs_loc, int order, int offset)
 {
 	int fd;
 	char *addr;
-- 
2.50.1

Re: [PATCH v4 2/5] selftests/mm: mark all functions static in split_huge_page_test.c

Posted by David Hildenbrand 5 months, 3 weeks ago

On 15.08.25 04:39, Zi Yan wrote:
> All functions are only used within the file.
> 
> Signed-off-by: Zi Yan <ziy@nvidia.com>
> ---

Acked-by: David Hildenbrand <david@redhat.com>

-- 
Cheers

David / dhildenb

Re: [PATCH v4 2/5] selftests/mm: mark all functions static in split_huge_page_test.c

Posted by wang lian 5 months, 4 weeks ago


> On Aug 15, 2025, at 10:39, Zi Yan <ziy@nvidia.com> wrote:
> 
> All functions are only used within the file.
> 
> Signed-off-by: Zi Yan <ziy@nvidia.com>
> ---
> .../selftests/mm/split_huge_page_test.c       | 22 +++++++++----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/tools/testing/selftests/mm/split_huge_page_test.c b/tools/testing/selftests/mm/split_huge_page_test.c
> index 5d07b0b89226..89d3dc08fe4c 100644
> --- a/tools/testing/selftests/mm/split_huge_page_test.c
> +++ b/tools/testing/selftests/mm/split_huge_page_test.c
> @@ -38,7 +38,7 @@ uint64_t pmd_pagesize;
> #define KPF_THP      (1UL<<22)
> #define GET_ORDER(nr_pages)    (31 - __builtin_clz(nr_pages))
> 
> -int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)
> +static int is_backed_by_thp(char *vaddr, int pagemap_file, int kpageflags_file)
> {
> 	uint64_t paddr;
> 	uint64_t page_flags;
> @@ -136,7 +136,7 @@ static void verify_rss_anon_split_huge_page_all_zeroes(char *one_page, int nr_hp
> 		       rss_anon_before, rss_anon_after);
> }
> 
> -void split_pmd_zero_pages(void)
> +static void split_pmd_zero_pages(void)
> {
> 	char *one_page;
> 	int nr_hpages = 4;
> @@ -148,7 +148,7 @@ void split_pmd_zero_pages(void)
> 	free(one_page);
> }
> 
> -void split_pmd_thp_to_order(int order)
> +static void split_pmd_thp_to_order(int order)
> {
> 	char *one_page;
> 	size_t len = 4 * pmd_pagesize;
> @@ -182,7 +182,7 @@ void split_pmd_thp_to_order(int order)
> 	free(one_page);
> }
> 
> -void split_pte_mapped_thp(void)
> +static void split_pte_mapped_thp(void)
> {
> 	char *one_page, *pte_mapped, *pte_mapped2;
> 	size_t len = 4 * pmd_pagesize;
> @@ -265,7 +265,7 @@ void split_pte_mapped_thp(void)
> 	close(kpageflags_fd);
> }
> 
> -void split_file_backed_thp(int order)
> +static void split_file_backed_thp(int order)
> {
> 	int status;
> 	int fd;
> @@ -365,7 +365,7 @@ void split_file_backed_thp(int order)
> 	ksft_exit_fail_msg("Error occurred\n");
> }
> 
> -bool prepare_thp_fs(const char *xfs_path, char *thp_fs_template,
> +static bool prepare_thp_fs(const char *xfs_path, char *thp_fs_template,
> 		const char **thp_fs_loc)
> {
> 	if (xfs_path) {
> @@ -381,7 +381,7 @@ bool prepare_thp_fs(const char *xfs_path, char *thp_fs_template,
> 	return true;
> }
> 
> -void cleanup_thp_fs(const char *thp_fs_loc, bool created_tmp)
> +static void cleanup_thp_fs(const char *thp_fs_loc, bool created_tmp)
> {
> 	int status;
> 
> @@ -394,8 +394,8 @@ void cleanup_thp_fs(const char *thp_fs_loc, bool created_tmp)
> 				   strerror(errno));
> }
> 
> -int create_pagecache_thp_and_fd(const char *testfile, size_t fd_size, int *fd,
> -		char **addr)
> +static int create_pagecache_thp_and_fd(const char *testfile, size_t fd_size,
> +		int *fd, char **addr)
> {
> 	size_t i;
> 	unsigned char buf[1024];
> @@ -461,8 +461,8 @@ int create_pagecache_thp_and_fd(const char *testfile, size_t fd_size, int *fd,
> 	return -1;
> }
> 
> -void split_thp_in_pagecache_to_order_at(size_t fd_size, const char *fs_loc,
> -		int order, int offset)
> +static void split_thp_in_pagecache_to_order_at(size_t fd_size,
> +		const char *fs_loc, int order, int offset)
> {
> 	int fd;
> 	char *addr;
> -- 
> 2.50.1

LGTM.
Reviewed-by: wang lian <lianux.mm@gmail.com>

Re: [PATCH v4 2/5] selftests/mm: mark all functions static in split_huge_page_test.c

Posted by Wei Yang 5 months, 4 weeks ago

On Thu, Aug 14, 2025 at 10:39:11PM -0400, Zi Yan wrote:
>All functions are only used within the file.
>
>Signed-off-by: Zi Yan <ziy@nvidia.com>

Reviewed-by: Wei Yang <richard.weiyang@gmail.com>

-- 
Wei Yang
Help you, Help me

[PATCH v4 1/5] mm/huge_memory: add new_order and offset to split_huge_pages*() pr_debug.
[PATCH v4 2/5] selftests/mm: mark all functions static in split_huge_page_test.c
[PATCH v4 3/5] selftests/mm: reimplement is_backed_by_thp() with more precise check
[PATCH v4 4/5] selftests/mm: add check_after_split_folio_orders() helper.
[PATCH v4 5/5] selftests/mm: check after-split folio orders in split_huge_page_test.