selftests/mm: virtual_address_range: Switch to ksft_exit_fail_msg
authorDev Jain <dev.jain@arm.com>
Thu, 14 Mar 2024 12:22:50 +0000 (17:52 +0530)
committerAndrew Morton <akpm@linux-foundation.org>
Fri, 26 Apr 2024 03:55:43 +0000 (20:55 -0700)
mmap() must not succeed in validate_lower_address_hint(), for if it does,
it is a bug in mmap() itself.  Reflect this behaviour with
ksft_exit_fail_msg().  While at it, do some formatting changes.

Link: https://lkml.kernel.org/r/20240314122250.68534-1-dev.jain@arm.com
Signed-off-by: Dev Jain <dev.jain@arm.com>
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
tools/testing/selftests/mm/virtual_address_range.c

index 7bcf8d48256a66b4e23165145e873cef9d6ec99c..426ddfc345fbd76a80da8c556860089eab2d0fda 100644 (file)
@@ -85,7 +85,7 @@ static int validate_lower_address_hint(void)
        char *ptr;
 
        ptr = mmap((void *) (1UL << 45), MAP_CHUNK_SIZE, PROT_READ |
-                       PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+                  PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
        if (ptr == MAP_FAILED)
                return 0;
@@ -105,13 +105,11 @@ int main(int argc, char *argv[])
 
        for (i = 0; i < NR_CHUNKS_LOW; i++) {
                ptr[i] = mmap(NULL, MAP_CHUNK_SIZE, PROT_READ | PROT_WRITE,
-                                       MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+                             MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
                if (ptr[i] == MAP_FAILED) {
-                       if (validate_lower_address_hint()) {
-                               ksft_test_result_skip("Memory constraint not fulfilled\n");
-                               ksft_finished();
-                       }
+                       if (validate_lower_address_hint())
+                               ksft_exit_fail_msg("mmap unexpectedly succeeded with hint\n");
                        break;
                }
 
@@ -127,7 +125,7 @@ int main(int argc, char *argv[])
        for (i = 0; i < NR_CHUNKS_HIGH; i++) {
                hint = hind_addr();
                hptr[i] = mmap(hint, MAP_CHUNK_SIZE, PROT_READ | PROT_WRITE,
-                                       MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+                              MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 
                if (hptr[i] == MAP_FAILED)
                        break;