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 F3403C4708F for ; Thu, 27 May 2021 20:23:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9B17D613CC for ; Thu, 27 May 2021 20:23:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B17D613CC 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 ADAF56B008C; Thu, 27 May 2021 16:23:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A82A26B0092; Thu, 27 May 2021 16:23:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 52FA16B0093; Thu, 27 May 2021 16:23:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 121336B008C for ; Thu, 27 May 2021 16:23:52 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id A622F8249980 for ; Thu, 27 May 2021 20:23:51 +0000 (UTC) X-FDA: 78188137062.24.4049ECD Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf14.hostedemail.com (Postfix) with ESMTP id A9449C005A0C for ; Thu, 27 May 2021 20:23:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622147031; 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=ngMPi0v8szsDymkLXEE1yzQNi7Qk4LQoecvqvdNIG9I=; b=hHbbqik175LQAgePk54NoidkSJ1sngAKJwbo5R+xW3iOMYTwP7D6oQQXoNs2WY0spdN94T 245YbUOpvxpCRp3XpqYFRG2ioNLTqQgOo1u0lepNG4YTXod6ny8pPomZL+SHSOfdNKCA4R 7W1g2HHzdY11kQqfTY4Fih17pD2iCYg= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-120-AHipoVJMO5C5KvaPGXmmJQ-1; Thu, 27 May 2021 16:23:49 -0400 X-MC-Unique: AHipoVJMO5C5KvaPGXmmJQ-1 Received: by mail-qt1-f200.google.com with SMTP id q3-20020a05622a0303b02902390ac8c906so868034qtw.11 for ; Thu, 27 May 2021 13:23:49 -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=ngMPi0v8szsDymkLXEE1yzQNi7Qk4LQoecvqvdNIG9I=; b=beL3c6iBDDuZsUHwyD9pKfYvvU/iJ5vLuuptPy+G0YQ5XMV8+lqOsb5FkOZb8nDdap gr39THjIbN71GjIbT0ecJnvnV3clTznrvy4Fxs314vEY6g4b88YX3wMtDw0rHQPYmR9f xoFmlIz4jFrAHIVMXt+3uehvsXWr0/RVJQAiWuKl1+pNJBj1SADUjXV02PdCBrCpFDvi F3Qcin6TViVJWb2gVxlABl7oyDNu/yeQ8rWeAUlzUYh3GpiFtjBgFDGGfFzugYAuLChH FWGrpSvbD5jM6KPoDLMMcoWODKkx9DdLZBqtiOKIWJs6f7g1KdAftSOPrlyzwfwSRJWD EIAw== X-Gm-Message-State: AOAM532zaHonZPeDUXg3tpETVwlDSxj6fg/Jt08aFxp0M5vs35iTiKZ0 lPuCggcCvjJo1ovZizKuo9LgLcz16ESnYC42ZUxM5uBbU2dNhdzKdT1kzz+d3D5l5GDrvb/8gN4 Vw5aaolegNAE= X-Received: by 2002:ad4:4e91:: with SMTP id dy17mr330673qvb.55.1622147028610; Thu, 27 May 2021 13:23:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxERXmrLVdBH2ktYPjs4f1N04FyCnVjMWl8pzE8ly931umyxfVaq9veVsqvYipuRhEbaHuyA== X-Received: by 2002:ad4:4e91:: with SMTP id dy17mr330647qvb.55.1622147028362; Thu, 27 May 2021 13:23:48 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id q7sm2094142qki.17.2021.05.27.13.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 13:23:47 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Mike Rapoport , peterx@redhat.com, Andrew Morton , Mike Kravetz , Jerome Glisse , Miaohe Lin , Nadav Amit , Hugh Dickins , Matthew Wilcox , Jason Gunthorpe , "Kirill A . Shutemov" , Andrea Arcangeli , Axel Rasmussen Subject: [PATCH v3 26/27] mm/userfaultfd: Enable write protection for shmem & hugetlbfs Date: Thu, 27 May 2021 16:23:45 -0400 Message-Id: <20210527202345.32356-1-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527201927.29586-1-peterx@redhat.com> References: <20210527201927.29586-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=hHbbqik1; dmarc=pass (policy=none) header.from=redhat.com; spf=none (imf14.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A9449C005A0C X-Stat-Signature: mbkiwpbyynnrg3e4xeiu987p7gp6ds8g X-HE-Tag: 1622147022-393801 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: We've had all the necessary changes ready for both shmem and hugetlbfs. = Turn on all the shmem/hugetlbfs switches for userfaultfd-wp. We can expand UFFD_API_RANGE_IOCTLS_BASIC with _UFFDIO_WRITEPROTECT too b= ecause all existing types now support write protection mode. Since vma_can_userfault() will be used elsewhere, move into userfaultfd_k= .h. Signed-off-by: Peter Xu --- fs/userfaultfd.c | 18 ------------------ include/linux/userfaultfd_k.h | 12 ++++++++++++ include/uapi/linux/userfaultfd.h | 10 ++++++++-- mm/userfaultfd.c | 9 +++------ 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 6ef7b56760bf..140bab07935e 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -1275,24 +1275,6 @@ static __always_inline int validate_range(struct m= m_struct *mm, return 0; } =20 -static inline bool vma_can_userfault(struct vm_area_struct *vma, - unsigned long vm_flags) -{ - /* FIXME: add WP support to hugetlbfs and shmem */ - if (vm_flags & VM_UFFD_WP) { - if (is_vm_hugetlb_page(vma) || vma_is_shmem(vma)) - return false; - } - - if (vm_flags & VM_UFFD_MINOR) { - if (!(is_vm_hugetlb_page(vma) || vma_is_shmem(vma))) - return false; - } - - return vma_is_anonymous(vma) || is_vm_hugetlb_page(vma) || - vma_is_shmem(vma); -} - static int userfaultfd_register(struct userfaultfd_ctx *ctx, unsigned long arg) { diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.= h index ca3f794d07e9..489fb375e66c 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -16,6 +16,7 @@ #include #include #include +#include =20 /* The set of all possible UFFD-related VM flags. */ #define __VM_UFFD_FLAGS (VM_UFFD_MISSING | VM_UFFD_WP | VM_UFFD_MINOR) @@ -138,6 +139,17 @@ static inline bool userfaultfd_armed(struct vm_area_= struct *vma) return vma->vm_flags & __VM_UFFD_FLAGS; } =20 +static inline bool vma_can_userfault(struct vm_area_struct *vma, + unsigned long vm_flags) +{ + if (vm_flags & VM_UFFD_MINOR) + return is_vm_hugetlb_page(vma) || vma_is_shmem(vma); + + return vma_is_anonymous(vma) || is_vm_hugetlb_page(vma) || + vma_is_shmem(vma); +} + + extern int dup_userfaultfd(struct vm_area_struct *, struct list_head *); extern void dup_userfaultfd_complete(struct list_head *); =20 diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfa= ultfd.h index 159a74e9564f..09b7ec69c97d 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -32,7 +32,8 @@ UFFD_FEATURE_SIGBUS | \ UFFD_FEATURE_THREAD_ID | \ UFFD_FEATURE_MINOR_HUGETLBFS | \ - UFFD_FEATURE_MINOR_SHMEM) + UFFD_FEATURE_MINOR_SHMEM | \ + UFFD_FEATURE_WP_HUGETLBFS_SHMEM) #define UFFD_API_IOCTLS \ ((__u64)1 << _UFFDIO_REGISTER | \ (__u64)1 << _UFFDIO_UNREGISTER | \ @@ -46,7 +47,8 @@ #define UFFD_API_RANGE_IOCTLS_BASIC \ ((__u64)1 << _UFFDIO_WAKE | \ (__u64)1 << _UFFDIO_COPY | \ - (__u64)1 << _UFFDIO_CONTINUE) + (__u64)1 << _UFFDIO_CONTINUE | \ + (__u64)1 << _UFFDIO_WRITEPROTECT) =20 /* * Valid ioctl command number range with this API is from 0x00 to @@ -189,6 +191,9 @@ struct uffdio_api { * * UFFD_FEATURE_MINOR_SHMEM indicates the same support as * UFFD_FEATURE_MINOR_HUGETLBFS, but for shmem-backed pages instead. + * + * UFFD_FEATURE_WP_HUGETLBFS_SHMEM indicates that userfaultfd + * write-protection mode is supported on both shmem and hugetlbfs. */ #define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0) #define UFFD_FEATURE_EVENT_FORK (1<<1) @@ -201,6 +206,7 @@ struct uffdio_api { #define UFFD_FEATURE_THREAD_ID (1<<8) #define UFFD_FEATURE_MINOR_HUGETLBFS (1<<9) #define UFFD_FEATURE_MINOR_SHMEM (1<<10) +#define UFFD_FEATURE_WP_HUGETLBFS_SHMEM (1<<11) __u64 features; =20 __u64 ioctls; diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index af79f3d3a001..7ff9176149e0 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -772,15 +772,12 @@ int mwriteprotect_range(struct mm_struct *dst_mm, u= nsigned long start, =20 err =3D -ENOENT; dst_vma =3D find_dst_vma(dst_mm, start, len); - /* - * Make sure the vma is not shared, that the dst range is - * both valid and fully within a single existing vma. - */ - if (!dst_vma || (dst_vma->vm_flags & VM_SHARED)) + + if (!dst_vma) goto out_unlock; if (!userfaultfd_wp(dst_vma)) goto out_unlock; - if (!vma_is_anonymous(dst_vma)) + if (!vma_can_userfault(dst_vma, dst_vma->vm_flags)) goto out_unlock; =20 if (is_vm_hugetlb_page(dst_vma)) { --=20 2.31.1