Commit db4e5dbd authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

mm: use a folio in hugepage_add_anon_rmap() and hugepage_add_new_anon_rmap() 

Remove uses of compound_mapcount_ptr()

Link: https://lkml.kernel.org/r/20230111142915.1001531-11-willy@infradead.org


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 65a689f3

mm/rmap.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -2528,13 +2528,14 @@ void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc) 
void hugepage_add_anon_rmap(struct page *page, struct vm_area_struct *vma,

void hugepage_add_anon_rmap(struct page *page, struct vm_area_struct *vma,

			    unsigned long address, rmap_t flags)

			    unsigned long address, rmap_t flags)

{

{

	struct folio *folio = page_folio(page);

	struct anon_vma *anon_vma = vma->anon_vma;

	struct anon_vma *anon_vma = vma->anon_vma;

	int first;

	int first;





	BUG_ON(!PageLocked(page));

	BUG_ON(!folio_test_locked(folio));

	BUG_ON(!anon_vma);

	BUG_ON(!anon_vma);

	/* address might be in next vma when migration races vma_adjust */

	/* address might be in next vma when migration races vma_adjust */

	first = atomic_inc_and_test(compound_mapcount_ptr(page));

	first = atomic_inc_and_test(&folio->_entire_mapcount);

	VM_BUG_ON_PAGE(!first && (flags & RMAP_EXCLUSIVE), page);

	VM_BUG_ON_PAGE(!first && (flags & RMAP_EXCLUSIVE), page);

	VM_BUG_ON_PAGE(!first && PageAnonExclusive(page), page);

	VM_BUG_ON_PAGE(!first && PageAnonExclusive(page), page);

	if (first)

	if (first)
@@ -2545,10 +2546,12 @@ void hugepage_add_anon_rmap(struct page *page, struct vm_area_struct *vma, 
void hugepage_add_new_anon_rmap(struct page *page,

void hugepage_add_new_anon_rmap(struct page *page,

			struct vm_area_struct *vma, unsigned long address)

			struct vm_area_struct *vma, unsigned long address)

{

{

	struct folio *folio = page_folio(page);



	BUG_ON(address < vma->vm_start || address >= vma->vm_end);

	BUG_ON(address < vma->vm_start || address >= vma->vm_end);

	/* increment count (starts at -1) */

	/* increment count (starts at -1) */

	atomic_set(compound_mapcount_ptr(page), 0);

	atomic_set(&folio->_entire_mapcount, 0);

	ClearHPageRestoreReserve(page);

	folio_clear_hugetlb_restore_reserve(folio);

	__page_set_anon_rmap(page, vma, address, 1);

	__page_set_anon_rmap(page, vma, address, 1);

}

}

#endif /* CONFIG_HUGETLB_PAGE */
 
#endif /* CONFIG_HUGETLB_PAGE */