mm-memory-page_try_dup_anon_rmap-folio_try_dup_anon_rmap_pte.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pte()
has been removed from the -mm tree. Its filename was
mm-memory-page_try_dup_anon_rmap-folio_try_dup_anon_rmap_pte.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/memory: page_try_dup_anon_rmap() -> folio_try_dup_anon_rmap_pte()
Date: Wed, 20 Dec 2023 23:45:00 +0100
Let's convert copy_nonpresent_pte(). While at it, perform some more folio conversion.
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/memory.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
mm/memory.c renamed from mm/memory.c~mm-memory-page_try_dup_anon_rmap-folio_try_dup_anon_rmap_pte +5 -3
@@ -785,6 +785,7 @@ copy_nonpresent_pte(struct mm_struct *dsunsigned long vm_flags = dst_vma->vm_flags;pte_t orig_pte =ptep_get (src_pte);pte_t pte = orig_pte; +struct folio *folio;struct page *page;swp_entry_t entry =pte_to_swp_entry (orig_pte);
@@ -829,6 +830,7 @@ copy_nonpresent_pte(struct mm_struct *ds } }else if (is_device_private_entry (entry)) { page =pfn_swap_entry_to_page (entry); + folio =page_folio (page);/* * Update rss count even for unaddressable pages, as
@@ -839,10 +841,10 @@ copy_nonpresent_pte(struct mm_struct *ds* for unaddressable pages, at some point. But for now * keep things as they are. */ -get_page (page); +folio_get (folio); rss[mm_counter (page)]++;/* Cannot fail as these pages cannot get pinned. */ -BUG_ON (page_try_dup_anon_rmap (page, false, src_vma)); +folio_try_dup_anon_rmap_pte (folio, page, src_vma);/* * We do not preserve soft-dirty information, because so
@@ -956,7 +958,7 @@ copy_present_pte(struct vm_area_struct ** future. */ folio_get (folio); -if (unlikely (page_try_dup_anon_rmap (page, false, src_vma))) { +if (unlikely (folio_try_dup_anon_rmap_pte (folio, page, src_vma))) {/* Page may be pinned, we have to copy. */ folio_put (folio); return copy_present_page(dst_vma, src_vma, dst_pte, src_pte,
_
Patches currently in -mm which might be from [email protected] are