mm-hugetlb-take-care-of-uffdio_copy_mode_wp.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: take care of UFFDIO_COPY_MODE_WP
has been removed from the -mm tree. Its filename was
mm-hugetlb-take-care-of-uffdio_copy_mode_wp.patch
This patch was dropped because it was merged into the mm-stable branch\nof git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/hugetlb: take care of UFFDIO_COPY_MODE_WP
Pass the wp_copy variable into hugetlb_mcopy_atomic_pte() thoughout the stack. Apply the UFFD_WP bit if UFFDIO_COPY_MODE_WP is with UFFDIO_COPY.
Hugetlb pages are only managed by hugetlbfs, so we're safe even without setting dirty bit in the huge pte if the page is installed as read-only. However we'd better still keep the dirty bit set for a read-only UFFDIO_COPY pte (when UFFDIO_COPY_MODE_WP bit is set), not only to match what we do with shmem, but also because the page does contain dirty data that the kernel just copied from the userspace.
---
include/linux/hugetlb.h | 6 ++++-- mm/hugetlb.c | 29 +++++++++++++++++++++++------ mm/userfaultfd.c | 14 +++++++++----- 3 files changed, 36 insertions(+), 13 deletions(-)
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-take-care-of-uffdio_copy_mode_wp +4 -2
@@ -160,7 +160,8 @@ int hugetlb_mcopy_atomic_pte(struct mm_sunsigned long dst_addr, unsigned long src_addr, enum mcopy_atomic_mode mode, - struct page **pagep); + struct page **pagep, + bool wp_copy);#endif /* CONFIG_USERFAULTFD */ bool hugetlb_reserve_pages(struct inode *inode, long from, long to, struct vm_area_struct *vma,
@@ -356,7 +357,8 @@ static inline int hugetlb_mcopy_atomic_punsigned long dst_addr, unsigned long src_addr, enum mcopy_atomic_mode mode, - struct page **pagep) + struct page **pagep, + bool wp_copy) {BUG ();return 0 ;
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-take-care-of-uffdio_copy_mode_wp +23 -6
@@ -5821,7 +5821,8 @@ int hugetlb_mcopy_atomic_pte(struct mm_sunsigned long dst_addr, unsigned long src_addr, enum mcopy_atomic_mode mode, - struct page **pagep) + struct page **pagep, + bool wp_copy) { bool is_continue = (mode == MCOPY_ATOMIC_CONTINUE);struct hstate *h =hstate_vma (dst_vma);
@@ -5951,7 +5952,12 @@ int hugetlb_mcopy_atomic_pte(struct mm_s goto out_release_unlock; ret = -EEXIST ; -if (!huge_pte_none (huge_ptep_get (dst_pte))) +/* +* We allow to overwrite a pte marker: consider when both MISSING|WP +* registered, we firstly wr-protect a none pte which has no page cache +* page backing it, then access the page. +*/ +if (!huge_pte_none_mostly (huge_ptep_get (dst_pte))) goto out_release_unlock;if (vm_shared) {
@@ -5961,17 +5967,28 @@ int hugetlb_mcopy_atomic_pte(struct mm_shugepage_add_new_anon_rmap (page, dst_vma, dst_addr); } -/* For CONTINUE on a non-shared VMA, don't set VM_WRITE for CoW. */ -if (is_continue && !vm_shared) +/* +* For either: (1) CONTINUE on a non-shared VMA, or (2) UFFDIO_COPY +* with wp flag set, don't set pte write bit. +*/ +if (wp_copy || (is_continue && !vm_shared)) writable =0 ;else writable = dst_vma->vm_flags &VM_WRITE ; _dst_pte =make_huge_pte (dst_vma, page, writable); -if (writable) - _dst_pte =huge_pte_mkdirty (_dst_pte); +/* +* Always mark UFFDIO_COPY page dirty; note that this may not be +* extremely important for hugetlbfs for now since swapping is not +* supported, but we should still be clear in that this page cannot be +* thrown away at will, even if write bit not set. +*/ + _dst_pte =huge_pte_mkdirty (_dst_pte); _dst_pte =pte_mkyoung (_dst_pte); +if (wp_copy) + _dst_pte =huge_pte_mkuffd_wp (_dst_pte); +set_huge_pte_at (dst_mm, dst_addr, dst_pte, _dst_pte); (void)huge_ptep_set_access_flags(dst_vma, dst_addr, dst_pte, _dst_pte,
mm/userfaultfd.c renamed from mm/userfaultfd.c~mm-hugetlb-take-care-of-uffdio_copy_mode_wp +9 -5
@@ -305,7 +305,8 @@ static __always_inline ssize_t __mcopy_aunsigned long dst_start, unsigned long src_start, unsigned long len, - enum mcopy_atomic_mode mode) + enum mcopy_atomic_mode mode, + bool wp_copy) { int vm_shared = dst_vma->vm_flags & VM_SHARED;ssize_t err;
@@ -393,7 +394,7 @@ retry: }if (mode !=MCOPY_ATOMIC_CONTINUE && - !huge_pte_none (huge_ptep_get (dst_pte))) { + !huge_pte_none_mostly (huge_ptep_get (dst_pte))) { err = -EEXIST ;mutex_unlock (&hugetlb_fault_mutex_table[hash]);i_mmap_unlock_read (mapping);
@@ -401,7 +402,8 @@ retry: } err =hugetlb_mcopy_atomic_pte (dst_mm, dst_pte, dst_vma, - dst_addr, src_addr, mode, &page); + dst_addr, src_addr, mode, &page, + wp_copy);mutex_unlock (&hugetlb_fault_mutex_table[hash]);i_mmap_unlock_read (mapping);
@@ -456,7 +458,8 @@ extern ssize_t __mcopy_atomic_hugetlb(stunsigned long dst_start, unsigned long src_start, unsigned long len, - enum mcopy_atomic_mode mode); + enum mcopy_atomic_mode mode, + bool wp_copy);#endif /* CONFIG_HUGETLB_PAGE */ static __always_inline ssize_t mfill_atomic_pte(struct mm_struct *dst_mm,
@@ -576,7 +579,8 @@ retry:*/ if (is_vm_hugetlb_page (dst_vma))return __mcopy_atomic_hugetlb (dst_mm, dst_vma, dst_start, - src_start, len, mcopy_mode); + src_start, len, mcopy_mode, + wp_copy);if (!vma_is_anonymous (dst_vma) && !vma_is_shmem (dst_vma)) goto out_unlock;
_
Patches currently in -mm which might be from [email protected] are