mm-hugetlb-hook-page-faults-for-uffd-write-protection.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: hook page faults for uffd write protection
has been removed from the -mm tree. Its filename was
mm-hugetlb-hook-page-faults-for-uffd-write-protection.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: hook page faults for uffd write protection
Hook up hugetlbfs_fault() with the capability to handle userfaultfd-wp faults.
We do this slightly earlier than hugetlb_cow() so that we can avoid taking some extra locks that we definitely don't need.
---
mm/hugetlb.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-hook-page-faults-for-uffd-write-protection +20 -0
@@ -5737,6 +5737,26 @@ vm_fault_t hugetlb_fault(struct mm_strucif (unlikely (!pte_same (entry,huge_ptep_get (ptep)))) goto out_ptl; +/* Handle userfault-wp first, before trying to lock more pages */ +if (userfaultfd_wp (vma) &&huge_pte_uffd_wp (huge_ptep_get (ptep)) && + (flags &FAULT_FLAG_WRITE ) && !huge_pte_write (entry)) { +struct vm_fault vmf = { + .vma = vma, + .address = haddr, + .real_address = address, + .flags = flags, + }; + +spin_unlock (ptl); +if (pagecache_page) { +unlock_page (pagecache_page); +put_page (pagecache_page); + } +mutex_unlock (&hugetlb_fault_mutex_table[hash]); +i_mmap_unlock_read (mapping); +return handle_userfault (&vmf,VM_UFFD_WP ); + } +/* * hugetlb_wp() requires page locks of pte_page(entry) and * pagecache_page, so here we need take the former one
_
Patches currently in -mm which might be from [email protected] are