mm-stop-storing-migration_ops-in-page-mapping.patch removed from -mm tree
The quilt patch titled
Subject: mm: stop storing migration_ops in page->mapping
has been removed from the -mm tree. Its filename was
mm-stop-storing-migration_ops-in-page-mapping.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: stop storing migration_ops in page->mapping
Date: Fri, 4 Jul 2025 12:25:13 +0200
... instead, look them up statically based on the page type. Maybe in the future we want a registration interface? At least for now, it can be easily handled using the two page types that actually support page migration.
The remaining usage of page->mapping is to flag such pages as actually being movable (having movable_ops), which we will change next.
---
include/linux/balloon_compaction.h | 2 +- include/linux/migrate.h | 14 ++------------ include/linux/zsmalloc.h | 2 ++ mm/balloon_compaction.c | 1 - mm/compaction.c | 5 ++--- mm/migrate.c | 23 +++++++++++++++++++++++ mm/zpdesc.h | 5 ++--- mm/zsmalloc.c | 8 +++----- 8 files changed, 35 insertions(+), 25 deletions(-)
include/linux/balloon_compaction.h renamed from include/linux/balloon_compaction.h~mm-stop-storing-migration_ops-in-page-mapping +1 -1
@@ -92,7 +92,7 @@ static inline void balloon_page_insert(s struct page *page) {__SetPageOffline (page); -__SetPageMovable (page, &balloon_mops); +__SetPageMovable (page);set_page_private (page, (unsigned long )balloon);list_add (&page->lru, &balloon->pages); }
include/linux/migrate.h renamed from include/linux/migrate.h~mm-stop-storing-migration_ops-in-page-mapping +2 -12
@@ -104,23 +104,13 @@ static inline int migrate_huge_page_move#endif /* CONFIG_MIGRATION */ #ifdef CONFIG_COMPACTION -void __SetPageMovable (struct page *page,const struct movable_operations *ops); +void __SetPageMovable (struct page *page);#else -static inline void __SetPageMovable (struct page *page, -const struct movable_operations *ops) +static inline void __SetPageMovable (struct page *page) { }#endif -static inline -const struct movable_operations *page_movable_ops (struct page *page) -{ -VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (page), page); - -return (const struct movable_operations *) - ((unsigned long )page->mapping -PAGE_MAPPING_MOVABLE ); -} -#ifdef CONFIG_NUMA_BALANCING int migrate_misplaced_folio_prepare (struct folio *folio,struct vm_area_struct *vma,int node);
include/linux/zsmalloc.h renamed from include/linux/zsmalloc.h~mm-stop-storing-migration_ops-in-page-mapping +2 -0
@@ -46,4 +46,6 @@ void zs_obj_read_end(struct zs_pool *poovoid zs_obj_write (struct zs_pool *pool,unsigned long handle,void *handle_mem,size_t mem_len); +extern const struct movable_operations zsmalloc_mops; +#endif
mm/balloon_compaction.c renamed from mm/balloon_compaction.c~mm-stop-storing-migration_ops-in-page-mapping +0 -1
@@ -253,6 +253,5 @@ const struct movable_operations balloon_ .isolate_page = balloon_page_isolate, .putback_page = balloon_page_putback, }; -EXPORT_SYMBOL_GPL (balloon_mops);#endif /* CONFIG_BALLOON_COMPACTION */
mm/compaction.c renamed from mm/compaction.c~mm-stop-storing-migration_ops-in-page-mapping +2 -3
@@ -114,11 +114,10 @@ static unsigned long release_free_list(s }#ifdef CONFIG_COMPACTION -void __SetPageMovable (struct page *page,const struct movable_operations *mops) +void __SetPageMovable (struct page *page) {VM_BUG_ON_PAGE (!PageLocked (page), page); -VM_BUG_ON_PAGE ((unsigned long )mops &PAGE_MAPPING_MOVABLE , page); - page->mapping = (void *)((unsigned long )mops |PAGE_MAPPING_MOVABLE ); + page->mapping = (void *)(PAGE_MAPPING_MOVABLE ); }EXPORT_SYMBOL (__SetPageMovable);
mm/migrate.c renamed from mm/migrate.c~mm-stop-storing-migration_ops-in-page-mapping +23 -0
@@ -43,6 +43,8 @@#include <linux/sched/sysctl.h> #include <linux/memory-tiers.h> #include <linux/pagewalk.h> +#include <linux/balloon_compaction.h> +#include <linux/zsmalloc.h> #include <asm/tlbflush.h>
@@ -51,6 +53,27 @@#include "internal.h" #include "swap.h" +static const struct movable_operations *page_movable_ops (struct page *page) +{ +VM_WARN_ON_ONCE_PAGE (!page_has_movable_ops (page), page); + +/* +* If we enable page migration for a page of a certain type by marking +* it as movable, the page type must be sticky until the page gets freed +* back to the buddy. +*/ +#ifdef CONFIG_BALLOON_COMPACTION +if (PageOffline (page)) +/* Only balloon compaction sets PageOffline pages movable. */ +return &balloon_mops; +#endif /* CONFIG_BALLOON_COMPACTION */ +#if defined(CONFIG_ZSMALLOC ) && defined(CONFIG_COMPACTION ) +if (PageZsmalloc (page)) +return &zsmalloc_mops; +#endif /* defined(CONFIG_ZSMALLOC) && defined(CONFIG_COMPACTION) */ +return NULL ; +} +/** * isolate_movable_ops_page - isolate a movable_ops page for migration * @page: The page.
mm/zpdesc.h renamed from mm/zpdesc.h~mm-stop-storing-migration_ops-in-page-mapping +2 -3
@@ -152,10 +152,9 @@ static inline struct zpdesc *pfn_zpdesc(return page_zpdesc (pfn_to_page (pfn)); } -static inline void __zpdesc_set_movable (struct zpdesc *zpdesc, -const struct movable_operations *mops) +static inline void __zpdesc_set_movable (struct zpdesc *zpdesc) { -__SetPageMovable (zpdesc_page (zpdesc), mops); +__SetPageMovable (zpdesc_page (zpdesc)); }static inline void __zpdesc_set_zsmalloc (struct zpdesc *zpdesc)
mm/zsmalloc.c renamed from mm/zsmalloc.c~mm-stop-storing-migration_ops-in-page-mapping +3 -5
@@ -1685,8 +1685,6 @@ static void lock_zspage(struct zspage *z#ifdef CONFIG_COMPACTION -static const struct movable_operations zsmalloc_mops; -static void replace_sub_page (struct size_class *class,struct zspage *zspage,struct zpdesc *newzpdesc,struct zpdesc *oldzpdesc) {
@@ -1709,7 +1707,7 @@ static void replace_sub_page(struct sizeset_first_obj_offset (newzpdesc, first_obj_offset);if (unlikely (ZsHugePage (zspage))) newzpdesc->handle = oldzpdesc->handle; -__zpdesc_set_movable (newzpdesc, &zsmalloc_mops); +__zpdesc_set_movable (newzpdesc); }static bool zs_page_isolate (struct page *page,isolate_mode_t mode)
@@ -1819,7 +1817,7 @@ static void zs_page_putback(struct page { } -static const struct movable_operations zsmalloc_mops = { +const struct movable_operations zsmalloc_mops = { .isolate_page = zs_page_isolate, .migrate_page = zs_page_migrate, .putback_page = zs_page_putback,
@@ -1882,7 +1880,7 @@ static void SetZsPageMovable(struct zs_pdo {WARN_ON (!zpdesc_trylock (zpdesc)); -__zpdesc_set_movable (zpdesc, &zsmalloc_mops); +__zpdesc_set_movable (zpdesc);zpdesc_unlock (zpdesc); }while ((zpdesc =get_next_zpdesc (zpdesc)) !=NULL ); }
_
Patches currently in -mm which might be from [email protected] are
mm-convert-fpb_ignore_-into-fpb_respect_.patch mm-smaller-folio_pte_batch-improvements.patch mm-split-folio_pte_batch-into-folio_pte_batch-and-folio_pte_batch_flags.patch mm-remove-boolean-output-parameters-from-folio_pte_batch_ext.patch mm-memory-introduce-is_huge_zero_pfn-and-use-it-in-vm_normal_page_pmd.patch