From: Peter Xu Date: Wed, 2 Jun 2021 03:52:51 +0000 (+1000) Subject: userfaultfd-selftests-reinitialize-test-context-in-each-test-fix X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c3bc418b62eb17ed1947568e99e4abf9652efba2;p=users%2Fjedix%2Flinux-maple.git 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 Cc: Axel Rasmussen Signed-off-by: Andrew Morton Signed-off-by: Stephen Rothwell --- diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index c4150b4fbd176..f78816130c7ff 100644 --- 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"); }