mm-huge_memory-page_try_dup_anon_rmap-folio_try_dup_anon_rmap_pmd.patch removed from -mm tree
The quilt patch titled
Subject: mm/huge_memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pmd()
has been removed from the -mm tree. Its filename was
mm-huge_memory-page_try_dup_anon_rmap-folio_try_dup_anon_rmap_pmd.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/huge_memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pmd()
Date: Wed, 20 Dec 2023 23:44:59 +0100
Let's convert copy_huge_pmd() and fixup the comment in copy_huge_pud(). While at it, perform more folio conversion in copy_huge_pmd().
Signed-off-by David Hildenbrand <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Muchun Song <[email protected]>
Cc Muchun Song <[email protected]>
Cc Peter Xu <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Yin Fengwei <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/huge_memory.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-huge_memory-page_try_dup_anon_rmap-folio_try_dup_anon_rmap_pmd +7 -5
@@ -1275,6 +1275,7 @@ int copy_huge_pmd(struct mm_struct *dst_ {spinlock_t *dst_ptl, *src_ptl;struct page *src_page; +struct folio *src_folio;pmd_t pmd;pgtable_t pgtable =NULL ;int ret = -ENOMEM ;
@@ -1341,11 +1342,12 @@ int copy_huge_pmd(struct mm_struct *dst_ src_page =pmd_page (pmd);VM_BUG_ON_PAGE (!PageHead (src_page), src_page); + src_folio =page_folio (src_page); -get_page (src_page); -if (unlikely (page_try_dup_anon_rmap (src_page, true, src_vma))) { +folio_get (src_folio); +if (unlikely (folio_try_dup_anon_rmap_pmd (src_folio, src_page, src_vma))) {/* Page maybe pinned: split and retry the fault on PTEs. */ -put_page (src_page); +folio_put (src_folio);pte_free (dst_mm, pgtable);spin_unlock (src_ptl);spin_unlock (dst_ptl);
@@ -1454,8 +1456,8 @@ int copy_huge_pud(struct mm_struct *dst_ }/* -* TODO: once we support anonymous pages, use page_try_dup_anon_rmap() -* and split if duplicating fails. +* TODO: once we support anonymous pages, use +* folio_try_dup_anon_rmap_*() and split if duplicating fails. */ pudp_set_wrprotect (src_mm, addr, src_pud); pud =pud_mkold (pud_wrprotect (pud));
_
Patches currently in -mm which might be from [email protected] are