mm-hugetlb-rename-folio_putback_active_hugetlb-to-folio_putback_hugetlb.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: rename folio_putback_active_hugetlb() to folio_putback_hugetlb()
has been removed from the -mm tree. Its filename was
mm-hugetlb-rename-folio_putback_active_hugetlb-to-folio_putback_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 folio_putback_active_hugetlb() to folio_putback_hugetlb()
Date: Mon, 13 Jan 2025 14:16:09 +0100
Now that folio_putback_hugetlb() is only called on folios that were previously isolated through folio_isolate_hugetlb(), let's rename it to match folio_putback_lru().
Add some kernel doc to clarify how this function is supposed to be used.
---
include/linux/hugetlb.h | 4 ++-- mm/hugetlb.c | 15 +++++++++++++-- mm/migrate.c | 6 +++--- 3 files changed, 18 insertions(+), 7 deletions(-)
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-rename-folio_putback_active_hugetlb-to-folio_putback_hugetlb +2 -2
@@ -157,7 +157,7 @@ bool folio_isolate_hugetlb(struct folioint 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); -void folio_putback_active_hugetlb (struct folio *folio); +void folio_putback_hugetlb (struct folio *folio);void move_hugetlb_state (struct folio *old_folio,struct folio *new_folio,int reason);void hugetlb_fix_reserve_counts (struct inode *inode);extern struct mutex *hugetlb_fault_mutex_table;
@@ -430,7 +430,7 @@ static inline int get_huge_page_for_hwporeturn 0 ; } -static inline void folio_putback_active_hugetlb (struct folio *folio) +static inline void folio_putback_hugetlb (struct folio *folio) { }
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-rename-folio_putback_active_hugetlb-to-folio_putback_hugetlb +13 -2
@@ -7434,7 +7434,7 @@ __weak unsigned long hugetlb_mask_last_p* 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. +* using folio_putback_hugetlb() to undo the isolation. * * Return: True if isolation worked, otherwise False. */
@@ -7486,7 +7486,18 @@ int get_huge_page_for_hwpoison(unsignedreturn ret; } -void folio_putback_active_hugetlb (struct folio *folio) +/** +* folio_putback_hugetlb - unisolate a hugetlb folio +* @folio: the isolated hugetlb folio +* +* Putback/un-isolate the hugetlb folio that was previous isolated using +* folio_isolate_hugetlb(): marking it non-isolated/migratable and putting it +* back onto the active list. +* +* Will drop the additional folio reference obtained through +* folio_isolate_hugetlb(). +*/ +void folio_putback_hugetlb (struct folio *folio) {spin_lock_irq (&hugetlb_lock);folio_set_hugetlb_migratable (folio);
mm/migrate.c renamed from mm/migrate.c~mm-hugetlb-rename-folio_putback_active_hugetlb-to-folio_putback_hugetlb +3 -3
@@ -137,7 +137,7 @@ void putback_movable_pages(struct list_hlist_for_each_entry_safe (folio, folio2, l, lru) {if (unlikely (folio_test_hugetlb (folio))) { -folio_putback_active_hugetlb (folio); +folio_putback_hugetlb (folio);continue ; }list_del (&folio->lru);
@@ -1451,7 +1451,7 @@ static int unmap_and_move_huge_page(new_if (folio_ref_count (src) ==1 ) {/* page was freed from under us. So we are done. */ -folio_putback_active_hugetlb (src); +folio_putback_hugetlb (src);return MIGRATEPAGE_SUCCESS ; }
@@ -1534,7 +1534,7 @@ out_unlock:folio_unlock (src); out:if (rc ==MIGRATEPAGE_SUCCESS ) -folio_putback_active_hugetlb (src); +folio_putback_hugetlb (src);else if (rc != -EAGAIN )list_move_tail (&src->lru, ret);
_
Patches currently in -mm which might be from [email protected] are