[PATCH] selftests/mm: khugepaged: consolidate error exits via kselftest helpers

[PATCH] selftests/mm: khugepaged: consolidate error exits via kselftest helpers

[Hongfu Li]

From: Hongfu Li <lihongfu@kylinos.cn>

Replace the perror()+exit(EXIT_FAILURE) pattern with
ksft_exit_fail_perror() so failures are reported through the
kselftest framework, consistent with the rest of the file.

Signed-off-by: Hongfu Li <lihongfu@kylinos.cn>
---
 tools/testing/selftests/mm/khugepaged.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c
index 0d6c71ed2fae..8d1b87f2195c 100644
--- a/tools/testing/selftests/mm/khugepaged.c
+++ b/tools/testing/selftests/mm/khugepaged.c
@@ -358,21 +358,15 @@ static void *file_setup_area_common(int nr_hpages, enum file_setup_ops setup)
 		ksft_exit_fail_perror("open()");
 
 	size = nr_hpages * hpage_pmd_size;
-	if (ftruncate(fd, size)) {
-		perror("ftruncate()");
-		exit(EXIT_FAILURE);
-	}
+	if (ftruncate(fd, size))
+		ksft_exit_fail_perror("ftruncate()");
 	p = mmap(BASE_ADDR, size, PROT_READ | PROT_WRITE,
 		MAP_SHARED, fd, 0);
-	if (p != BASE_ADDR) {
-		perror("mmap()");
-		exit(EXIT_FAILURE);
-	}
+	if (p != BASE_ADDR)
+		ksft_exit_fail_perror("mmap()");
 	fill_memory(p, 0, size);
-	if (msync(p, size, MS_SYNC)) {
-		perror("msync()");
-		exit(EXIT_FAILURE);
-	}
+	if (msync(p, size, MS_SYNC))
+		ksft_exit_fail_perror("msync()");
 	close(fd);
 	munmap(p, size);
 	success("OK");
@@ -447,7 +441,7 @@ static bool file_check_huge(void *addr, size_t len, int nr_hpages,
 	case VMA_SHMEM:
 		return check_huge_shmem(addr, len, nr_hpages, hpage_size);
 	default:
-		exit(EXIT_FAILURE);
+		ksft_exit_fail_msg("Unknown VMA type\n");
 		return false;
 	}
 }
-- 
2.54.0

Re: [PATCH] selftests/mm: khugepaged: consolidate error exits via kselftest helpers

[David Hildenbrand (Arm)]

On 8/17/26 08:19, Hongfu Li wrote:
> From: Hongfu Li <lihongfu@kylinos.cn>
> 
> Replace the perror()+exit(EXIT_FAILURE) pattern with
> ksft_exit_fail_perror() so failures are reported through the
> kselftest framework, consistent with the rest of the file.
> 
> Signed-off-by: Hongfu Li <lihongfu@kylinos.cn>
> ---

Acked-by: David Hildenbrand (Arm) <david@kernel.org>

-- 
Cheers,

David

Re: [PATCH] selftests/mm: khugepaged: consolidate error exits via kselftest helpers

[Mike Rapoport]

On Mon, Aug 17, 2026 at 02:19:55PM +0800, Hongfu Li wrote:
> From: Hongfu Li <lihongfu@kylinos.cn>
> 
> Replace the perror()+exit(EXIT_FAILURE) pattern with
> ksft_exit_fail_perror() so failures are reported through the
> kselftest framework, consistent with the rest of the file.
> 
> Signed-off-by: Hongfu Li <lihongfu@kylinos.cn>

Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>

> ---
>  tools/testing/selftests/mm/khugepaged.c | 20 +++++++-------------
>  1 file changed, 7 insertions(+), 13 deletions(-)
> 
> diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c
> index 0d6c71ed2fae..8d1b87f2195c 100644
> --- a/tools/testing/selftests/mm/khugepaged.c
> +++ b/tools/testing/selftests/mm/khugepaged.c
> @@ -358,21 +358,15 @@ static void *file_setup_area_common(int nr_hpages, enum file_setup_ops setup)
>  		ksft_exit_fail_perror("open()");
>  
>  	size = nr_hpages * hpage_pmd_size;
> -	if (ftruncate(fd, size)) {
> -		perror("ftruncate()");
> -		exit(EXIT_FAILURE);
> -	}
> +	if (ftruncate(fd, size))
> +		ksft_exit_fail_perror("ftruncate()");
>  	p = mmap(BASE_ADDR, size, PROT_READ | PROT_WRITE,
>  		MAP_SHARED, fd, 0);
> -	if (p != BASE_ADDR) {
> -		perror("mmap()");
> -		exit(EXIT_FAILURE);
> -	}
> +	if (p != BASE_ADDR)
> +		ksft_exit_fail_perror("mmap()");
>  	fill_memory(p, 0, size);
> -	if (msync(p, size, MS_SYNC)) {
> -		perror("msync()");
> -		exit(EXIT_FAILURE);
> -	}
> +	if (msync(p, size, MS_SYNC))
> +		ksft_exit_fail_perror("msync()");
>  	close(fd);
>  	munmap(p, size);
>  	success("OK");
> @@ -447,7 +441,7 @@ static bool file_check_huge(void *addr, size_t len, int nr_hpages,
>  	case VMA_SHMEM:
>  		return check_huge_shmem(addr, len, nr_hpages, hpage_size);
>  	default:
> -		exit(EXIT_FAILURE);
> +		ksft_exit_fail_msg("Unknown VMA type\n");
>  		return false;
>  	}
>  }
> -- 
> 2.54.0
> 

-- 
Sincerely yours,
Mike.