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 13/27] mm: introduce do_wp_page_cont()
Date: Fri, 26 Apr 2019 12:51:37 +0800 [thread overview]
Message-ID: <20190426045151.19556-14-peterx@redhat.com> (raw)
In-Reply-To: <20190426045151.19556-1-peterx@redhat.com>
The userfaultfd handling in do_wp_page() is very special comparing to
the rest of the function because it only postpones the real handling
of the page fault to the userspace program. Isolate the handling part
of do_wp_page() into a new function called do_wp_page_cont() so that
we can use it somewhere else when resolving the userfault page fault.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
include/linux/mm.h | 2 ++
mm/memory.c | 8 ++++++++
2 files changed, 10 insertions(+)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index a5ac81188523..a2911de04cdd 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -445,6 +445,8 @@ struct vm_fault {
*/
};
+vm_fault_t do_wp_page_cont(struct vm_fault *vmf);
+
/* page entry size for vm->huge_fault() */
enum page_entry_size {
PE_SIZE_PTE = 0,
diff --git a/mm/memory.c b/mm/memory.c
index 64bd8075f054..ab98a1eb4702 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2497,6 +2497,14 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf)
return handle_userfault(vmf, VM_UFFD_WP);
}
+ return do_wp_page_cont(vmf);
+}
+
+vm_fault_t do_wp_page_cont(struct vm_fault *vmf)
+ __releases(vmf->ptl)
+{
+ struct vm_area_struct *vma = vmf->vma;
+
vmf->page = vm_normal_page(vma, vmf->address, vmf->orig_pte);
if (!vmf->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 ` Peter Xu [this message]
2019-04-26 4:51 ` [PATCH v4 14/27] userfaultfd: wp: handle COW properly for uffd-wp Peter Xu
2019-04-26 4:51 ` [PATCH v4 15/27] userfaultfd: wp: drop _PAGE_UFFD_WP properly when fork Peter Xu
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-14-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).