[folded-merged] hugetlb-simplify-hugetlb-handling-in-follow_page_mask-v4.patch removed from -mm tree

[Andrew Morton <akpm@linux-foundation.org>]

The quilt patch titled
     Subject: hugetlb-simplify-hugetlb-handling-in-follow_page_mask-v4
has been removed from the -mm tree.  Its filename was
     hugetlb-simplify-hugetlb-handling-in-follow_page_mask-v4.patch

This patch was dropped because it was folded into hugetlb-simplify-hugetlb-handling-in-follow_page_mask.patch

------------------------------------------------------
From: Mike Kravetz <mike.kravetz@oracle.com>
Subject: hugetlb-simplify-hugetlb-handling-in-follow_page_mask-v4
Date: Fri, 28 Oct 2022 11:11:08 -0700

remove vma (pmd sharing) locking as this can be called with FOLL_NOWAIT,
per Peter

Link: https://lkml.kernel.org/r/20221028181108.119432-1-mike.kravetz@oracle.com
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Suggested-by: David Hildenbrand <david@redhat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Naoya Horiguchi <naoya.horiguchi@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/hugetlb.c |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

--- a/mm/hugetlb.c~hugetlb-simplify-hugetlb-handling-in-follow_page_mask-v4
+++ a/mm/hugetlb.c
@@ -6240,17 +6240,9 @@ struct page *hugetlb_follow_page_mask(st
 		return NULL;
 
 retry:
-	/*
-	 * vma lock prevents racing with another thread doing a pmd unshare.
-	 * This keeps pte as returned by huge_pte_offset valid.
-	 */
-	hugetlb_vma_lock_read(vma);
-
 	pte = huge_pte_offset(mm, haddr, huge_page_size(h));
-	if (!pte) {
-		hugetlb_vma_unlock_read(vma);
+	if (!pte)
 		return NULL;
-	}
 
 	ptl = huge_pte_lock(h, mm, pte);
 	entry = huge_ptep_get(pte);
@@ -6284,7 +6276,6 @@ retry:
 	}
 out:
 	spin_unlock(ptl);
-	hugetlb_vma_unlock_read(vma);
 	return page;
 }
 
_

Patches currently in -mm which might be from mike.kravetz@oracle.com are

hugetlb-dont-delete-vma_lock-in-hugetlb-madv_dontneed-processing.patch
hugetlb-simplify-hugetlb-handling-in-follow_page_mask.patch
hugetlb-simplify-hugetlb-handling-in-follow_page_mask-v5.patch
selftests-vm-update-hugetlb-madvise.patch