mm-restore-per-memcg-proactive-reclaim-with-config_numa.patch removed from -mm tree
The quilt patch titled
Subject: mm: restore per-memcg proactive reclaim with !CONFIG_NUMA
has been removed from the -mm tree. Its filename was
mm-restore-per-memcg-proactive-reclaim-with-config_numa.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Yosry Ahmed <[email protected]>
Subject: mm: restore per-memcg proactive reclaim with !CONFIG_NUMA
Date: Fri, 16 Jan 2026 20:52:47 +0000
Commit 2b7226af730c ("mm/memcg: make memory.reclaim interface generic") moved proactive reclaim logic from memory.reclaim handler to a generic user_proactive_reclaim() helper to be used for per-node proactive reclaim.
However, user_proactive_reclaim() was only defined under CONFIG_NUMA, with a stub always returning 0 otherwise. This broke memory.reclaim on !CONFIG_NUMA configs, causing it to report success without actually attempting reclaim.
Move the definition of user_proactive_reclaim() outside CONFIG_NUMA, and instead define a stub for __node_reclaim() in the !CONFIG_NUMA case. __node_reclaim() is only called from user_proactive_reclaim() when a write is made to sys/devices/system/node/nodeX/reclaim, which is only defined with CONFIG_NUMA.
---
mm/internal.h | 8 -------- mm/vmscan.c | 13 +++++++++++-- 2 files changed, 11 insertions(+), 10 deletions(-)
mm/internal.h renamed from mm/internal.h~mm-restore-per-memcg-proactive-reclaim-with-config_numa +0 -8
@@ -538,16 +538,8 @@ extern unsigned long highest_memmap_pfn;bool folio_isolate_lru (struct folio *folio);void folio_putback_lru (struct folio *folio);extern void reclaim_throttle (pg_data_t *pgdat,enum vmscan_throttle_state reason); -#ifdef CONFIG_NUMA int user_proactive_reclaim (char *buf,struct mem_cgroup *memcg,pg_data_t *pgdat); -#else -static inline int user_proactive_reclaim (char *buf, -struct mem_cgroup *memcg,pg_data_t *pgdat) -{ -return 0 ; -} -#endif /* * in mm/rmap.c:
mm/vmscan.c renamed from mm/vmscan.c~mm-restore-per-memcg-proactive-reclaim-with-config_numa +11 -2
@@ -7707,6 +7707,17 @@ int node_reclaim(struct pglist_data *pgdreturn ret; } +#else + +static unsigned long __node_reclaim (struct pglist_data *pgdat,gfp_t gfp_mask, +unsigned long nr_pages, +struct scan_control *sc) +{ +return 0 ; +} + +#endif +enum {MEMORY_RECLAIM_SWAPPINESS =0 ,MEMORY_RECLAIM_SWAPPINESS_MAX ,
@@ -7814,8 +7825,6 @@ int user_proactive_reclaim(char *buf,return 0 ; } -#endif -/** * check_move_unevictable_folios - Move evictable folios to appropriate zone * lru list
_
Patches currently in -mm which might be from [email protected] are
zsmalloc-simplify-read-begin-end-logic.patch