From: Peter Xu <peterx@redhat.com>
To: Mike Rapoport <rppt@linux.ibm.com>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
David Hildenbrand <david@redhat.com>,
Hugh Dickins <hughd@google.com>, Maya Gokhale <gokhale2@llnl.gov>,
Jerome Glisse <jglisse@redhat.com>,
Pavel Emelyanov <xemul@virtuozzo.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Martin Cracauer <cracauer@cons.org>, Shaohua Li <shli@fb.com>,
Marty McFadden <mcfadden8@llnl.gov>,
Andrea Arcangeli <aarcange@redhat.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Denis Plotnikov <dplotnikov@virtuozzo.com>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Mel Gorman <mgorman@suse.de>,
"Kirill A . Shutemov" <kirill@shutemov.name>,
"Dr . David Alan Gilbert" <dgilbert@redhat.com>
Subject: Re: [PATCH v2 21/26] userfaultfd: wp: add the writeprotect API to userfaultfd ioctl
Date: Tue, 26 Feb 2019 14:30:21 +0800 [thread overview]
Message-ID: <20190226063021.GI13653@xz-x1> (raw)
In-Reply-To: <20190225210350.GD10454@rapoport-lnx>
On Mon, Feb 25, 2019 at 11:03:51PM +0200, Mike Rapoport wrote:
> On Tue, Feb 12, 2019 at 10:56:27AM +0800, Peter Xu wrote:
> > From: Andrea Arcangeli <aarcange@redhat.com>
> >
> > v1: From: Shaohua Li <shli@fb.com>
> >
> > v2: cleanups, remove a branch.
> >
> > [peterx writes up the commit message, as below...]
> >
> > This patch introduces the new uffd-wp APIs for userspace.
> >
> > Firstly, we'll allow to do UFFDIO_REGISTER with write protection
> > tracking using the new UFFDIO_REGISTER_MODE_WP flag. Note that this
> > flag can co-exist with the existing UFFDIO_REGISTER_MODE_MISSING, in
> > which case the userspace program can not only resolve missing page
> > faults, and at the same time tracking page data changes along the way.
> >
> > Secondly, we introduced the new UFFDIO_WRITEPROTECT API to do page
> > level write protection tracking. Note that we will need to register
> > the memory region with UFFDIO_REGISTER_MODE_WP before that.
> >
> > Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
> > [peterx: remove useless block, write commit message, check against
> > VM_MAYWRITE rather than VM_WRITE when register]
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> > fs/userfaultfd.c | 82 +++++++++++++++++++++++++-------
> > include/uapi/linux/userfaultfd.h | 11 +++++
> > 2 files changed, 77 insertions(+), 16 deletions(-)
> >
> > diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
> > index 3092885c9d2c..81962d62520c 100644
> > --- a/fs/userfaultfd.c
> > +++ b/fs/userfaultfd.c
> > @@ -304,8 +304,11 @@ static inline bool userfaultfd_must_wait(struct userfaultfd_ctx *ctx,
> > if (!pmd_present(_pmd))
> > goto out;
> >
> > - if (pmd_trans_huge(_pmd))
> > + if (pmd_trans_huge(_pmd)) {
> > + if (!pmd_write(_pmd) && (reason & VM_UFFD_WP))
> > + ret = true;
> > goto out;
> > + }
> >
> > /*
> > * the pmd is stable (as in !pmd_trans_unstable) so we can re-read it
> > @@ -318,6 +321,8 @@ static inline bool userfaultfd_must_wait(struct userfaultfd_ctx *ctx,
> > */
> > if (pte_none(*pte))
> > ret = true;
> > + if (!pte_write(*pte) && (reason & VM_UFFD_WP))
> > + ret = true;
> > pte_unmap(pte);
> >
> > out:
> > @@ -1251,10 +1256,13 @@ static __always_inline int validate_range(struct mm_struct *mm,
> > return 0;
> > }
> >
> > -static inline bool vma_can_userfault(struct vm_area_struct *vma)
> > +static inline bool vma_can_userfault(struct vm_area_struct *vma,
> > + unsigned long vm_flags)
> > {
> > - return vma_is_anonymous(vma) || is_vm_hugetlb_page(vma) ||
> > - vma_is_shmem(vma);
> > + /* FIXME: add WP support to hugetlbfs and shmem */
> > + return vma_is_anonymous(vma) ||
> > + ((is_vm_hugetlb_page(vma) || vma_is_shmem(vma)) &&
> > + !(vm_flags & VM_UFFD_WP));
> > }
> >
> > static int userfaultfd_register(struct userfaultfd_ctx *ctx,
> > @@ -1286,15 +1294,8 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
> > vm_flags = 0;
> > if (uffdio_register.mode & UFFDIO_REGISTER_MODE_MISSING)
> > vm_flags |= VM_UFFD_MISSING;
> > - if (uffdio_register.mode & UFFDIO_REGISTER_MODE_WP) {
> > + if (uffdio_register.mode & UFFDIO_REGISTER_MODE_WP)
> > vm_flags |= VM_UFFD_WP;
> > - /*
> > - * FIXME: remove the below error constraint by
> > - * implementing the wprotect tracking mode.
> > - */
> > - ret = -EINVAL;
> > - goto out;
> > - }
> >
> > ret = validate_range(mm, uffdio_register.range.start,
> > uffdio_register.range.len);
> > @@ -1342,7 +1343,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
> >
> > /* check not compatible vmas */
> > ret = -EINVAL;
> > - if (!vma_can_userfault(cur))
> > + if (!vma_can_userfault(cur, vm_flags))
> > goto out_unlock;
> >
> > /*
> > @@ -1370,6 +1371,8 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
> > if (end & (vma_hpagesize - 1))
> > goto out_unlock;
> > }
> > + if ((vm_flags & VM_UFFD_WP) && !(cur->vm_flags & VM_MAYWRITE))
> > + goto out_unlock;
> >
> > /*
> > * Check that this vma isn't already owned by a
> > @@ -1399,7 +1402,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
> > do {
> > cond_resched();
> >
> > - BUG_ON(!vma_can_userfault(vma));
> > + BUG_ON(!vma_can_userfault(vma, vm_flags));
> > BUG_ON(vma->vm_userfaultfd_ctx.ctx &&
> > vma->vm_userfaultfd_ctx.ctx != ctx);
> > WARN_ON(!(vma->vm_flags & VM_MAYWRITE));
> > @@ -1534,7 +1537,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
> > * provides for more strict behavior to notice
> > * unregistration errors.
> > */
> > - if (!vma_can_userfault(cur))
> > + if (!vma_can_userfault(cur, cur->vm_flags))
> > goto out_unlock;
> >
> > found = true;
> > @@ -1548,7 +1551,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
> > do {
> > cond_resched();
> >
> > - BUG_ON(!vma_can_userfault(vma));
> > + BUG_ON(!vma_can_userfault(vma, vma->vm_flags));
> >
> > /*
> > * Nothing to do: this vma is already registered into this
> > @@ -1761,6 +1764,50 @@ static int userfaultfd_zeropage(struct userfaultfd_ctx *ctx,
> > return ret;
> > }
> >
> > +static int userfaultfd_writeprotect(struct userfaultfd_ctx *ctx,
> > + unsigned long arg)
> > +{
> > + int ret;
> > + struct uffdio_writeprotect uffdio_wp;
> > + struct uffdio_writeprotect __user *user_uffdio_wp;
> > + struct userfaultfd_wake_range range;
> > +
> > + if (READ_ONCE(ctx->mmap_changing))
> > + return -EAGAIN;
> > +
> > + user_uffdio_wp = (struct uffdio_writeprotect __user *) arg;
> > +
> > + if (copy_from_user(&uffdio_wp, user_uffdio_wp,
> > + sizeof(struct uffdio_writeprotect)))
> > + return -EFAULT;
> > +
> > + ret = validate_range(ctx->mm, uffdio_wp.range.start,
> > + uffdio_wp.range.len);
> > + if (ret)
> > + return ret;
> > +
> > + if (uffdio_wp.mode & ~(UFFDIO_WRITEPROTECT_MODE_DONTWAKE |
> > + UFFDIO_WRITEPROTECT_MODE_WP))
> > + return -EINVAL;
> > + if ((uffdio_wp.mode & UFFDIO_WRITEPROTECT_MODE_WP) &&
> > + (uffdio_wp.mode & UFFDIO_WRITEPROTECT_MODE_DONTWAKE))
> > + return -EINVAL;
>
> Why _DONTWAKE cannot be used when setting write-protection?
> I can imagine a use-case when you'd want to freeze an application,
> write-protect several regions and then let the application continue.
This is the same question as the one in the other thread, which I've
had a longer reply there, hope it could be a bit clearer (sorry for
the confusion no matter what!). I would be more than glad to know if
there could be any smarter way to define/renaming/... the flags.
Thanks!
--
Peter Xu
next prev parent reply other threads:[~2019-02-26 6:30 UTC|newest]
Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 2:56 [PATCH v2 00/26] userfaultfd: write protection support Peter Xu
2019-02-12 2:56 ` [PATCH v2 01/26] mm: gup: rename "nonblocking" to "locked" where proper Peter Xu
2019-02-21 15:17 ` Jerome Glisse
2019-02-22 3:42 ` Peter Xu
2019-02-12 2:56 ` [PATCH v2 02/26] mm: userfault: return VM_FAULT_RETRY on signals Peter Xu
2019-02-21 15:29 ` Jerome Glisse
2019-02-22 3:51 ` Peter Xu
2019-02-12 2:56 ` [PATCH v2 03/26] userfaultfd: don't retake mmap_sem to emulate NOPAGE Peter Xu
2019-02-21 15:34 ` Jerome Glisse
2019-02-12 2:56 ` [PATCH v2 04/26] mm: allow VM_FAULT_RETRY for multiple times Peter Xu
2019-02-13 3:34 ` Peter Xu
2019-02-20 11:48 ` Peter Xu
2019-02-21 8:56 ` [PATCH v2.1 " Peter Xu
2019-02-21 15:53 ` Jerome Glisse
2019-02-22 4:25 ` Peter Xu
2019-02-22 15:11 ` Jerome Glisse
2019-02-25 6:19 ` Peter Xu
2019-02-12 2:56 ` [PATCH v2 05/26] mm: gup: " Peter Xu
2019-02-21 16:06 ` Jerome Glisse
2019-02-22 4:41 ` Peter Xu
2019-02-22 15:13 ` Jerome Glisse
2019-02-12 2:56 ` [PATCH v2 06/26] userfaultfd: wp: add helper for writeprotect check Peter Xu
2019-02-21 16:07 ` Jerome Glisse
2019-02-25 15:41 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 07/26] userfaultfd: wp: hook userfault handler to write protection fault Peter Xu
2019-02-21 16:25 ` Jerome Glisse
2019-02-25 15:43 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 08/26] userfaultfd: wp: add WP pagetable tracking to x86 Peter Xu
2019-02-21 17:20 ` Jerome Glisse
2019-02-25 15:48 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 09/26] userfaultfd: wp: userfaultfd_pte/huge_pmd_wp() helpers Peter Xu
2019-02-21 17:21 ` Jerome Glisse
2019-02-25 17:12 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 10/26] userfaultfd: wp: add UFFDIO_COPY_MODE_WP Peter Xu
2019-02-21 17:29 ` Jerome Glisse
2019-02-22 7:11 ` Peter Xu
2019-02-22 15:15 ` Jerome Glisse
2019-02-25 6:45 ` Peter Xu
2019-02-25 15:58 ` Mike Rapoport
2019-02-26 5:09 ` Peter Xu
2019-02-26 8:28 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 11/26] mm: merge parameters for change_protection() Peter Xu
2019-02-21 17:32 ` Jerome Glisse
2019-02-12 2:56 ` [PATCH v2 12/26] userfaultfd: wp: apply _PAGE_UFFD_WP bit Peter Xu
2019-02-21 17:44 ` Jerome Glisse
2019-02-22 7:31 ` Peter Xu
2019-02-22 15:17 ` Jerome Glisse
2019-02-25 18:00 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 13/26] mm: export wp_page_copy() Peter Xu
2019-02-21 17:44 ` Jerome Glisse
2019-02-12 2:56 ` [PATCH v2 14/26] userfaultfd: wp: handle COW properly for uffd-wp Peter Xu
2019-02-21 18:04 ` Jerome Glisse
2019-02-22 8:46 ` Peter Xu
2019-02-22 15:35 ` Jerome Glisse
2019-02-25 7:13 ` Peter Xu
2019-02-25 15:32 ` Jerome Glisse
2019-02-12 2:56 ` [PATCH v2 15/26] userfaultfd: wp: drop _PAGE_UFFD_WP properly when fork Peter Xu
2019-02-21 18:06 ` Jerome Glisse
2019-02-22 9:09 ` Peter Xu
2019-02-22 15:36 ` Jerome Glisse
2019-02-25 18:19 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 16/26] userfaultfd: wp: add pmd_swp_*uffd_wp() helpers Peter Xu
2019-02-21 18:07 ` Jerome Glisse
2019-02-25 18:20 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 17/26] userfaultfd: wp: support swap and page migration Peter Xu
2019-02-21 18:16 ` Jerome Glisse
2019-02-25 7:48 ` Peter Xu
2019-02-25 18:28 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 18/26] khugepaged: skip collapse if uffd-wp detected Peter Xu
2019-02-21 18:17 ` Jerome Glisse
2019-02-25 18:50 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 19/26] userfaultfd: introduce helper vma_find_uffd Peter Xu
2019-02-21 18:19 ` Jerome Glisse
2019-02-25 20:48 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 20/26] userfaultfd: wp: support write protection for userfault vma range Peter Xu
2019-02-21 18:23 ` Jerome Glisse
2019-02-25 8:16 ` Peter Xu
2019-02-25 20:52 ` Mike Rapoport
2019-02-26 6:06 ` Peter Xu
2019-02-26 6:43 ` Mike Rapoport
2019-02-26 7:20 ` Peter Xu
2019-02-26 7:46 ` Mike Rapoport
2019-02-26 7:54 ` Peter Xu
2019-02-12 2:56 ` [PATCH v2 21/26] userfaultfd: wp: add the writeprotect API to userfaultfd ioctl Peter Xu
2019-02-21 18:28 ` Jerome Glisse
2019-02-25 8:31 ` Peter Xu
2019-02-25 21:03 ` Mike Rapoport
2019-02-26 6:30 ` Peter Xu [this message]
2019-02-12 2:56 ` [PATCH v2 22/26] userfaultfd: wp: enabled write protection in userfaultfd API Peter Xu
2019-02-21 18:29 ` Jerome Glisse
2019-02-25 8:34 ` Peter Xu
2019-02-12 2:56 ` [PATCH v2 23/26] userfaultfd: wp: don't wake up when doing write protect Peter Xu
2019-02-21 18:36 ` Jerome Glisse
2019-02-25 8:58 ` Peter Xu
2019-02-25 21:15 ` Mike Rapoport
2019-02-25 21:09 ` Mike Rapoport
2019-02-26 6:24 ` Peter Xu
2019-02-26 7:29 ` Mike Rapoport
2019-02-26 7:41 ` Peter Xu
2019-02-26 8:00 ` Mike Rapoport
2019-02-28 2:47 ` Peter Xu
2019-02-26 8:00 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 24/26] userfaultfd: wp: UFFDIO_REGISTER_MODE_WP documentation update Peter Xu
2019-02-21 18:38 ` Jerome Glisse
2019-02-25 21:19 ` Mike Rapoport
2019-02-26 6:53 ` Peter Xu
2019-02-26 7:04 ` Mike Rapoport
2019-02-26 7:42 ` Peter Xu
2019-02-12 2:56 ` [PATCH v2 25/26] userfaultfd: selftests: refactor statistics Peter Xu
2019-02-26 6:50 ` Mike Rapoport
2019-02-12 2:56 ` [PATCH v2 26/26] userfaultfd: selftests: add write-protect test Peter Xu
2019-02-26 6:58 ` Mike Rapoport
2019-02-26 7:52 ` Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190226063021.GI13653@xz-x1 \
--to=peterx@redhat.com \
--cc=aarcange@redhat.com \
--cc=cracauer@cons.org \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=dplotnikov@virtuozzo.com \
--cc=gokhale2@llnl.gov \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=jglisse@redhat.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mcfadden8@llnl.gov \
--cc=mgorman@suse.de \
--cc=mike.kravetz@oracle.com \
--cc=rppt@linux.ibm.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=shli@fb.com \
--cc=xemul@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).