From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90755C433B4 for ; Fri, 9 Apr 2021 02:40:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CE09610FC for ; Fri, 9 Apr 2021 02:40:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232770AbhDICkn (ORCPT ); Thu, 8 Apr 2021 22:40:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:58292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232616AbhDICkm (ORCPT ); Thu, 8 Apr 2021 22:40:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BA771610F9; Fri, 9 Apr 2021 02:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1617936030; bh=qWFxhFMYLBKDyX/myxpSrathZdegs0HhSiN5JzoBLpc=; h=Date:From:To:Subject:From; b=T6g22iC+bo0ojR1tqs8WOmGlP1BD4p0rOxBStiytWWhKcIEe5U1zTeV2RzK5W7UKJ 4YvrULPtp/iPGAU91EseVJA3LQuMyforJqgBqwEjseky6L6WqHl/WGP70wU0OreICm PEMr3TwvN0eqERfrvdASZ+wGr3Ya6oMWxOlQF2Kk= Date: Thu, 08 Apr 2021 19:40:29 -0700 From: akpm@linux-foundation.org To: aarcange@redhat.com, almasrymina@google.com, axelrasmussen@google.com, bgeffon@google.com, cannonmatthews@google.com, dgilbert@redhat.com, hughd@google.com, jglisse@redhat.com, joe@perches.com, lokeshgidra@google.com, mm-commits@vger.kernel.org, oupton@google.com, peterx@redhat.com, rientjes@google.com, rppt@linux.vnet.ibm.com, shli@fb.com, shuah@kernel.org, viro@zeniv.linux.org.uk, walken@google.com, wangqing@vivo.com Subject: [to-be-updated] userfaultfd-selftests-exercise-minor-fault-handling-shmem-support.patch removed from -mm tree Message-ID: <20210409024029.RrtkjnEcV%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: userfaultfd/selftests: exercise minor fault handling shmem support has been removed from the -mm tree. Its filename was userfaultfd-selftests-exercise-minor-fault-handling-shmem-support.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Axel Rasmussen Subject: userfaultfd/selftests: exercise minor fault handling shmem support Enable test_uffdio_minor for test_type == TEST_SHMEM, and modify the test slightly to pass in / check for the right feature flags. Link: https://lkml.kernel.org/r/20210302000133.272579-6-axelrasmussen@google.com Signed-off-by: Axel Rasmussen Cc: Alexander Viro Cc: Andrea Arcangeli Cc: Brian Geffon Cc: Cannon Matthews Cc: David Rientjes Cc: "Dr . David Alan Gilbert" Cc: Hugh Dickins Cc: Jerome Glisse Cc: Joe Perches Cc: Lokesh Gidra Cc: Michel Lespinasse Cc: Mike Rapoport Cc: Mina Almasry Cc: Oliver Upton Cc: Peter Xu Cc: Shaohua Li Cc: Shuah Khan Cc: Wang Qing Signed-off-by: Andrew Morton --- tools/testing/selftests/vm/userfaultfd.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) --- a/tools/testing/selftests/vm/userfaultfd.c~userfaultfd-selftests-exercise-minor-fault-handling-shmem-support +++ a/tools/testing/selftests/vm/userfaultfd.c @@ -1423,7 +1423,7 @@ static int userfaultfd_minor_test(void) void *expected_page; char c; struct uffd_stats stats = { 0 }; - uint64_t features = UFFD_FEATURE_MINOR_HUGETLBFS; + uint64_t req_features, features_out; if (!test_uffdio_minor) return 0; @@ -1431,10 +1431,18 @@ static int userfaultfd_minor_test(void) printf("testing minor faults: "); fflush(stdout); - if (uffd_test_ctx_clear() || uffd_test_ctx_init_ext(&features)) + if (test_type == TEST_HUGETLB) + req_features = UFFD_FEATURE_MINOR_HUGETLBFS; + else if (test_type == TEST_SHMEM) + req_features = UFFD_FEATURE_MINOR_SHMEM; + else return 1; - /* If kernel reports the feature isn't supported, skip the test. */ - if (!(features & UFFD_FEATURE_MINOR_HUGETLBFS)) { + + features_out = req_features; + if (uffd_test_ctx_clear() || uffd_test_ctx_init_ext(&features_out)) + return 1; + /* If kernel reports required features aren't supported, skip test. */ + if ((features_out & req_features) != req_features) { printf("skipping test due to lack of feature support\n"); fflush(stdout); return 0; @@ -1444,7 +1452,7 @@ static int userfaultfd_minor_test(void) uffdio_register.range.len = nr_pages * page_size; uffdio_register.mode = UFFDIO_REGISTER_MODE_MINOR; if (ioctl(uffd, UFFDIO_REGISTER, &uffdio_register)) { - fprintf(stderr, "register failure\n"); + perror("register failure"); exit(1); } @@ -1708,6 +1716,7 @@ static void set_test_type(const char *ty map_shared = true; test_type = TEST_SHMEM; uffd_test_ops = &shmem_uffd_test_ops; + test_uffdio_minor = true; } else { fprintf(stderr, "Unknown test type: %s\n", type); exit(1); } _ Patches currently in -mm which might be from axelrasmussen@google.com are userfaultfd-add-minor-fault-registration-mode.patch userfaultfd-disable-huge-pmd-sharing-for-minor-registered-vmas.patch userfaultfd-hugetlbfs-only-compile-uffd-helpers-if-config-enabled.patch userfaultfd-add-uffdio_continue-ioctl.patch userfaultfd-update-documentation-to-describe-minor-fault-handling.patch userfaultfd-selftests-add-test-exercising-minor-fault-handling.patch