Skip to contentSkip to conversation

mm-rmap-move-setpageanonexclusive-out-of-page_move_anon_rmap.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 18, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/rmap: move SetPageAnonExclusive() out of page_move_anon_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-move-setpageanonexclusive-out-of-page_move_anon_rmap.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: David Hildenbrand <[email protected]>
Subject: mm/rmap: move SetPageAnonExclusive() out of page_move_anon_rmap()
Date: Mon, 2 Oct 2023 16:29:47 +0200

Patch series "mm/rmap: convert page_move_anon_rmap() to folio_move_anon_rmap()".

Convert page_move_anon_rmap() to folio_move_anon_rmap(), letting the callers handle PageAnonExclusive. I'm including cleanup patch #3 because it fits into the picture and can be done cleaner by the conversion.

This patch (of 3):

Let's move it into the caller: there is a difference between whether an anon folio can only be mapped by one process (e.g., into one VMA), and whether it is truly exclusive (e.g., no references -- including GUP -- from other processes).

Further, for large folios the page might not actually be pointing at the head page of the folio, so it better be handled in the caller. This is a preparation for converting page_move_anon_rmap() to consume a folio.

---

 mm/huge_memory.c |    1 +
 mm/hugetlb.c     |    4 +++-
 mm/memory.c      |    1 +
 mm/rmap.c        |    1 -
 4 files changed, 5 insertions(+), 2 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-rmap-move-setpageanonexclusive-out-of-page_move_anon_rmap +1 -0
@@ -1377,6 +1377,7 @@ vm_fault_t do_huge_pmd_wp_page(struct vm
 		pmd_t entry;
 
 		page_move_anon_rmap(page, vma);
+		SetPageAnonExclusive(page);
 		folio_unlock(folio);
 reuse:
 		if (unlikely(unshare)) {
mm/hugetlb.c renamed from mm/hugetlb.c~mm-rmap-move-setpageanonexclusive-out-of-page_move_anon_rmap +3 -1
@@ -5652,8 +5652,10 @@ retry_avoidcopy:
 	 * owner and can reuse this page.
 	 */
 	if (folio_mapcount(old_folio) == 1 && folio_test_anon(old_folio)) {
-		if (!PageAnonExclusive(&old_folio->page))
+		if (!PageAnonExclusive(&old_folio->page)) {
 			page_move_anon_rmap(&old_folio->page, vma);
+			SetPageAnonExclusive(&old_folio->page);
+		}
 		if (likely(!unshare))
 			set_huge_ptep_writable(vma, haddr, ptep);
 
mm/memory.c renamed from mm/memory.c~mm-rmap-move-setpageanonexclusive-out-of-page_move_anon_rmap +1 -0
@@ -3481,6 +3481,7 @@ static vm_fault_t do_wp_page(struct vm_f
 		 * sunglasses. Hit it.
 		 */
 		page_move_anon_rmap(vmf->page, vma);
+		SetPageAnonExclusive(vmf->page);
 		folio_unlock(folio);
 reuse:
 		if (unlikely(unshare)) {
mm/rmap.c renamed from mm/rmap.c~mm-rmap-move-setpageanonexclusive-out-of-page_move_anon_rmap +0 -1
@@ -1152,7 +1152,6 @@ void page_move_anon_rmap(struct page *pa
 	 * folio_test_anon()) will not see one without the other.
 	 */
 	WRITE_ONCE(folio->mapping, anon_vma);
-	SetPageAnonExclusive(page);
 }
 
 /**

_

Patches currently in -mm which might be from [email protected] are