mm-huge_memory-page_add_file_rmap-folio_add_file_rmap_pmd.patch removed from -mm tree
The quilt patch titled
Subject: mm/huge_memory: page_add_file_rmap() -> folio_add_file_rmap_pmd()
has been removed from the -mm tree. Its filename was
mm-huge_memory-page_add_file_rmap-folio_add_file_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_add_file_rmap() -> folio_add_file_rmap_pmd()
Date: Wed, 20 Dec 2023 23:44:33 +0100
Let's convert remove_migration_pmd() and while at it, perform some folio conversion.
Signed-off-by David Hildenbrand <[email protected]>
Reviewed-by Yin Fengwei <[email protected]>
Reviewed-by Ryan Roberts <[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]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/huge_memory.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-huge_memory-page_add_file_rmap-folio_add_file_rmap_pmd +6 -5
@@ -3577,6 +3577,7 @@ int set_pmd_migration_entry(struct page_void remove_migration_pmd (struct page_vma_mapped_walk *pvmw,struct page *new) { +struct folio *folio =page_folio (new);struct vm_area_struct *vma = pvmw->vma;struct mm_struct *mm = vma->vm_mm;unsigned long address = pvmw->address;
@@ -3588,7 +3589,7 @@ void remove_migration_pmd(struct page_vmreturn ; entry =pmd_to_swp_entry (*pvmw->pmd); -get_page (new); +folio_get (folio); pmde =mk_huge_pmd (new,READ_ONCE (vma->vm_page_prot));if (pmd_swp_soft_dirty (*pvmw->pmd)) pmde =pmd_mksoft_dirty (pmde);
@@ -3599,10 +3600,10 @@ void remove_migration_pmd(struct page_vmif (!is_migration_entry_young (entry)) pmde =pmd_mkold (pmde);/* NOTE: this may contain setting soft-dirty on some archs */ -if (PageDirty (new) &&is_migration_entry_dirty (entry)) +if (folio_test_dirty (folio) &&is_migration_entry_dirty (entry)) pmde =pmd_mkdirty (pmde); -if (PageAnon (new)) { +if (folio_test_anon (folio)) {rmap_t rmap_flags =RMAP_COMPOUND ;if (!is_readable_migration_entry (entry))
@@ -3610,9 +3611,9 @@ void remove_migration_pmd(struct page_vmpage_add_anon_rmap (new, vma, haddr, rmap_flags); }else { -page_add_file_rmap (new, vma, true); +folio_add_file_rmap_pmd (folio, new, vma); } -VM_BUG_ON (pmd_write (pmde) &&PageAnon (new) && !PageAnonExclusive (new)); +VM_BUG_ON (pmd_write (pmde) &&folio_test_anon (folio) && !PageAnonExclusive (new));set_pmd_at (mm, haddr, pvmw->pmd, pmde);/* No need to invalidate - it was non-present before */
_
Patches currently in -mm which might be from [email protected] are