userfaultfd-selftests-reinitialize-test-context-in-each-test-fix

fix conflict between this patch and the uffd pagemap series

Link: https://lkml.kernel.org/r/YKQqKrl+/cQ1utrb@t490s
Signed-off-by: Peter Xu <peterx@redhat.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c
index c4150b4fbd176e4067aec1ccba48c817957942b6..f78816130c7ff71d63d6450332cae08095cbdcb2 100644 (file)
--- a/tools/testing/selftests/vm/userfaultfd.c
+++ b/tools/testing/selftests/vm/userfaultfd.c
@@ -1326,7 +1326,7 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize)
        /* Flush so it doesn't flush twice in parent/child later */
        fflush(stdout);
 
-       uffd_test_ops->release_pages(area_dst);
+       uffd_test_ctx_init(0);
 
        if (test_pgsize > page_size) {
                /* This is a thp test */
@@ -1338,9 +1338,6 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize)
                        err("madvise(MADV_NOHUGEPAGE) failed");
        }
 
-       if (userfaultfd_open(0))
-               err("userfaultfd_open");
-
        uffdio_register.range.start = (unsigned long) area_dst;
        uffdio_register.range.len = nr_pages * page_size;
        uffdio_register.mode = UFFDIO_REGISTER_MODE_WP;
@@ -1383,7 +1380,6 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize)
        pagemap_check_wp(value, false);
 
        close(pagemap_fd);
-       close(uffd);
        printf("done\n");
 }