Skip to content

Commit 053c8eb

Browse files
chenhuacaiakpm00
authored andcommitted
mm/migrate: fix NULL movable_ops if CONFIG_ZSMALLOC=m
After commit 84caf98 ("mm: stop storing migration_ops in page->mapping") we get such an error message if CONFIG_ZSMALLOC=m: WARNING: CPU: 3 PID: 42 at mm/migrate.c:142 isolate_movable_ops_page+0xa8/0x1c0 CPU: 3 UID: 0 PID: 42 Comm: kcompactd0 Not tainted 6.16.0-rc5+ #2133 PREEMPT pc 9000000000540bd8 ra 9000000000540b84 tp 9000000100420000 sp 9000000100423a60 a0 9000000100193a80 a1 000000000000000c a2 000000000000001b a3 ffffffffffffffff a4 ffffffffffffffff a5 0000000000000267 a6 0000000000000000 a7 9000000100423ae0 t0 00000000000000f1 t1 00000000000000f6 t2 0000000000000000 t3 0000000000000001 t4 ffffff00010eb834 t5 0000000000000040 t6 900000010c89d380 t7 90000000023fcc70 t8 0000000000000018 u0 0000000000000000 s9 ffffff00010eb800 s0 ffffff00010eb800 s1 000000000000000c s2 0000000000043ae0 s3 0000800000000000 s4 900000000219cc40 s5 0000000000000000 s6 ffffff00010eb800 s7 0000000000000001 s8 90000000025b4000 ra: 9000000000540b84 isolate_movable_ops_page+0x54/0x1c0 ERA: 9000000000540bd8 isolate_movable_ops_page+0xa8/0x1c0 CRMD: 000000b0 (PLV0 -IE -DA +PG DACF=CC DACM=CC -WE) PRMD: 00000004 (PPLV0 +PIE -PWE) EUEN: 00000000 (-FPE -SXE -ASXE -BTE) ECFG: 00071c1d (LIE=0,2-4,10-12 VS=7) ESTAT: 000c0000 [BRK] (IS= ECode=12 EsubCode=0) PRID: 0014c010 (Loongson-64bit, Loongson-3A5000) CPU: 3 UID: 0 PID: 42 Comm: kcompactd0 Not tainted 6.16.0-rc5+ #2133 PREEMPT Stack : 90000000021fd000 0000000000000000 9000000000247720 9000000100420000 90000001004236a0 90000001004236a8 0000000000000000 90000001004237e8 90000001004237e0 90000001004237e0 9000000100423550 0000000000000001 0000000000000001 90000001004236a8 725a84864a19e2d9 90000000023fcc58 9000000100420000 90000000024c6848 9000000002416848 0000000000000001 0000000000000000 000000000000000a 0000000007fe0000 ffffff00010eb800 0000000000000000 90000000021fd000 0000000000000000 900000000205cf30 000000000000008e 0000000000000009 ffffff00010eb800 0000000000000001 90000000025b4000 0000000000000000 900000000024773c 00007ffff103d748 00000000000000b0 0000000000000004 0000000000000000 0000000000071c1d ... Call Trace: [<900000000024773c>] show_stack+0x5c/0x190 [<90000000002415e0>] dump_stack_lvl+0x70/0x9c [<90000000004abe6c>] isolate_migratepages_block+0x3bc/0x16e0 [<90000000004af408>] compact_zone+0x558/0x1000 [<90000000004b0068>] compact_node+0xa8/0x1e0 [<90000000004b0aa4>] kcompactd+0x394/0x410 [<90000000002b3c98>] kthread+0x128/0x140 [<9000000001779148>] ret_from_kernel_thread+0x28/0xc0 [<9000000000245528>] ret_from_kernel_thread_asm+0x10/0x88 The reason is that defined(CONFIG_ZSMALLOC) evaluates to 1 only when CONFIG_ZSMALLOC=y, we should use IS_ENABLED(CONFIG_ZSMALLOC) instead. But when I use IS_ENABLED(CONFIG_ZSMALLOC), page_movable_ops() cannot access zsmalloc_mops because zsmalloc_mops is in a module. To solve this problem, we define a set_movable_ops() interface to register and unregister offline_movable_ops / zsmalloc_movable_ops in mm/migrate.c, and call them at mm/balloon_compaction.c & mm/zsmalloc.c. Since offline_movable_ops / zsmalloc_movable_ops are always accessible, all #ifdef / #endif are removed in page_movable_ops(). Link: https://lkml.kernel.org/r/20250817151759.2525174-1-chenhuacai@loongson.cn Fixes: 84caf98 ("mm: stop storing migration_ops in page->mapping") Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> Acked-by: Zi Yan <ziy@nvidia.com> Acked-by: David Hildenbrand <david@redhat.com> Cc: Huacai Chen <chenhuacai@kernel.org> Cc: Huacai Chen <chenhuacai@loongson.cn> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Sergey Senozhatsky <senozhatsky@chromium.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent b3dee90 commit 053c8eb

4 files changed

Lines changed: 51 additions & 8 deletions

File tree

include/linux/migrate.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ void migration_entry_wait_on_locked(swp_entry_t entry, spinlock_t *ptl)
7979
void folio_migrate_flags(struct folio *newfolio, struct folio *folio);
8080
int folio_migrate_mapping(struct address_space *mapping,
8181
struct folio *newfolio, struct folio *folio, int extra_count);
82+
int set_movable_ops(const struct movable_operations *ops, enum pagetype type);
8283

8384
#else
8485

@@ -100,6 +101,10 @@ static inline int migrate_huge_page_move_mapping(struct address_space *mapping,
100101
{
101102
return -ENOSYS;
102103
}
104+
static inline int set_movable_ops(const struct movable_operations *ops, enum pagetype type)
105+
{
106+
return -ENOSYS;
107+
}
103108

104109
#endif /* CONFIG_MIGRATION */
105110

mm/balloon_compaction.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,4 +254,10 @@ const struct movable_operations balloon_mops = {
254254
.putback_page = balloon_page_putback,
255255
};
256256

257+
static int __init balloon_init(void)
258+
{
259+
return set_movable_ops(&balloon_mops, PGTY_offline);
260+
}
261+
core_initcall(balloon_init);
262+
257263
#endif /* CONFIG_BALLOON_COMPACTION */

mm/migrate.c

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
#include <linux/sched/sysctl.h>
4444
#include <linux/memory-tiers.h>
4545
#include <linux/pagewalk.h>
46-
#include <linux/balloon_compaction.h>
47-
#include <linux/zsmalloc.h>
4846

4947
#include <asm/tlbflush.h>
5048

@@ -53,6 +51,33 @@
5351
#include "internal.h"
5452
#include "swap.h"
5553

54+
static const struct movable_operations *offline_movable_ops;
55+
static const struct movable_operations *zsmalloc_movable_ops;
56+
57+
int set_movable_ops(const struct movable_operations *ops, enum pagetype type)
58+
{
59+
/*
60+
* We only allow for selected types and don't handle concurrent
61+
* registration attempts yet.
62+
*/
63+
switch (type) {
64+
case PGTY_offline:
65+
if (offline_movable_ops && ops)
66+
return -EBUSY;
67+
offline_movable_ops = ops;
68+
break;
69+
case PGTY_zsmalloc:
70+
if (zsmalloc_movable_ops && ops)
71+
return -EBUSY;
72+
zsmalloc_movable_ops = ops;
73+
break;
74+
default:
75+
return -EINVAL;
76+
}
77+
return 0;
78+
}
79+
EXPORT_SYMBOL_GPL(set_movable_ops);
80+
5681
static const struct movable_operations *page_movable_ops(struct page *page)
5782
{
5883
VM_WARN_ON_ONCE_PAGE(!page_has_movable_ops(page), page);
@@ -62,15 +87,12 @@ static const struct movable_operations *page_movable_ops(struct page *page)
6287
* it as movable, the page type must be sticky until the page gets freed
6388
* back to the buddy.
6489
*/
65-
#ifdef CONFIG_BALLOON_COMPACTION
6690
if (PageOffline(page))
6791
/* Only balloon compaction sets PageOffline pages movable. */
68-
return &balloon_mops;
69-
#endif /* CONFIG_BALLOON_COMPACTION */
70-
#if defined(CONFIG_ZSMALLOC) && defined(CONFIG_COMPACTION)
92+
return offline_movable_ops;
7193
if (PageZsmalloc(page))
72-
return &zsmalloc_mops;
73-
#endif /* defined(CONFIG_ZSMALLOC) && defined(CONFIG_COMPACTION) */
94+
return zsmalloc_movable_ops;
95+
7496
return NULL;
7597
}
7698

mm/zsmalloc.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2246,8 +2246,15 @@ EXPORT_SYMBOL_GPL(zs_destroy_pool);
22462246

22472247
static int __init zs_init(void)
22482248
{
2249+
int rc __maybe_unused;
2250+
22492251
#ifdef CONFIG_ZPOOL
22502252
zpool_register_driver(&zs_zpool_driver);
2253+
#endif
2254+
#ifdef CONFIG_COMPACTION
2255+
rc = set_movable_ops(&zsmalloc_mops, PGTY_zsmalloc);
2256+
if (rc)
2257+
return rc;
22512258
#endif
22522259
zs_stat_init();
22532260
return 0;
@@ -2257,6 +2264,9 @@ static void __exit zs_exit(void)
22572264
{
22582265
#ifdef CONFIG_ZPOOL
22592266
zpool_unregister_driver(&zs_zpool_driver);
2267+
#endif
2268+
#ifdef CONFIG_COMPACTION
2269+
set_movable_ops(NULL, PGTY_zsmalloc);
22602270
#endif
22612271
zs_stat_exit();
22622272
}

0 commit comments

Comments
 (0)