| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20190426045151.19556-15-peterx@redhat.com>
Date: Fri, 26 Apr 2019 12:51:38 +0800
From: Peter Xu <peterx@...hat.com>
To: linux-mm@...ck.org, linux-kernel@...r.kernel.org
Cc: David Hildenbrand <david@...hat.com>,
Hugh Dickins <hughd@...gle.com>,
Maya Gokhale <gokhale2@...l.gov>,
Jerome Glisse <jglisse@...hat.com>,
Pavel Emelyanov <xemul@...tuozzo.com>,
Johannes Weiner <hannes@...xchg.org>, peterx@...hat.com,
Martin Cracauer <cracauer@...s.org>, Shaohua Li <shli@...com>,
Denis Plotnikov <dplotnikov@...tuozzo.com>,
Andrea Arcangeli <aarcange@...hat.com>,
Mike Kravetz <mike.kravetz@...cle.com>,
Marty McFadden <mcfadden8@...l.gov>,
Mike Rapoport <rppt@...ux.vnet.ibm.com>,
Mel Gorman <mgorman@...e.de>,
"Kirill A . Shutemov" <kirill@...temov.name>,
"Dr . David Alan Gilbert" <dgilbert@...hat.com>
Subject: [PATCH v4 14/27] userfaultfd: wp: handle COW properly for uffd-wp
This allows uffd-wp to support write-protected pages for COW.
For example, the uffd write-protected PTE could also be write-protected
by other usages like COW or zero pages. When that happens, we can't
simply set the write bit in the PTE since otherwise it'll change the
content of every single reference to the page. Instead, we should do
the COW first if necessary, then handle the uffd-wp fault.
To correctly copy the page, we'll also need to carry over the
_PAGE_UFFD_WP bit if it was set in the original PTE.
For huge PMDs, we just simply split the huge PMDs where we want to
resolve an uffd-wp page fault always. That matches what we do with
general huge PMD write protections. In that way, we resolved the huge
PMD copy-on-write issue into PTE copy-on-write.
Signed-off-by: Peter Xu <peterx@...hat.com>
---
mm/memory.c | 5 ++++-
mm/mprotect.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index ab98a1eb4702..965d974bb9bd 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2299,7 +2299,10 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf)
}
flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte));
entry = mk_pte(new_page, vma->vm_page_prot);
- entry = maybe_mkwrite(pte_mkdirty(entry), vma);
+ if (pte_uffd_wp(vmf->orig_pte))
+ entry = pte_mkuffd_wp(entry);
+ else
+ entry = maybe_mkwrite(pte_mkdirty(entry), vma);
/*
* Clear the pte entry and flush it first, before updating the
* pte with the new entry. This will avoid a race condition
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 732d9b6d1d21..1f40662182f8 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -73,18 +73,18 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
flush_tlb_batched_pending(vma->vm_mm);
arch_enter_lazy_mmu_mode();
do {
+retry_pte:
oldpte = *pte;
if (pte_present(oldpte)) {
pte_t ptent;
bool preserve_write = prot_numa && pte_write(oldpte);
+ struct page *page;
/*
* Avoid trapping faults against the zero or KSM
* pages. See similar comment in change_huge_pmd.
*/
if (prot_numa) {
- struct page *page;
-
page = vm_normal_page(vma, addr, oldpte);
if (!page || PageKsm(page))
continue;
@@ -114,6 +114,45 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd,
continue;
}
+ /*
+ * Detect whether we'll need to COW before
+ * resolving an uffd-wp fault. Note that this
+ * includes detection of the zero page (where
+ * page==NULL)
+ */
+ if (uffd_wp_resolve) {
+ struct vm_fault vmf = {
+ .vma = vma,
+ .address = addr & PAGE_MASK,
+ .orig_pte = oldpte,
+ .pmd = pmd,
+ .pte = pte,
+ .ptl = ptl,
+ };
+ vm_fault_t ret;
+
+ /* If the fault is resolved already, skip */
+ if (!pte_uffd_wp(*pte))
+ continue;
+
+ arch_leave_lazy_mmu_mode();
+ /* With PTE lock held */
+ ret = do_wp_page_cont(&vmf);
+ if (ret != VM_FAULT_WRITE && ret != 0)
+ /* Probably OOM */
+ return pages;
+ pte = pte_offset_map_lock(vma->vm_mm, pmd,
+ addr, &ptl);
+ arch_enter_lazy_mmu_mode();
+ if (ret == 0 || !pte_present(*pte))
+ /*
+ * This PTE could have been modified
+ * during or after COW before taking
+ * the lock; retry.
+ */
+ goto retry_pte;
+ }
+
oldpte = ptep_modify_prot_start(vma, addr, pte);
ptent = pte_modify(oldpte, newprot);
if (preserve_write)
@@ -183,6 +222,7 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
unsigned long pages = 0;
unsigned long nr_huge_updates = 0;
struct mmu_notifier_range range;
+ bool uffd_wp_resolve = cp_flags & MM_CP_UFFD_WP_RESOLVE;
range.start = 0;
@@ -202,7 +242,16 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
}
if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
- if (next - addr != HPAGE_PMD_SIZE) {
+ /*
+ * When resolving an userfaultfd write
+ * protection fault, it's not easy to identify
+ * whether a THP is shared with others and
+ * whether we'll need to do copy-on-write, so
+ * just split it always for now to simply the
+ * procedure. And that's the policy too for
+ * general THP write-protect in af9e4d5f2de2.
+ */
+ if (next - addr != HPAGE_PMD_SIZE || uffd_wp_resolve) {
__split_huge_pmd(vma, pmd, addr, false, NULL);
} else {
int nr_ptes = change_huge_pmd(vma, pmd, addr,
--
2.17.1
Powered by blists - more mailing lists