mm-rmap-convert-page_move_anon_rmap-to-folio_move_anon_rmap.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: convert page_move_anon_rmap() to folio_move_anon_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-convert-page_move_anon_rmap-to-folio_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: convert page_move_anon_rmap() to folio_move_anon_rmap()
Date: Mon, 2 Oct 2023 16:29:48 +0200
Let's convert it to consume a folio.
[[email protected]: fix kerneldoc]
Signed-off-by David Hildenbrand <[email protected]>
Reviewed-by Suren Baghdasaryan <[email protected]>
Reviewed-by Vishal Moola (Oracle) <[email protected]>
Cc Mike Kravetz <[email protected]>
Cc Muchun Song <[email protected]>
Cc Matthew Wilcox <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/rmap.h | 2 +- mm/huge_memory.c | 2 +- mm/hugetlb.c | 2 +- mm/memory.c | 2 +- mm/rmap.c | 16 +++++++--------- 5 files changed, 11 insertions(+), 13 deletions(-)
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-convert-page_move_anon_rmap-to-folio_move_anon_rmap +1 -1
@@ -189,7 +189,7 @@ typedef int __bitwise rmap_t;/* * rmap interfaces called when adding or removing pte of page */ -void page_move_anon_rmap (struct page *,struct vm_area_struct *); +void folio_move_anon_rmap (struct folio *,struct vm_area_struct *);void page_add_anon_rmap (struct page *,struct vm_area_struct *,unsigned long address,rmap_t flags); void page_add_new_anon_rmap(struct page *, struct vm_area_struct *,
mm/huge_memory.c renamed from mm/huge_memory.c~mm-rmap-convert-page_move_anon_rmap-to-folio_move_anon_rmap +1 -1
@@ -1376,7 +1376,7 @@ vm_fault_t do_huge_pmd_wp_page(struct vmif (folio_ref_count (folio) ==1 ) {pmd_t entry; -page_move_anon_rmap (page, vma); +folio_move_anon_rmap (folio, vma);SetPageAnonExclusive (page);folio_unlock (folio); reuse:
mm/hugetlb.c renamed from mm/hugetlb.c~mm-rmap-convert-page_move_anon_rmap-to-folio_move_anon_rmap +1 -1
@@ -5653,7 +5653,7 @@ retry_avoidcopy:*/ if (folio_mapcount (old_folio) ==1 &&folio_test_anon (old_folio)) {if (!PageAnonExclusive (&old_folio->page)) { -page_move_anon_rmap (&old_folio->page, vma); +folio_move_anon_rmap (old_folio, vma);SetPageAnonExclusive (&old_folio->page); }if (likely (!unshare))
mm/memory.c renamed from mm/memory.c~mm-rmap-convert-page_move_anon_rmap-to-folio_move_anon_rmap +1 -1
@@ -3480,7 +3480,7 @@ static vm_fault_t do_wp_page(struct vm_f* and the folio is locked, it's dark out, and we're wearing * sunglasses. Hit it. */ -page_move_anon_rmap (vmf->page, vma); +folio_move_anon_rmap (folio, vma);SetPageAnonExclusive (vmf->page);folio_unlock (folio); reuse:
mm/rmap.c renamed from mm/rmap.c~mm-rmap-convert-page_move_anon_rmap-to-folio_move_anon_rmap +7 -9
@@ -1128,19 +1128,17 @@ int folio_total_mapcount(struct folio *f }/** -* page_move_anon_rmap - move a page to our anon_vma -* @page: the page to move to our anon_vma -* @vma: the vma the page belongs to +* folio_move_anon_rmap - move a folio to our anon_vma +* @folio: The folio to move to our anon_vma +* @vma: The vma the folio belongs to * -* When a page belongs exclusively to one process after a COW event, -* that page can be moved into the anon_vma that belongs to just that -* process, so the rmap code will not search the parent or sibling -* processes. +* When a folio belongs exclusively to one process after a COW event, +* that folio can be moved into the anon_vma that belongs to just that +* process, so the rmap code will not search the parent or sibling processes. */ -void page_move_anon_rmap (struct page *page,struct vm_area_struct *vma) +void folio_move_anon_rmap (struct folio *folio,struct vm_area_struct *vma) {void *anon_vma = vma->anon_vma; -struct folio *folio =page_folio (page);VM_BUG_ON_FOLIO (!folio_test_locked (folio), folio);VM_BUG_ON_VMA (!anon_vma, vma);
_
Patches currently in -mm which might be from [email protected] are