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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 ECBB8C433DB for ; Tue, 23 Mar 2021 00:51:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9593B619A9 for ; Tue, 23 Mar 2021 00:51:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9593B619A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2E4756B0142; Mon, 22 Mar 2021 20:51:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2BAE76B0144; Mon, 22 Mar 2021 20:51:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1839E6B0145; Mon, 22 Mar 2021 20:51:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0061.hostedemail.com [216.40.44.61]) by kanga.kvack.org (Postfix) with ESMTP id E881A6B0142 for ; Mon, 22 Mar 2021 20:51:07 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id B67A5180ACF6C for ; Tue, 23 Mar 2021 00:51:07 +0000 (UTC) X-FDA: 77949309774.21.81600B0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by imf25.hostedemail.com (Postfix) with ESMTP id 438FD6000102 for ; Tue, 23 Mar 2021 00:51:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616460666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XCYwl192EbRTTqhTN6RAwmcLAOqLyfsZgbfALtQItf4=; b=QOxNgtZnFtU91xCihNvf1xKHu7ziY7JyGbuVPR6iprV9aBocSIzLqcH4+RnWRLUv93BdT2 XmLzEF4Vv7JGzOlPuVnAUeuz8/LbNK6P4jzlOchfZLvQIKlA2gDqY/gwcMByih0TTT9ViX 6mmyVSXUurTQ9fxzus0fFQavC3fAx9Y= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-83-v_YmQKvXM1-BAYsxLBHtMw-1; Mon, 22 Mar 2021 20:51:03 -0400 X-MC-Unique: v_YmQKvXM1-BAYsxLBHtMw-1 Received: by mail-qv1-f69.google.com with SMTP id da16so574251qvb.2 for ; Mon, 22 Mar 2021 17:51:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XCYwl192EbRTTqhTN6RAwmcLAOqLyfsZgbfALtQItf4=; b=O2SMGco6vbtacdasIV1OPuQgbNHoCY+MPTR8auVwZQXWpMLt3gKCg9DhzicNpZ/vmN hRigiPUQcFqSng9k0dK/qmz11s3rFVNJT65CnkyHG2des4+WdbygzSQs20tkQNIDne7g ga0BYRw3qAMiQNRECIQAOYVTT4C8bQIA/bM6tqwAdNjg38DmrBJd8SZ7FIk1UOtzfrpE ncsn05Jpq6u1Lo4wF2WnzHJscTEenGEO+cXyqpaGKfsQA2e94tzpXCCgRLawxiQcPZVw 3hc809fOBB0rnSYpJSV4aYKRZSS8TVYPTxxMIEREcvK/LA/ISVrpl2VYzgNytfjlXdD4 xfYg== X-Gm-Message-State: AOAM5338TqJjqmv8PyWWgJHjpIyIfTq+TRS9orBnCHpj1gG2xfLdNQCw RP3tiXr1inwksGfSqVnKTFUVmD4p7KXLRj0QfV3gWYGGYJuDlxphyN94ezdj3Jy0B9Cmi2O26M1 8xpYtc7mZeXnQdXzjdf+seghSRQ6IbTteaERPLeFzPTMSGpubBFN/FQIfEftN X-Received: by 2002:a0c:aa45:: with SMTP id e5mr2400663qvb.44.1616460662195; Mon, 22 Mar 2021 17:51:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzz8+ectXkImQeBvED857DjCH8Njpx7f7CDz4cyDPiZa49fT5ITS2E9jSS61/fmqfTmNpQtdw== X-Received: by 2002:a0c:aa45:: with SMTP id e5mr2400634qvb.44.1616460661914; Mon, 22 Mar 2021 17:51:01 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-82-174-91-135-175.dsl.bell.ca. [174.91.135.175]) by smtp.gmail.com with ESMTPSA id i8sm9816695qtj.16.2021.03.22.17.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Mar 2021 17:51:01 -0700 (PDT) From: Peter Xu To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Mike Rapoport , Nadav Amit , Jerome Glisse , Hugh Dickins , Andrea Arcangeli , Andrew Morton , "Kirill A . Shutemov" , Axel Rasmussen , peterx@redhat.com, Mike Kravetz , Matthew Wilcox Subject: [PATCH 23/23] userfaultfd/selftests: Enable uffd-wp for shmem/hugetlbfs Date: Mon, 22 Mar 2021 20:50:59 -0400 Message-Id: <20210323005059.36084-1-peterx@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323004912.35132-1-peterx@redhat.com> References: <20210323004912.35132-1-peterx@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=peterx@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 438FD6000102 X-Stat-Signature: 6rh7d9p1wjsu56ty715t3tihktpzdeyt Received-SPF: none (redhat.com>: No applicable sender policy available) receiver=imf25; identity=mailfrom; envelope-from=""; helo=us-smtp-delivery-124.mimecast.com; client-ip=216.205.24.124 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1616460666-304251 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: After we added support for shmem and hugetlbfs, we can turn uffd-wp test = on always now. Define HUGETLB_EXPECTED_IOCTLS to avoid using UFFD_API_RANGE_IOCTLS_BASIC= , because UFFD_API_RANGE_IOCTLS_BASIC is normally a superset of capabilitie= s, while the test may not satisfy them all. E.g., when hugetlb registered w= ithout minor mode, then we need to explicitly remove _UFFDIO_CONTINUE. Same thi= ng to uffd-wp, as we'll need to explicitly remove _UFFDIO_WRITEPROTECT if not registered with uffd-wp. For the long term, we may consider dropping UFFD_API_* macros completely = from uapi/linux/userfaultfd.h header files, because it may cause kernel header update to easily break userspace. Signed-off-by: Peter Xu --- tools/testing/selftests/vm/userfaultfd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/sel= ftests/vm/userfaultfd.c index 1f5f9362ec7b..5fa9a506ded5 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -80,7 +80,7 @@ static int test_type; static volatile bool test_uffdio_copy_eexist =3D true; static volatile bool test_uffdio_zeropage_eexist =3D true; /* Whether to test uffd write-protection */ -static bool test_uffdio_wp =3D false; +static bool test_uffdio_wp =3D true; =20 static bool map_shared; static int shm_fd; @@ -319,6 +319,9 @@ struct uffd_test_ops { (1 << _UFFDIO_ZEROPAGE) | \ (1 << _UFFDIO_WRITEPROTECT)) =20 +#define HUGETLB_EXPECTED_IOCTLS ((1 << _UFFDIO_WAKE) | \ + (1 << _UFFDIO_COPY)) + static struct uffd_test_ops anon_uffd_test_ops =3D { .expected_ioctls =3D ANON_EXPECTED_IOCTLS, .allocate_area =3D anon_allocate_area, @@ -334,7 +337,7 @@ static struct uffd_test_ops shmem_uffd_test_ops =3D { }; =20 static struct uffd_test_ops hugetlb_uffd_test_ops =3D { - .expected_ioctls =3D UFFD_API_RANGE_IOCTLS_BASIC & ~(1 << _UFFDIO_CONTI= NUE), + .expected_ioctls =3D HUGETLB_EXPECTED_IOCTLS, .allocate_area =3D hugetlb_allocate_area, .release_pages =3D hugetlb_release_pages, .alias_mapping =3D hugetlb_alias_mapping, @@ -1433,8 +1436,6 @@ static void set_test_type(const char *type) if (!strcmp(type, "anon")) { test_type =3D TEST_ANON; uffd_test_ops =3D &anon_uffd_test_ops; - /* Only enable write-protect test for anonymous test */ - test_uffdio_wp =3D true; } else if (!strcmp(type, "hugetlb")) { test_type =3D TEST_HUGETLB; uffd_test_ops =3D &hugetlb_uffd_test_ops; --=20 2.26.2