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

mm/hugetlb: convert isolate_hugetlb to folios 

Patch series "continue hugetlb folio conversion", v3.

This series continues the conversion of core hugetlb functions to use
folios. This series converts many helper funtions in the hugetlb fault
path. This is in preparation for another series to convert the hugetlb
fault code paths to operate on folios.


This patch (of 8):

Convert isolate_hugetlb() to take in a folio and convert its callers to
pass a folio.  Use page_folio() to convert the callers to use a folio is
safe as isolate_hugetlb() operates on a head page.

Link: https://lkml.kernel.org/r/20230113223057.173292-1-sidhartha.kumar@oracle.com
Link: https://lkml.kernel.org/r/20230113223057.173292-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: John Hubbard <jhubbard@nvidia.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent f528260b

include/linux/hugetlb.h

+2 −2
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ bool hugetlb_reserve_pages(struct inode *inode, long from, long to, 
						vm_flags_t vm_flags);

long hugetlb_unreserve_pages(struct inode *inode, long start, long end,

						long freed);

int isolate_hugetlb(struct page *page, struct list_head *list);

int isolate_hugetlb(struct folio *folio, struct list_head *list);

int get_hwpoison_hugetlb_folio(struct folio *folio, bool *hugetlb, bool unpoison);

int get_huge_page_for_hwpoison(unsigned long pfn, int flags,

				bool *migratable_cleared);
@@ -413,7 +413,7 @@ static inline pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr, 
	return NULL;

}



static inline int isolate_hugetlb(struct page *page, struct list_head *list)

static inline int isolate_hugetlb(struct folio *folio, struct list_head *list)

{

	return -EBUSY;

}

mm/gup.c

+1 −1
Original line number Diff line number Diff line
@@ -1930,7 +1930,7 @@ static unsigned long collect_longterm_unpinnable_pages( 
			continue;



		if (folio_test_hugetlb(folio)) {

			isolate_hugetlb(&folio->page, movable_page_list);

			isolate_hugetlb(folio, movable_page_list);

			continue;

		}

mm/hugetlb.c

+8 −8
Original line number Diff line number Diff line
@@ -2925,7 +2925,7 @@ static int alloc_and_dissolve_hugetlb_folio(struct hstate *h, 
		 * Fail with -EBUSY if not possible.

		 */

		spin_unlock_irq(&hugetlb_lock);

		ret = isolate_hugetlb(&old_folio->page, list);

		ret = isolate_hugetlb(old_folio, list);

		spin_lock_irq(&hugetlb_lock);

		goto free_new;

	} else if (!folio_test_hugetlb_freed(old_folio)) {
@@ -3000,7 +3000,7 @@ int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list) 
	if (hstate_is_gigantic(h))

		return -ENOMEM;



	if (folio_ref_count(folio) && !isolate_hugetlb(&folio->page, list))

	if (folio_ref_count(folio) && !isolate_hugetlb(folio, list))

		ret = 0;

	else if (!folio_ref_count(folio))

		ret = alloc_and_dissolve_hugetlb_folio(h, folio, list);
@@ -7250,19 +7250,19 @@ __weak unsigned long hugetlb_mask_last_page(struct hstate *h) 
 * These functions are overwritable if your architecture needs its own

 * behavior.

 */

int isolate_hugetlb(struct page *page, struct list_head *list)

int isolate_hugetlb(struct folio *folio, struct list_head *list)

{

	int ret = 0;



	spin_lock_irq(&hugetlb_lock);

	if (!PageHeadHuge(page) ||

	    !HPageMigratable(page) ||

	    !get_page_unless_zero(page)) {

	if (!folio_test_hugetlb(folio) ||

	    !folio_test_hugetlb_migratable(folio) ||

	    !folio_try_get(folio)) {

		ret = -EBUSY;

		goto unlock;

	}

	ClearHPageMigratable(page);

	list_move_tail(&page->lru, list);

	folio_clear_hugetlb_migratable(folio);

	list_move_tail(&folio->lru, list);

unlock:

	spin_unlock_irq(&hugetlb_lock);

	return ret;

mm/memory-failure.c

+1 −1
Original line number Diff line number Diff line
@@ -2508,7 +2508,7 @@ static bool isolate_page(struct page *page, struct list_head *pagelist) 
	bool isolated = false;



	if (PageHuge(page)) {

		isolated = !isolate_hugetlb(page, pagelist);

		isolated = !isolate_hugetlb(page_folio(page), pagelist);

	} else {

		bool lru = !__PageMovable(page);

mm/memory_hotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -1641,7 +1641,7 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) 


		if (PageHuge(page)) {

			pfn = page_to_pfn(head) + compound_nr(head) - 1;

			isolate_hugetlb(head, &source);

			isolate_hugetlb(folio, &source);

			continue;

		} else if (PageTransHuge(page))

			pfn = page_to_pfn(head) + thp_nr_pages(page) - 1;