mm-hugetlb-rename-isolate_hugetlb-to-folio_isolate_hugetlb.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: rename isolate_hugetlb() to folio_isolate_hugetlb()
has been removed from the -mm tree. Its filename was
mm-hugetlb-rename-isolate_hugetlb-to-folio_isolate_hugetlb.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/hugetlb: rename isolate_hugetlb() to folio_isolate_hugetlb()
Date: Mon, 13 Jan 2025 14:16:07 +0100
Let's make the function name match "folio_isolate_lru()", and add some kernel doc.
Signed-off-by David Hildenbrand <[email protected]>
Reviewed-by Matthew Wilcox (Oracle) <[email protected]>
Reviewed-by Baolin Wang <[email protected]>
Cc Muchun Song <[email protected]>
Cc Sidhartha Kumar <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/hugetlb.h | 4 ++-- mm/gup.c | 2 +- mm/hugetlb.c | 23 ++++++++++++++++++++--- mm/mempolicy.c | 2 +- mm/migrate.c | 6 +++--- 5 files changed, 27 insertions(+), 10 deletions(-)
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-rename-isolate_hugetlb-to-folio_isolate_hugetlb +2 -2
@@ -153,7 +153,7 @@ bool hugetlb_reserve_pages(struct inode vm_flags_t vm_flags);long hugetlb_unreserve_pages (struct inode *inode,long start,long end,long freed); -bool isolate_hugetlb (struct folio *folio,struct list_head *list); +bool folio_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);
@@ -414,7 +414,7 @@ static inline pte_t *huge_pte_offset(strreturn NULL ; } -static inline bool isolate_hugetlb (struct folio *folio,struct list_head *list) +static inline bool folio_isolate_hugetlb (struct folio *folio,struct list_head *list) {return false; }
mm/gup.c renamed from mm/gup.c~mm-hugetlb-rename-isolate_hugetlb-to-folio_isolate_hugetlb +1 -1
@@ -2344,7 +2344,7 @@ static unsigned long collect_longterm_uncontinue ;if (folio_test_hugetlb (folio)) { -isolate_hugetlb (folio, movable_folio_list); +folio_isolate_hugetlb (folio, movable_folio_list);continue ; }
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-rename-isolate_hugetlb-to-folio_isolate_hugetlb +20 -3
@@ -2812,7 +2812,7 @@ retry:* Fail with -EBUSY if not possible. */ spin_unlock_irq (&hugetlb_lock); - isolated =isolate_hugetlb (old_folio, list); + isolated =folio_isolate_hugetlb (old_folio, list); ret = isolated ?0 : -EBUSY ;spin_lock_irq (&hugetlb_lock); goto free_new;
@@ -2897,7 +2897,7 @@ int isolate_or_dissolve_huge_page(structif (hstate_is_gigantic (h))return -ENOMEM ; -if (folio_ref_count (folio) &&isolate_hugetlb (folio, list)) +if (folio_ref_count (folio) &&folio_isolate_hugetlb (folio, list)) ret =0 ;else if (!folio_ref_count (folio)) ret =alloc_and_dissolve_hugetlb_folio (h, folio, list);
@@ -7421,7 +7421,24 @@ __weak unsigned long hugetlb_mask_last_p#endif /* CONFIG_ARCH_WANT_GENERAL_HUGETLB */ -bool isolate_hugetlb (struct folio *folio,struct list_head *list) +/** +* folio_isolate_hugetlb - try to isolate an allocated hugetlb folio +* @folio: the folio to isolate +* @list: the list to add the folio to on success +* +* Isolate an allocated (refcount > 0) hugetlb folio, marking it as +* isolated/non-migratable, and moving it from the active list to the +* given list. +* +* Isolation will fail if @folio is not an allocated hugetlb folio, or if +* it is already isolated/non-migratable. +* +* On success, an additional folio reference is taken that must be dropped +* using folio_putback_active_hugetlb() to undo the isolation. +* +* Return: True if isolation worked, otherwise False. +*/ +bool folio_isolate_hugetlb (struct folio *folio,struct list_head *list) {bool ret = true;
mm/mempolicy.c renamed from mm/mempolicy.c~mm-hugetlb-rename-isolate_hugetlb-to-folio_isolate_hugetlb +1 -1
@@ -647,7 +647,7 @@ static int queue_folios_hugetlb(pte_t *p*/ if ((flags &MPOL_MF_MOVE_ALL ) || (!folio_likely_mapped_shared (folio) && !hugetlb_pmd_shared (pte))) -if (!isolate_hugetlb (folio, qp->pagelist)) +if (!folio_isolate_hugetlb (folio, qp->pagelist)) qp->nr_failed++; unlock:spin_unlock (ptl);
mm/migrate.c renamed from mm/migrate.c~mm-hugetlb-rename-isolate_hugetlb-to-folio_isolate_hugetlb +3 -3
@@ -128,7 +128,7 @@ static void putback_movable_folio(struct* * This function shall be used whenever the isolated pageset has been * built from lru, balloon, hugetlbfs page. See isolate_migratepages_range() -* and isolate_hugetlb(). +* and folio_isolate_hugetlb(). */ void putback_movable_pages (struct list_head *l) {
@@ -169,7 +169,7 @@ bool isolate_folio_to_list(struct foliobool isolated, lru;if (folio_test_hugetlb (folio)) -return isolate_hugetlb (folio, list); +return folio_isolate_hugetlb (folio, list); lru = !__folio_test_movable (folio);if (lru)
@@ -2200,7 +2200,7 @@ static int __add_folio_for_migration(strreturn -EACCES ;if (folio_test_hugetlb (folio)) { -if (isolate_hugetlb (folio, pagelist)) +if (folio_isolate_hugetlb (folio, pagelist))return 1 ; }else if (folio_isolate_lru (folio)) {list_add_tail (&folio->lru, pagelist);
_
Patches currently in -mm which might be from [email protected] are