selftest/vm: add mremap expand merge offset test

Add a test to assert that we can mremap() and expand a mapping starting
from an offset within an existing mapping.  We unmap the last page in a 3
page mapping to ensure that the remap should always succeed, before
remapping from the 2nd page.

This is additionally a regression test for the issue solved in "mm,
mremap: fix mremap() expanding vma with addr inside vma" and confirmed to
fail prior to the change and pass after it.

Finally, this patch updates the existing mremap expand merge test to check
error conditions and reduce code duplication between the two tests.

[lstoakes@gmail.com: increment num_expand_tests so test doesn't complain about unexpected tests being run]
Link: https://lkml.kernel.org/r/8ff3ba3cadc0b6c1b2688ae5c851bf73aa062d57.1673701836.git.lstoakes@gmail.com
Link: https://lkml.kernel.org/r/02b117a8ffd52acc01dc66c2fb39754f08d92c0e.1672675824.git.lstoakes@gmail.com
Signed-off-by: Lorenzo Stoakes <lstoakes@gmail.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Jakub Matěna <matenajakub@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/tools/testing/selftests/mm/mremap_test.c b/tools/testing/selftests/mm/mremap_test.c
index 9496346973d44a6debc46ffcb783c9131aace9de..5c3773de9f0f78b1be7df121bdd9cc294037285e 100644 (file)
--- a/tools/testing/selftests/mm/mremap_test.c
+++ b/tools/testing/selftests/mm/mremap_test.c
@@ -119,47 +119,109 @@ static unsigned long long get_mmap_min_addr(void)
 }
 
 /*
- * This test validates that merge is called when expanding a mapping.
- * Mapping containing three pages is created, middle page is unmapped
- * and then the mapping containing the first page is expanded so that
- * it fills the created hole. The two parts should merge creating
- * single mapping with three pages.
+ * Using /proc/self/maps, assert that the specified address range is contained
+ * within a single mapping.
  */
-static void mremap_expand_merge(unsigned long page_size)
+static bool is_range_mapped(FILE *maps_fp, void *start, void *end)
 {
-       char *test_name = "mremap expand merge";
-       FILE *fp;
        char *line = NULL;
        size_t len = 0;
        bool success = false;
-       char *start = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE,
-                          MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-
-       munmap(start + page_size, page_size);
-       mremap(start, page_size, 2 * page_size, 0);
 
-       fp = fopen("/proc/self/maps", "r");
-       if (fp == NULL) {
-               ksft_test_result_fail("%s\n", test_name);
-               return;
-       }
+       rewind(maps_fp);
 
-       while (getline(&line, &len, fp) != -1) {
+       while (getline(&line, &len, maps_fp) != -1) {
                char *first = strtok(line, "- ");
                void *first_val = (void *)strtol(first, NULL, 16);
                char *second = strtok(NULL, "- ");
                void *second_val = (void *) strtol(second, NULL, 16);
 
-               if (first_val == start && second_val == start + 3 * page_size) {
+               if (first_val <= start && second_val >= end) {
                        success = true;
                        break;
                }
        }
+
+       return success;
+}
+
+/*
+ * This test validates that merge is called when expanding a mapping.
+ * Mapping containing three pages is created, middle page is unmapped
+ * and then the mapping containing the first page is expanded so that
+ * it fills the created hole. The two parts should merge creating
+ * single mapping with three pages.
+ */
+static void mremap_expand_merge(FILE *maps_fp, unsigned long page_size)
+{
+       char *test_name = "mremap expand merge";
+       bool success = false;
+       char *remap, *start;
+
+       start = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE,
+                    MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+       if (start == MAP_FAILED) {
+               ksft_print_msg("mmap failed: %s\n", strerror(errno));
+               goto out;
+       }
+
+       munmap(start + page_size, page_size);
+       remap = mremap(start, page_size, 2 * page_size, 0);
+       if (remap == MAP_FAILED) {
+               ksft_print_msg("mremap failed: %s\n", strerror(errno));
+               munmap(start, page_size);
+               munmap(start + 2 * page_size, page_size);
+               goto out;
+       }
+
+       success = is_range_mapped(maps_fp, start, start + 3 * page_size);
+       munmap(start, 3 * page_size);
+
+out:
+       if (success)
+               ksft_test_result_pass("%s\n", test_name);
+       else
+               ksft_test_result_fail("%s\n", test_name);
+}
+
+/*
+ * Similar to mremap_expand_merge() except instead of removing the middle page,
+ * we remove the last then attempt to remap offset from the second page. This
+ * should result in the mapping being restored to its former state.
+ */
+static void mremap_expand_merge_offset(FILE *maps_fp, unsigned long page_size)
+{
+
+       char *test_name = "mremap expand merge offset";
+       bool success = false;
+       char *remap, *start;
+
+       start = mmap(NULL, 3 * page_size, PROT_READ | PROT_WRITE,
+                    MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+
+       if (start == MAP_FAILED) {
+               ksft_print_msg("mmap failed: %s\n", strerror(errno));
+               goto out;
+       }
+
+       /* Unmap final page to ensure we have space to expand. */
+       munmap(start + 2 * page_size, page_size);
+       remap = mremap(start + page_size, page_size, 2 * page_size, 0);
+       if (remap == MAP_FAILED) {
+               ksft_print_msg("mremap failed: %s\n", strerror(errno));
+               munmap(start, 2 * page_size);
+               goto out;
+       }
+
+       success = is_range_mapped(maps_fp, start, start + 3 * page_size);
+       munmap(start, 3 * page_size);
+
+out:
        if (success)
                ksft_test_result_pass("%s\n", test_name);
        else
                ksft_test_result_fail("%s\n", test_name);
-       fclose(fp);
 }
 
 /*
@@ -380,11 +442,12 @@ int main(int argc, char **argv)
        int i, run_perf_tests;
        unsigned int threshold_mb = VALIDATION_DEFAULT_THRESHOLD;
        unsigned int pattern_seed;
-       int num_expand_tests = 1;
+       int num_expand_tests = 2;
        struct test test_cases[MAX_TEST];
        struct test perf_test_cases[MAX_PERF_TEST];
        int page_size;
        time_t t;
+       FILE *maps_fp;
 
        pattern_seed = (unsigned int) time(&t);
 
@@ -458,7 +521,17 @@ int main(int argc, char **argv)
                run_mremap_test_case(test_cases[i], &failures, threshold_mb,
                                     pattern_seed);
 
-       mremap_expand_merge(page_size);
+       maps_fp = fopen("/proc/self/maps", "r");
+
+       if (maps_fp == NULL) {
+               ksft_print_msg("Failed to read /proc/self/maps: %s\n", strerror(errno));
+               exit(KSFT_FAIL);
+       }
+
+       mremap_expand_merge(maps_fp, page_size);
+       mremap_expand_merge_offset(maps_fp, page_size);
+
+       fclose(maps_fp);
 
        if (run_perf_tests) {
                ksft_print_msg("\n%s\n",