Skip to contentSkip to conversation

mm-page_owner-convert-set_page_owner_migrate_reason-to-folios.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 20, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/page_owner: convert set_page_owner_migrate_reason() to folios
has been removed from the -mm tree. Its filename was
mm-page_owner-convert-set_page_owner_migrate_reason-to-folios.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/page_owner: convert set_page_owner_migrate_reason() to folios
Date: Fri, 11 Jul 2025 10:59:10 -0400

Both callers of set_page_owner_migrate_reason() use folios. Convert the function to take a folio directly and move the &folio->page conversion inside __set_page_owner_migrate_reason().

---

 include/linux/page_owner.h |    8 ++++----
 mm/hugetlb.c               |    2 +-
 mm/migrate.c               |    2 +-
 mm/page_owner.c            |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
include/linux/page_owner.h renamed from include/linux/page_owner.h~mm-page_owner-convert-set_page_owner_migrate_reason-to-folios +4 -4
@@ -14,7 +14,7 @@ extern void __set_page_owner(struct page
 extern void __split_page_owner(struct page *page, int old_order,
 			int new_order);
 extern void __folio_copy_owner(struct folio *newfolio, struct folio *old);
-extern void __set_page_owner_migrate_reason(struct page *page, int reason);
+extern void __folio_set_owner_migrate_reason(struct folio *folio, int reason);
 extern void __dump_page_owner(const struct page *page);
 extern void pagetypeinfo_showmixedcount_print(struct seq_file *m,
 					pg_data_t *pgdat, struct zone *zone);
@@ -43,10 +43,10 @@ static inline void folio_copy_owner(stru
 	if (static_branch_unlikely(&page_owner_inited))
 		__folio_copy_owner(newfolio, old);
 }
-static inline void set_page_owner_migrate_reason(struct page *page, int reason)
+static inline void folio_set_owner_migrate_reason(struct folio *folio, int reason)
 {
 	if (static_branch_unlikely(&page_owner_inited))
-		__set_page_owner_migrate_reason(page, reason);
+		__folio_set_owner_migrate_reason(folio, reason);
 }
 static inline void dump_page_owner(const struct page *page)
 {
@@ -68,7 +68,7 @@ static inline void split_page_owner(stru
 static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio)
 {
 }
-static inline void set_page_owner_migrate_reason(struct page *page, int reason)
+static inline void folio_set_owner_migrate_reason(struct folio *folio, int reason)
 {
 }
 static inline void dump_page_owner(const struct page *page)
mm/hugetlb.c renamed from mm/hugetlb.c~mm-page_owner-convert-set_page_owner_migrate_reason-to-folios +1 -1
@@ -7835,7 +7835,7 @@ void move_hugetlb_state(struct folio *ol
 	struct hstate *h = folio_hstate(old_folio);
 
 	hugetlb_cgroup_migrate(old_folio, new_folio);
-	set_page_owner_migrate_reason(&new_folio->page, reason);
+	folio_set_owner_migrate_reason(new_folio, reason);
 
 	/*
 	 * transfer temporary state of the new hugetlb folio. This is
mm/migrate.c renamed from mm/migrate.c~mm-page_owner-convert-set_page_owner_migrate_reason-to-folios +1 -1
@@ -1367,7 +1367,7 @@ static int migrate_folio_move(free_folio
 
 out_unlock_both:
 	folio_unlock(dst);
-	set_page_owner_migrate_reason(&dst->page, reason);
+	folio_set_owner_migrate_reason(dst, reason);
 	/*
 	 * If migration is successful, decrease refcount of dst,
 	 * which will not free the page because new page owner increased
mm/page_owner.c renamed from mm/page_owner.c~mm-page_owner-convert-set_page_owner_migrate_reason-to-folios +2 -2
@@ -333,9 +333,9 @@ noinline void __set_page_owner(struct pa
 	inc_stack_record_count(handle, gfp_mask, 1 << order);
 }
 
-void __set_page_owner_migrate_reason(struct page *page, int reason)
+void __folio_set_owner_migrate_reason(struct folio *folio, int reason)
 {
-	struct page_ext *page_ext = page_ext_get(page);
+	struct page_ext *page_ext = page_ext_get(&folio->page);
 	struct page_owner *page_owner;
 
 	if (unlikely(!page_ext))

_

Patches currently in -mm which might be from [email protected] are