Commit 14d85a6e authored by David Hildenbrand's avatar David Hildenbrand Committed by Andrew Morton
Browse files

mm/huge_memory: page_add_file_rmap() -> folio_add_file_rmap_pmd() 

Let's convert remove_migration_pmd() and while at it, perform some folio
conversion.

Link: https://lkml.kernel.org/r/20231220224504.646757-10-david@redhat.com


Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarYin Fengwei <fengwei.yin@intel.com>
Reviewed-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Muchun Song <songmuchun@bytedance.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ef37b2ea

mm/huge_memory.c

+6 −5
Original line number Diff line number Diff line
@@ -3577,6 +3577,7 @@ int set_pmd_migration_entry(struct page_vma_mapped_walk *pvmw, 


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_vma_mapped_walk *pvmw, struct page *new) 
		return;



	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_vma_mapped_walk *pvmw, struct page *new) 
	if (!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_vma_mapped_walk *pvmw, struct page *new) 


		page_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 */