mm-hugetlb-make-walk_hugetlb_range-safe-to-pmd-unshare.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: make walk_hugetlb_range() safe to pmd unshare
has been removed from the -mm tree. Its filename was
mm-hugetlb-make-walk_hugetlb_range-safe-to-pmd-unshare.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/hugetlb: make walk_hugetlb_range() safe to pmd unshare
Date: Fri, 16 Dec 2022 10:52:26 -0500
Since walk_hugetlb_range() walks the pgtable, it needs the vma lock to make sure the pgtable page will not be freed concurrently.
---
include/linux/pagewalk.h | 11 ++++++++++- mm/hmm.c | 15 ++++++++++++++- mm/pagewalk.c | 2 ++ 3 files changed, 26 insertions(+), 2 deletions(-)
include/linux/pagewalk.h renamed from include/linux/pagewalk.h~mm-hugetlb-make-walk_hugetlb_range-safe-to-pmd-unshare +10 -1
@@ -21,7 +21,16 @@ struct mm_walk;* depth is -1 if not known, 0:PGD, 1:P4D, 2:PUD, 3:PMD. * Any folded depths (where PTRS_PER_P?D is equal to 1) * are skipped. -* @hugetlb_entry: if set, called for each hugetlb entry +* @hugetlb_entry: if set, called for each hugetlb entry. This hook +* function is called with the vma lock held, in order to +* protect against a concurrent freeing of the pte_t* or +* the ptl. In some cases, the hook function needs to drop +* and retake the vma lock in order to avoid deadlocks +* while calling other functions. In such cases the hook +* function must either refrain from accessing the pte or +* ptl after dropping the vma lock, or else revalidate +* those items after re-acquiring the vma lock and before +* accessing them. * @test_walk: caller specific callback function to determine whether * we walk over the current vma or not. Returning 0 means * "do page table walk over the current vma", returning
mm/hmm.c renamed from mm/hmm.c~mm-hugetlb-make-walk_hugetlb_range-safe-to-pmd-unshare +14 -1
@@ -492,8 +492,21 @@ static int hmm_vma_walk_hugetlb_entry(pt required_fault =hmm_pte_need_fault (hmm_vma_walk, pfn_req_flags, cpu_flags);if (required_fault) { +int ret; +spin_unlock (ptl); -return hmm_vma_fault (addr, end, required_fault, walk); +hugetlb_vma_unlock_read (vma); +/* +* Avoid deadlock: drop the vma lock before calling +* hmm_vma_fault(), which will itself potentially take and +* drop the vma lock. This is also correct from a +* protection point of view, because there is no further +* use here of either pte or ptl after dropping the vma +* lock. +*/ + ret =hmm_vma_fault (addr, end, required_fault, walk); +hugetlb_vma_lock_read (vma); +return ret; } pfn =pte_pfn (entry) + ((start & ~hmask) >>PAGE_SHIFT );
mm/pagewalk.c renamed from mm/pagewalk.c~mm-hugetlb-make-walk_hugetlb_range-safe-to-pmd-unshare +2 -0
@@ -302,6 +302,7 @@ static int walk_hugetlb_range(unsigned lconst struct mm_walk_ops *ops = walk->ops;int err =0 ; +hugetlb_vma_lock_read (vma); do { next = hugetlb_entry_end(h, addr, end); pte = huge_pte_offset(walk->mm, addr & hmask, sz);
@@ -314,6 +315,7 @@ static int walk_hugetlb_range(unsigned lif (err)break ; }while (addr = next, addr != end); +hugetlb_vma_unlock_read (vma);return err; }
_
Patches currently in -mm which might be from [email protected] are
selftests-vm-remove-__use_gnu-in-hugetlb-madvisec.patch