mm-rename-config_balloon_compaction-to-config_balloon_migration.patch removed from -mm tree
The quilt patch titled
Subject: mm: rename CONFIG_BALLOON_COMPACTION to CONFIG_BALLOON_MIGRATION
has been removed from the -mm tree. Its filename was
mm-rename-config_balloon_compaction-to-config_balloon_migration.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 (Red Hat)" <[email protected]>
Subject: mm: rename CONFIG_BALLOON_COMPACTION to CONFIG_BALLOON_MIGRATION
Date: Tue, 20 Jan 2026 00:01:30 +0100
While compaction depends on migration, the other direction is not the case. So let's make it clearer that this is all about migration of balloon pages.
Adjust all comments/docs in the core to talk about "migration" instead of "compaction".
While at it add some "/* CONFIG_BALLOON_MIGRATION */".
---
Documentation/admin-guide/mm/memory-hotplug.rst | 8 ++++---- arch/powerpc/platforms/pseries/cmm.c | 8 ++++---- drivers/misc/vmw_balloon.c | 8 ++++---- drivers/virtio/virtio_balloon.c | 6 +++--- include/linux/balloon.h | 12 ++++++------ include/linux/vm_event_item.h | 4 ++-- mm/Kconfig | 4 ++-- mm/balloon.c | 10 +++++----- mm/memory_hotplug.c | 4 ++-- mm/migrate.c | 2 +- mm/vmstat.c | 4 ++-- 11 files changed, 35 insertions(+), 35 deletions(-)
arch/powerpc/platforms/pseries/cmm.c renamed from arch/powerpc/platforms/pseries/cmm.c~mm-rename-config_balloon_compaction-to-config_balloon_migration +4 -4
@@ -494,7 +494,7 @@ static struct notifier_block cmm_mem_nb .priority = CMM_MEM_HOTPLUG_PRI }; -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION static int cmm_migratepage (struct balloon_dev_info *b_dev_info,struct page *newpage,struct page *page,enum migrate_mode mode)
@@ -520,10 +520,10 @@ static int cmm_migratepage(struct ballooplpar_page_set_active (page); return 0; } -#else /* CONFIG_BALLOON_COMPACTION */ +#else /* CONFIG_BALLOON_MIGRATION */ int cmm_migratepage (struct balloon_dev_info *b_dev_info,struct page *newpage,struct page *page,enum migrate_mode mode); -#endif /* CONFIG_BALLOON_COMPACTION */ +#endif /* CONFIG_BALLOON_MIGRATION */ /** * cmm_init - Module initialization
@@ -540,7 +540,7 @@ static int cmm_init(void)balloon_devinfo_init (&b_dev_info); b_dev_info.adjust_managed_page_count = true; -if (IS_ENABLED (CONFIG_BALLOON_COMPACTION )) +if (IS_ENABLED (CONFIG_BALLOON_MIGRATION )) b_dev_info.migratepage = cmm_migratepage; rc =register_oom_notifier (&cmm_oom_nb);
Documentation/admin-guide/mm/memory-hotplug.rst renamed from Documentation/admin-guide/mm/memory-hotplug.rst~mm-rename-config_balloon_compaction-to-config_balloon_migration +4 -4
@@ -603,11 +603,11 @@ ZONE_MOVABLE, especially when fine-tunin memory for metadata and page tables in the direct map; having a lot of offline memory blocks is not a typical case, though. -- Memory ballooning without balloon compaction is incompatible with - ZONE_MOVABLE. Only some implementations, such as virtio-balloon and - pseries CMM, fully support balloon compaction. +- Memory ballooning without support for balloon memory migration is incompatible + with ZONE_MOVABLE. Only some implementations, such as virtio-balloon and + pseries CMM, fully support balloon memory migration. - Further, the CONFIG_BALLOON_COMPACTION kernel configuration option might be + Further, the CONFIG_BALLOON_MIGRATION kernel configuration option might be disabled. In that case, balloon inflation will only perform unmovable allocations and silently create a zone imbalance, usually triggered by inflation requests from the hypervisor.
drivers/misc/vmw_balloon.c renamed from drivers/misc/vmw_balloon.c~mm-rename-config_balloon_compaction-to-config_balloon_migration +4 -4
@@ -1719,7 +1719,7 @@ static inline void vmballoon_debugfs_exi#endif /* CONFIG_DEBUG_FS */ -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION /** * vmballoon_migratepage() - migrates a balloon page. * @b_dev_info: balloon device information descriptor.
@@ -1803,11 +1803,11 @@ out_unlock:up_read (&b->conf_sem); return ret; } -#else /* CONFIG_BALLOON_COMPACTION */ +#else /* CONFIG_BALLOON_MIGRATION */ int vmballoon_migratepage (struct balloon_dev_info *b_dev_info,struct page *newpage,struct page *page,enum migrate_mode mode); -#endif /* CONFIG_BALLOON_COMPACTION */ +#endif /* CONFIG_BALLOON_MIGRATION */ static int __init vmballoon_init (void ) {
@@ -1827,7 +1827,7 @@ static int __init vmballoon_init(void)return error;balloon_devinfo_init (&balloon.b_dev_info); -if (IS_ENABLED (CONFIG_BALLOON_COMPACTION )) +if (IS_ENABLED (CONFIG_BALLOON_MIGRATION )) balloon.b_dev_info.migratepage = vmballoon_migratepage;INIT_LIST_HEAD (&balloon.huge_pages);
drivers/virtio/virtio_balloon.c renamed from drivers/virtio/virtio_balloon.c~mm-rename-config_balloon_compaction-to-config_balloon_migration +3 -3
@@ -802,7 +802,7 @@ static void report_free_page_func(struct } } -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION /* * virtballoon_migratepage - perform the balloon page migration on behalf of * a compaction thread. (called under page lock)
@@ -851,7 +851,7 @@ static int virtballoon_migratepage(strucmutex_unlock (&vb->balloon_lock); return 0; } -#endif /* CONFIG_BALLOON_COMPACTION */ +#endif /* CONFIG_BALLOON_MIGRATION */ static unsigned long shrink_free_pages (struct virtio_balloon *vb,unsigned long pages_to_free)
@@ -948,7 +948,7 @@ static int virtballoon_probe(struct virtif (!virtio_has_feature (vb->vdev,VIRTIO_BALLOON_F_DEFLATE_ON_OOM )) vb->vb_dev_info.adjust_managed_page_count = true; -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION vb->vb_dev_info.migratepage = virtballoon_migratepage;#endif if (virtio_has_feature (vdev,VIRTIO_BALLOON_F_FREE_PAGE_HINT )) {
include/linux/balloon.h renamed from include/linux/balloon.h~mm-rename-config_balloon_compaction-to-config_balloon_migration +6 -6
@@ -22,9 +22,9 @@* * As the page isolation scanning step a compaction thread does is a lockless * procedure (from a page standpoint), it might bring some racy situations while -* performing balloon page compaction. In order to sort out these racy scenarios -* and safely perform balloon's page compaction and migration we must, always, -* ensure following these simple rules: +* performing balloon page migration. In order to sort out these racy scenarios +* and safely perform balloon's page migration we must, always, ensure following +* these simple rules: * * i. Inflation/deflation must set/clear page->private under the * balloon_pages_lock
@@ -45,10 +45,10 @@/* * Balloon device information descriptor. -* This struct is used to allow the common balloon compaction interface +* This struct is used to allow the common balloon page migration interface * procedures to find the proper balloon device holding memory pages they'll -* have to cope for page compaction / migration, as well as it serves the -* balloon driver as a page book-keeper for its registered balloon devices. +* have to cope for page migration, as well as it serves the balloon driver as +* a page book-keeper for its registered balloon devices. */ struct balloon_dev_info {unsigned long isolated_pages;/* # of isolated pages for migration */
include/linux/vm_event_item.h renamed from include/linux/vm_event_item.h~mm-rename-config_balloon_compaction-to-config_balloon_migration +2 -2
@@ -125,9 +125,9 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS#ifdef CONFIG_MEMORY_BALLOON BALLOON_INFLATE, BALLOON_DEFLATE, -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION BALLOON_MIGRATE, -#endif +#endif /* CONFIG_BALLOON_MIGRATION */ #endif #ifdef CONFIG_DEBUG_TLBFLUSH NR_TLB_REMOTE_FLUSH, /* cpu tried to flush others' tlbs */
mm/balloon.c renamed from mm/balloon.c~mm-rename-config_balloon_compaction-to-config_balloon_migration +5 -5
@@ -29,7 +29,7 @@ static void balloon_page_insert(struct b {lockdep_assert_held (&balloon_pages_lock);__SetPageOffline (page); -if (IS_ENABLED (CONFIG_BALLOON_COMPACTION )) { +if (IS_ENABLED (CONFIG_BALLOON_MIGRATION )) {SetPageMovableOps (page);set_page_private (page, (unsigned long )balloon); }
@@ -46,7 +46,7 @@ static void balloon_page_insert(struct bstatic void balloon_page_finalize (struct page *page) {lockdep_assert_held (&balloon_pages_lock); -if (IS_ENABLED (CONFIG_BALLOON_COMPACTION )) +if (IS_ENABLED (CONFIG_BALLOON_MIGRATION ))set_page_private (page,0 );/* PageOffline is sticky until the page is freed to the buddy. */ }
@@ -148,7 +148,7 @@ struct page *balloon_page_alloc(void) {gfp_t gfp_flags = __GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN; -if (IS_ENABLED (CONFIG_BALLOON_COMPACTION )) +if (IS_ENABLED (CONFIG_BALLOON_MIGRATION )) gfp_flags |=GFP_HIGHUSER_MOVABLE ;else gfp_flags |=GFP_HIGHUSER ;
@@ -227,7 +227,7 @@ struct page *balloon_page_dequeue(struct }EXPORT_SYMBOL_GPL (balloon_page_dequeue); -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION static struct balloon_dev_info *balloon_page_device (struct page *page) {return (struct balloon_dev_info *)page_private (page);
@@ -341,4 +341,4 @@ static int __init balloon_init(void) }core_initcall (balloon_init); -#endif /* CONFIG_BALLOON_COMPACTION */ +#endif /* CONFIG_BALLOON_MIGRATION */
mm/Kconfig renamed from mm/Kconfig~mm-rename-config_balloon_compaction-to-config_balloon_migration +2 -2
@@ -597,8 +597,8 @@ config MEMORY_BALLOON bool # -# support for memory balloon compaction -config BALLOON_COMPACTION +# support for memory balloon page migration +config BALLOON_MIGRATION bool "Allow for balloon memory migration" default y depends on MIGRATION && MEMORY_BALLOON
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~mm-rename-config_balloon_compaction-to-config_balloon_migration +2 -2
@@ -946,8 +946,8 @@ static struct zone *default_kernel_zone_* We rely on "present pages" instead of "managed pages", as the latter is * highly unreliable and dynamic in virtualized environments, and does not * consider boot time allocations. For example, memory ballooning adjusts the -* managed pages when inflating/deflating the balloon, and balloon compaction -* can even migrate inflated pages between zones. +* managed pages when inflating/deflating the balloon, and balloon page +* migration can even migrate inflated pages between zones. * * Using "present pages" is better but some things to keep in mind are: *
mm/migrate.c renamed from mm/migrate.c~mm-rename-config_balloon_compaction-to-config_balloon_migration +1 -1
@@ -88,7 +88,7 @@ static const struct movable_operations ** back to the buddy. */ if (PageOffline (page)) -/* Only balloon compaction sets PageOffline pages movable. */ +/* Only balloon page migration sets PageOffline pages movable. */ return offline_movable_ops;if (PageZsmalloc (page))return zsmalloc_movable_ops;
mm/vmstat.c renamed from mm/vmstat.c~mm-rename-config_balloon_compaction-to-config_balloon_migration +2 -2
@@ -1422,9 +1422,9 @@ const char * const vmstat_text[] = { #ifdef CONFIG_MEMORY_BALLOON [I(BALLOON_INFLATE)] = "balloon_inflate", [I (BALLOON_DEFLATE )] ="balloon_deflate" , -#ifdef CONFIG_BALLOON_COMPACTION +#ifdef CONFIG_BALLOON_MIGRATION [I (BALLOON_MIGRATE )] ="balloon_migrate" , -#endif +#endif /* CONFIG_BALLOON_MIGRATION */ #endif /* CONFIG_MEMORY_BALLOON */ #ifdef CONFIG_DEBUG_TLBFLUSH [I(NR_TLB_REMOTE_FLUSH)] = "nr_tlb_remote_flush",
_
Patches currently in -mm which might be from [email protected] are
mm-move-pte-table-reclaim-code-to-memoryc.patch mm-memory-handle-non-split-locks-correctly-in-zap_empty_pte_table.patch