From: Peter Xu <peterx@redhat.com>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: 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>,
peterx@redhat.com, Martin Cracauer <cracauer@cons.org>,
Shaohua Li <shli@fb.com>,
Denis Plotnikov <dplotnikov@virtuozzo.com>,
Andrea Arcangeli <aarcange@redhat.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Marty McFadden <mcfadden8@llnl.gov>,
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: [PATCH v4 15/27] userfaultfd: wp: drop _PAGE_UFFD_WP properly when fork
Date: Fri, 26 Apr 2019 12:51:39 +0800 [thread overview]
Message-ID: <20190426045151.19556-16-peterx@redhat.com> (raw)
In-Reply-To: <20190426045151.19556-1-peterx@redhat.com>
UFFD_EVENT_FORK support for uffd-wp should be already there, except
that we should clean the uffd-wp bit if uffd fork event is not
enabled. Detect that to avoid _PAGE_UFFD_WP being set even if the VMA
is not being tracked by VM_UFFD_WP. Do this for both small PTEs and
huge PMDs.
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Reviewed-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
mm/huge_memory.c | 8 ++++++++
mm/memory.c | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 3885747d4901..cf8f11d6e6cd 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -976,6 +976,14 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm,
ret = -EAGAIN;
pmd = *src_pmd;
+ /*
+ * Make sure the _PAGE_UFFD_WP bit is cleared if the new VMA
+ * does not have the VM_UFFD_WP, which means that the uffd
+ * fork event is not enabled.
+ */
+ if (!(vma->vm_flags & VM_UFFD_WP))
+ pmd = pmd_clear_uffd_wp(pmd);
+
#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION
if (unlikely(is_swap_pmd(pmd))) {
swp_entry_t entry = pmd_to_swp_entry(pmd);
diff --git a/mm/memory.c b/mm/memory.c
index 965d974bb9bd..2abf0934ad7f 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -789,6 +789,14 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm,
pte = pte_mkclean(pte);
pte = pte_mkold(pte);
+ /*
+ * Make sure the _PAGE_UFFD_WP bit is cleared if the new VMA
+ * does not have the VM_UFFD_WP, which means that the uffd
+ * fork event is not enabled.
+ */
+ if (!(vm_flags & VM_UFFD_WP))
+ pte = pte_clear_uffd_wp(pte);
+
page = vm_normal_page(vma, addr, pte);
if (page) {
get_page(page);
--
2.17.1
next prev parent reply other threads:[~2019-04-26 4:54 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-26 4:51 [PATCH v4 00/27] userfaultfd: write protection support Peter Xu
2019-04-26 4:51 ` [PATCH v4 01/27] mm: gup: rename "nonblocking" to "locked" where proper Peter Xu
2019-04-26 4:51 ` [PATCH v4 02/27] mm: userfault: return VM_FAULT_RETRY on signals Peter Xu
2019-04-26 4:51 ` [PATCH v4 03/27] userfaultfd: don't retake mmap_sem to emulate NOPAGE Peter Xu
2019-04-26 4:51 ` [PATCH v4 04/27] mm: allow VM_FAULT_RETRY for multiple times Peter Xu
2019-04-26 4:51 ` [PATCH v4 05/27] mm: gup: " Peter Xu
2019-04-26 4:51 ` [PATCH v4 06/27] userfaultfd: wp: add helper for writeprotect check Peter Xu
2019-04-26 4:51 ` [PATCH v4 07/27] userfaultfd: wp: hook userfault handler to write protection fault Peter Xu
2019-04-26 4:51 ` [PATCH v4 08/27] userfaultfd: wp: add WP pagetable tracking to x86 Peter Xu
2019-04-26 4:51 ` [PATCH v4 09/27] userfaultfd: wp: userfaultfd_pte/huge_pmd_wp() helpers Peter Xu
2019-04-26 4:51 ` [PATCH v4 10/27] userfaultfd: wp: add UFFDIO_COPY_MODE_WP Peter Xu
2019-04-26 4:51 ` [PATCH v4 11/27] mm: merge parameters for change_protection() Peter Xu
2019-04-26 4:51 ` [PATCH v4 12/27] userfaultfd: wp: apply _PAGE_UFFD_WP bit Peter Xu
2019-04-26 4:51 ` [PATCH v4 13/27] mm: introduce do_wp_page_cont() Peter Xu
2019-04-26 4:51 ` [PATCH v4 14/27] userfaultfd: wp: handle COW properly for uffd-wp Peter Xu
2019-04-26 4:51 ` Peter Xu [this message]
2019-04-26 4:51 ` [PATCH v4 16/27] userfaultfd: wp: add pmd_swp_*uffd_wp() helpers Peter Xu
2019-04-26 4:51 ` [PATCH v4 17/27] userfaultfd: wp: support swap and page migration Peter Xu
2019-04-26 4:51 ` [PATCH v4 18/27] khugepaged: skip collapse if uffd-wp detected Peter Xu
2019-04-26 4:51 ` [PATCH v4 19/27] userfaultfd: introduce helper vma_find_uffd Peter Xu
2019-04-26 4:51 ` [PATCH v4 20/27] userfaultfd: wp: support write protection for userfault vma range Peter Xu
2019-04-26 4:51 ` [PATCH v4 21/27] userfaultfd: wp: add the writeprotect API to userfaultfd ioctl Peter Xu
2019-04-26 4:51 ` [PATCH v4 22/27] userfaultfd: wp: enabled write protection in userfaultfd API Peter Xu
2019-04-26 4:51 ` [PATCH v4 23/27] userfaultfd: wp: don't wake up when doing write protect Peter Xu
2019-04-26 4:51 ` [PATCH v4 24/27] userfaultfd: wp: UFFDIO_REGISTER_MODE_WP documentation update Peter Xu
2019-04-26 4:51 ` [PATCH v4 25/27] userfaultfd: wp: declare _UFFDIO_WRITEPROTECT conditionally Peter Xu
2019-04-26 4:51 ` [PATCH v4 26/27] userfaultfd: selftests: refactor statistics Peter Xu
2019-04-26 4:51 ` [PATCH v4 27/27] userfaultfd: selftests: add write-protect test 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=20190426045151.19556-16-peterx@redhat.com \
--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.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).