memcg-remove-v1-soft-limit-reclaim.patch removed from -mm tree
The quilt patch titled
Subject: memcg: remove v1 soft limit reclaim
has been removed from the -mm tree. Its filename was
memcg-remove-v1-soft-limit-reclaim.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: Shakeel Butt <[email protected]>
Subject: memcg: remove v1 soft limit reclaim
Date: Wed, 2 Sep 2026 10:43:04 -0700
Patch series "memcg: remove the v1 soft limit", v2.
The v1 soft limit was deprecated in v6.12 by commit 569c4f62d84a ("memcg:
initiate deprecation of v1 soft limit") and nobody has reported depending on it in the ~21 months since. memory.low and memory.min in v2 have covered the same ground for far longer.
The knob has since been made inert by "memcg: make the v1 soft limit knob inert", already queued in mm-hotfixes as a backportable fix for a syzbot report [1]. Nothing can enter the soft limit rbtree anymore, so this series just deletes the machinery that is now dead: the reclaim pass in kswapd and direct reclaim, mem_cgroup_shrink_node() and its tracepoints, the per-node rbtree, lru_gen_soft_reclaim() and the MEMCG_LRU_HEAD op, the per-node tree fields, mem_cgroup->soft_limit, and finally the v1 event ratelimiting which is now down to a single target.
memory.soft_limit_in_bytes itself is untouched: writes stay ignored and reads keep returning the maximum value.
This patch (of 8):
Nothing can put a cgroup on the soft limit rbtree anymore, so the tree is always empty and both callers of memcg1_soft_limit_reclaim() are guaranteed no-ops. Remove the reclaim pass from direct reclaim and from kswapd, along with its implementation.
In shrink_zones() this leaves the global reclaim branch with a last_pgdat check that is now redundant with the identical check right below it, so drop it and move the explaining comment down to the check that remains. That check could only ever fire once last_pgdat was set, which implies first_pgdat had already been assigned, so skipping it does not change which node consider_reclaim_throttle() gets.
---
include/linux/memcontrol.h | 12 -- mm/memcontrol-v1.c | 175 ----------------------------------- mm/vmscan.c | 39 +------ 3 files changed, 6 insertions(+), 220 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~memcg-remove-v1-soft-limit-reclaim +0 -12
@@ -1924,10 +1924,6 @@ static inline bool mem_cgroup_zswap_writ/* Cgroup v1-related declarations */ #ifdef CONFIG_MEMCG_V1 -unsigned long memcg1_soft_limit_reclaim (pg_data_t *pgdat,int order, -gfp_t gfp_mask, -unsigned long *total_scanned); -bool mem_cgroup_oom_synchronize (bool wait);static inline bool task_in_memcg_oom (struct task_struct *p)
@@ -1948,14 +1944,6 @@ static inline void mem_cgroup_exit_user_ }#else /* CONFIG_MEMCG_V1 */ -static inline -unsigned long memcg1_soft_limit_reclaim (pg_data_t *pgdat,int order, -gfp_t gfp_mask, -unsigned long *total_scanned) -{ -return 0 ; -} -static inline bool task_in_memcg_oom (struct task_struct *p) {return false;
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~memcg-remove-v1-soft-limit-reclaim +0 -175
187 lines not on this page · raw message
mm/vmscan.c renamed from mm/vmscan.c~memcg-remove-v1-soft-limit-reclaim +6 -33
@@ -6439,8 +6439,6 @@ static void shrink_zones(struct zonelist {struct zoneref *z;struct zone *zone; -unsigned long nr_soft_reclaimed; -unsigned long nr_soft_scanned;gfp_t orig_mask;pg_data_t *last_pgdat =NULL ;pg_data_t *first_pgdat =NULL ;
@@ -6482,35 +6480,17 @@ static void shrink_zones(struct zonelist sc->compaction_ready = true;continue ; } - -/* -* Shrink each node in the zonelist once. If the -* zonelist is ordered by zone (not the default) then a -* node may be shrunk multiple times but in that case -* the user prefers lower zones being preserved. -*/ -if (zone->zone_pgdat == last_pgdat) -continue ; - -/* -* This steals pages from memory cgroups over softlimit -* and returns the number of reclaimed pages and -* scanned pages. This works for global memory pressure -* and balancing, not for a memcg's limit. -*/ - nr_soft_scanned =0 ; - nr_soft_reclaimed =memcg1_soft_limit_reclaim (zone->zone_pgdat, - sc->order, sc->gfp_mask, - &nr_soft_scanned); - sc->nr_reclaimed += nr_soft_reclaimed; - sc->nr_scanned += nr_soft_scanned; -/* need some check for avoid more shrink_zone() */ }if (!first_pgdat) first_pgdat = zone->zone_pgdat; -/* See comment about same check for global reclaim above */ +/* +* Shrink each node in the zonelist once. If the zonelist is +* ordered by zone (not the default) then a node may be shrunk +* multiple times but in that case the user prefers lower zones +* being preserved. +*/ if (zone->zone_pgdat == last_pgdat)continue ; last_pgdat = zone->zone_pgdat;
@@ -7171,8 +7151,6 @@ clear_reclaim_active(pg_data_t *pgdat, istatic int balance_pgdat (pg_data_t *pgdat,int order,int highest_zoneidx) {int i; -unsigned long nr_soft_reclaimed; -unsigned long nr_soft_scanned;unsigned long pflags;unsigned long nr_boost_reclaim;unsigned long zone_boosts[MAX_NR_ZONES ] = {0 , };
@@ -7278,12 +7256,7 @@ restart:*/ kswapd_age_node (pgdat, &sc); -/* Call soft limit reclaim before calling shrink_node. */ sc.nr_scanned =0 ; - nr_soft_scanned =0 ; - nr_soft_reclaimed =memcg1_soft_limit_reclaim (pgdat, sc.order, - sc.gfp_mask, &nr_soft_scanned); - sc.nr_reclaimed += nr_soft_reclaimed;/* * There should be no need to raise the scanning priority if
_
Patches currently in -mm which might be from [email protected] are
memcg-move-per-node-objcg-to-the-read-mostly-fields.patch memcg-split-mem_cgroup_private_id-into-two-fields.patch memcg-group-the-write-hot-fields-of-struct-mem_cgroup.patch memcg-group-the-cold-fields-of-struct-mem_cgroup.patch memcg-group-the-read-mostly-fields-of-struct-mem_cgroup.patch memcg-group-the-fields-of-struct-mem_cgroup_per_node.patch