mm-huge_memory-page_remove_rmap-folio_remove_rmap_pmd.patch removed from -mm tree
The quilt patch titled
Subject: mm/huge_memory: page_remove_rmap() -> folio_remove_rmap_pmd()
has been removed from the -mm tree. Its filename was
mm-huge_memory-page_remove_rmap-folio_remove_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_remove_rmap() -> folio_remove_rmap_pmd()
Date: Wed, 20 Dec 2023 23:44:49 +0100
Let's convert zap_huge_pmd() and set_pmd_migration_entry(). 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/huge_memory.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
mm/huge_memory.c renamed from mm/huge_memory.c~mm-huge_memory-page_remove_rmap-folio_remove_rmap_pmd +14 -12
@@ -1898,7 +1898,7 @@ int zap_huge_pmd(struct mmu_gather *tlb,if (pmd_present (orig_pmd)) { page =pmd_page (orig_pmd); -page_remove_rmap (page, vma, true); +folio_remove_rmap_pmd (page_folio (page), page, vma);VM_BUG_ON_PAGE (page_mapcount (page) <0 , page);VM_BUG_ON_PAGE (!PageHead (page), page); }else if (thp_migration_supported ()) {
@@ -2433,12 +2433,13 @@ static void __split_huge_pmd_locked(stru page =pfn_swap_entry_to_page (entry); }else { page =pmd_page (old_pmd); -if (!PageDirty (page) &&pmd_dirty (old_pmd)) -set_page_dirty (page); -if (!PageReferenced (page) &&pmd_young (old_pmd)) -SetPageReferenced (page); -page_remove_rmap (page, vma, true); -put_page (page); + folio =page_folio (page); +if (!folio_test_dirty (folio) &&pmd_dirty (old_pmd)) +folio_set_dirty (folio); +if (!folio_test_referenced (folio) &&pmd_young (old_pmd)) +folio_set_referenced (folio); +folio_remove_rmap_pmd (folio, page, vma); +folio_put (folio); }add_mm_counter (mm,mm_counter_file (page), -HPAGE_PMD_NR );return ;
@@ -2593,7 +2594,7 @@ static void __split_huge_pmd_locked(strupte_unmap (pte -1 );if (!pmd_migration) -page_remove_rmap (page, vma, true); +folio_remove_rmap_pmd (folio, page, vma);if (freeze)put_page (page);
@@ -3536,6 +3537,7 @@ late_initcall(split_huge_pages_debugfs);int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page) { +struct folio *folio =page_folio (page);struct vm_area_struct *vma = pvmw->vma;struct mm_struct *mm = vma->vm_mm;unsigned long address = pvmw->address;
@@ -3551,14 +3553,14 @@ int set_pmd_migration_entry(struct page_ pmdval =pmdp_invalidate (vma, address, pvmw->pmd);/* See page_try_share_anon_rmap(): invalidate PMD first. */ - anon_exclusive =PageAnon (page) &&PageAnonExclusive (page); + anon_exclusive =folio_test_anon (folio) &&PageAnonExclusive (page);if (anon_exclusive &&page_try_share_anon_rmap (page)) {set_pmd_at (mm, address, pvmw->pmd, pmdval);return -EBUSY ; }if (pmd_dirty (pmdval)) -set_page_dirty (page); +folio_set_dirty (folio);if (pmd_write (pmdval)) entry =make_writable_migration_entry (page_to_pfn (page));else if (anon_exclusive)
@@ -3575,8 +3577,8 @@ int set_pmd_migration_entry(struct page_if (pmd_uffd_wp (pmdval)) pmdswp =pmd_swp_mkuffd_wp (pmdswp);set_pmd_at (mm, address, pvmw->pmd, pmdswp); -page_remove_rmap (page, vma, true); -put_page (page); +folio_remove_rmap_pmd (folio, page, vma); +folio_put (folio);trace_set_migration_pmd (address,pmd_val (pmdswp));return 0 ;
_
Patches currently in -mm which might be from [email protected] are