Skip to contentSkip to conversation

selftests/mm: khugepaged: consolidate error exits via kselftest helpers

PATCH Applied Hongfu Li 5 participants 5 messages Aug 17 – Aug 18

Subsystems (4)
lore
Share & tools
lore

Hongfu Li

author
#0 lore raw

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

From: Hongfu Li <[email protected]>

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.

---
 tools/testing/selftests/mm/khugepaged.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
tools/testing/selftests/mm/khugepaged.c +7 -13
index 0d6c71ed2fae..8d1b87f2195c 100644
@@ -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;
 	}
 }
Signature · 1 line
2.54.0
reviewer Reviewed-by on v1 1/1
#2 lore raw
In reply to Hongfu Li
Quoted 7 lines · Hongfu Li

From: Hongfu Li <[email protected]>

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.

Quoted 48 lines
---
 tools/testing/selftests/mm/khugepaged.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)
tools/testing/selftests/mm/khugepaged.c +7 -13
index 0d6c71ed2fae..8d1b87f2195c 100644
@@ -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;
 	}
 }
Signature · 1 line
2.54.0
Signature · 2 lines
Sincerely yours,
Mike.
reviewer Reviewed-by on v1 1/1
#3 lore raw
In reply to Hongfu Li
Quoted 11 lines · Hongfu Li

From: Hongfu Li <[email protected]>

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.

---
 tools/testing/selftests/mm/khugepaged.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Thanks.

Signature · 2 lines
Best Regards,
Yan, Zi