Commit ea4c353d authored by Sidhartha Kumar's avatar Sidhartha Kumar Committed by Andrew Morton
Browse files

mm/hugetlb: convert hugetlb_install_page to folios 

Patch series "convert hugetlb fault functions to folios", v2.

This series converts the hugetlb page faulting functions to operate on
folios. These include hugetlb_no_page(), hugetlb_wp(),
copy_hugetlb_page_range(), and hugetlb_mcopy_atomic_pte().


This patch (of 8):

Change hugetlb_install_page() to hugetlb_install_folio().  This reduces
one user of the Huge Page flag macros which take in a page.

Link: https://lkml.kernel.org/r/20230125170537.96973-1-sidhartha.kumar@oracle.com
Link: https://lkml.kernel.org/r/20230125170537.96973-2-sidhartha.kumar@oracle.com


Signed-off-by: default avatarSidhartha Kumar <sidhartha.kumar@oracle.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent bdd7be07

mm/hugetlb.c

+7 −7
Original line number Diff line number Diff line
@@ -4946,14 +4946,14 @@ static bool is_hugetlb_entry_hwpoisoned(pte_t pte) 
}



static void

hugetlb_install_page(struct vm_area_struct *vma, pte_t *ptep, unsigned long addr,

		     struct page *new_page)

hugetlb_install_folio(struct vm_area_struct *vma, pte_t *ptep, unsigned long addr,

		     struct folio *new_folio)

{

	__SetPageUptodate(new_page);

	hugepage_add_new_anon_rmap(new_page, vma, addr);

	set_huge_pte_at(vma->vm_mm, addr, ptep, make_huge_pte(vma, new_page, 1));

	__folio_mark_uptodate(new_folio);

	hugepage_add_new_anon_rmap(&new_folio->page, vma, addr);

	set_huge_pte_at(vma->vm_mm, addr, ptep, make_huge_pte(vma, &new_folio->page, 1));

	hugetlb_count_add(pages_per_huge_page(hstate_vma(vma)), vma->vm_mm);

	SetHPageMigratable(new_page);

	folio_set_hugetlb_migratable(new_folio);

}



int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
@@ -5107,7 +5107,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, 
					/* huge_ptep of dst_pte won't change as in child */

					goto again;

				}

				hugetlb_install_page(dst_vma, dst_pte, addr, new);

				hugetlb_install_folio(dst_vma, dst_pte, addr, page_folio(new));

				spin_unlock(src_ptl);

				spin_unlock(dst_ptl);

				continue;