mm-hugetlb-convert-putback_active_hugepage-to-take-in-a-folio.patch removed from -mm tree
The quilt patch titled
Subject: mm/hugetlb: convert putback_active_hugepage to take in a folio
has been removed from the -mm tree. Its filename was
mm-hugetlb-convert-putback_active_hugepage-to-take-in-a-folio.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: Sidhartha Kumar <[email protected]>
Subject: mm/hugetlb: convert putback_active_hugepage to take in a folio
Date: Wed, 25 Jan 2023 09:05:32 -0800
Convert putback_active_hugepage() to folio_putback_active_hugetlb(), this removes one user of the Huge Page macros which take in a page. The callers in migrate.c are also cleaned up by being able to directly use the src and dst folio variables.
---
include/linux/hugetlb.h renamed from include/linux/hugetlb.h~mm-hugetlb-convert-putback_active_hugepage-to-take-in-a-folio +2 -2
@@ -175,7 +175,7 @@ int isolate_hugetlb(struct folio *folio,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); -void putback_active_hugepage (struct page *page); +void folio_putback_active_hugetlb (struct folio *folio);void move_hugetlb_state (struct folio *old_folio,struct folio *new_folio,int reason);void free_huge_page (struct page *page);void hugetlb_fix_reserve_counts (struct inode *inode);
@@ -429,7 +429,7 @@ static inline int get_huge_page_for_hwporeturn 0 ; } -static inline void putback_active_hugepage (struct page *page) +static inline void folio_putback_active_hugetlb (struct folio *folio) { }
mm/hugetlb.c renamed from mm/hugetlb.c~mm-hugetlb-convert-putback_active_hugepage-to-take-in-a-folio +4 -4
@@ -7300,13 +7300,13 @@ int get_huge_page_for_hwpoison(unsignedreturn ret; } -void putback_active_hugepage (struct page *page) +void folio_putback_active_hugetlb (struct folio *folio) {spin_lock_irq (&hugetlb_lock); -SetHPageMigratable (page); -list_move_tail (&page->lru, &(page_hstate (page))->hugepage_activelist); +folio_set_hugetlb_migratable (folio); +list_move_tail (&folio->lru, &(folio_hstate (folio))->hugepage_activelist);spin_unlock_irq (&hugetlb_lock); -put_page (page); +folio_put (folio); }void move_hugetlb_state (struct folio *old_folio,struct folio *new_folio,int reason)
mm/migrate.c renamed from mm/migrate.c~mm-hugetlb-convert-putback_active_hugepage-to-take-in-a-folio +4 -4
@@ -151,7 +151,7 @@ void putback_movable_pages(struct list_hlist_for_each_entry_safe (page, page2, l, lru) {if (unlikely (PageHuge (page))) { -putback_active_hugepage (page); +folio_putback_active_hugetlb (page_folio (page));continue ; }list_del (&page->lru);
@@ -1298,7 +1298,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. */ -putback_active_hugepage (hpage); +folio_putback_active_hugetlb (src);return MIGRATEPAGE_SUCCESS ; }
@@ -1383,7 +1383,7 @@ out_unlock:folio_unlock (src); out:if (rc ==MIGRATEPAGE_SUCCESS ) -putback_active_hugepage (hpage); +folio_putback_active_hugetlb (src);else if (rc != -EAGAIN )list_move_tail (&src->lru, ret);
@@ -1395,7 +1395,7 @@ out:if (put_new_page)put_new_page (new_hpage, private);else -putback_active_hugepage (new_hpage); +folio_putback_active_hugetlb (dst);return rc; }
_
Patches currently in -mm which might be from [email protected] are