mm-hugetlb-handle-pte-markers-in-page-faults.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: handle pte markers in page faults
has been removed from the -mm tree. Its filename was
mm-hugetlb-handle-pte-markers-in-page-faults.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: handle pte markers in page faults
Allow hugetlb code to handle pte markers just like none ptes. It's mostly there, we just need to make sure we don't assume hugetlb_no_page() only handles none pte, so when detecting pte change we should use pte_same() rather than pte_none(). We need to pass in the old_pte to do the comparison.
Check the original pte to see whether it's a pte marker, if it is, we should recover uffd-wp bit on the new pte to be installed, so that the next write will be trapped by uffd.
---
mm/hugetlb.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-handle-pte-markers-in-page-faults +14 -4
@@ -5438,7 +5438,8 @@ static inline vm_fault_t hugetlb_handle_static vm_fault_t hugetlb_no_page (struct mm_struct *mm,struct vm_area_struct *vma,struct address_space *mapping,pgoff_t idx, -unsigned long address,pte_t *ptep,unsigned int flags) +unsigned long address,pte_t *ptep, +pte_t old_pte,unsigned int flags) {struct hstate *h =hstate_vma (vma);vm_fault_t ret =VM_FAULT_SIGBUS ;
@@ -5565,7 +5566,8 @@ retry: ptl =huge_pte_lock (h, mm, ptep); ret =0 ; -if (!huge_pte_none (huge_ptep_get (ptep))) +/* If pte changed from under us, retry */ +if (!pte_same (huge_ptep_get (ptep), old_pte)) goto backout;if (anon_rmap) {
@@ -5575,6 +5577,12 @@ retry:page_dup_file_rmap (page, true); new_pte =make_huge_pte (vma, page, ((vma->vm_flags &VM_WRITE ) && (vma->vm_flags &VM_SHARED ))); +/* +* If this pte was previously wr-protected, keep it wr-protected even +* if populated. +*/ +if (unlikely (pte_marker_uffd_wp (old_pte))) + new_pte =huge_pte_wrprotect (huge_pte_mkuffd_wp (new_pte));set_huge_pte_at (mm, haddr, ptep, new_pte);hugetlb_count_add (pages_per_huge_page (h), mm);
@@ -5692,8 +5700,10 @@ vm_fault_t hugetlb_fault(struct mm_strucmutex_lock (&hugetlb_fault_mutex_table[hash]); entry =huge_ptep_get (ptep); -if (huge_pte_none (entry)) { - ret =hugetlb_no_page (mm, vma, mapping, idx, address, ptep, flags); +/* PTE markers should be handled the same way as none pte */ +if (huge_pte_none_mostly (entry)) { + ret =hugetlb_no_page (mm, vma, mapping, idx, address, ptep, + entry, flags); goto out_mutex; }
_
Patches currently in -mm which might be from [email protected] are