Skip to contentSkip to conversation

memcg-remove-mem_cgroup-soft_limit.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 7

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled

     Subject: memcg: remove mem_cgroup->soft_limit

has been removed from the -mm tree. Its filename was
memcg-remove-mem_cgroup-soft_limit.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 mem_cgroup->soft_limit
Date: Wed, 2 Sep 2026 10:43:10 -0700

Nothing reads it anymore, so the field and the helper that reset it on css alloc and css reset can go.

Link https://lore.kernel.org/[email protected] open here
Signed-off-by Shakeel Butt <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Acked-by Michal Hocko <[email protected]>
Acked-by Lorenzo Stoakes (ARM) <[email protected]>
Cc Axel Rasmussen <[email protected]>
Cc Barry Song <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Kairui Song <[email protected]>
Cc Muchun Song <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc T.J. Mercier <[email protected]>

---

 include/linux/memcontrol.h |    2 --
 mm/memcontrol-v1.h         |    6 ------
 mm/memcontrol.c            |    2 --
 3 files changed, 10 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~memcg-remove-mem_cgroup-soft_limit +0 -2
@@ -280,8 +280,6 @@ struct mem_cgroup {
 
 	struct memcg1_events_percpu __percpu *events_percpu;
 
-	unsigned long soft_limit;
-
 	/* protected by memcg_oom_lock */
 	bool oom_lock;
 	int under_oom;
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-remove-mem_cgroup-soft_limit +0 -2
@@ -4257,7 +4257,6 @@ mem_cgroup_css_alloc(struct cgroup_subsy
 		return ERR_CAST(memcg);
 
 	page_counter_set_high(&memcg->memory, PAGE_COUNTER_MAX);
-	memcg1_soft_limit_reset(memcg);
 #ifdef CONFIG_ZSWAP
 	memcg->zswap_max = PAGE_COUNTER_MAX;
 	WRITE_ONCE(memcg->zswap_writeback, true);

@@ -4464,7 +4463,6 @@ static void mem_cgroup_css_reset(struct
 	page_counter_set_min(&memcg->memory, 0);
 	page_counter_set_low(&memcg->memory, 0);
 	page_counter_set_high(&memcg->memory, PAGE_COUNTER_MAX);
-	memcg1_soft_limit_reset(memcg);
 	page_counter_set_high(&memcg->swap, PAGE_COUNTER_MAX);
 	memcg_wb_domain_size_changed(memcg);
 }
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~memcg-remove-mem_cgroup-soft_limit +0 -6
@@ -42,11 +42,6 @@ void memcg1_free_events(struct mem_cgrou
 
 void memcg1_memcg_init(struct mem_cgroup *memcg);
 
-static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg)
-{
-	WRITE_ONCE(memcg->soft_limit, PAGE_COUNTER_MAX);
-}
-
 struct cgroup_taskset;
 void memcg1_css_offline(struct mem_cgroup *memcg);
 

@@ -97,7 +92,6 @@ static inline bool memcg1_alloc_events(s
 static inline void memcg1_free_events(struct mem_cgroup *memcg) {}
 
 static inline void memcg1_memcg_init(struct mem_cgroup *memcg) {}
-static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg) {}
 static inline void memcg1_css_offline(struct mem_cgroup *memcg) {}
 
 static inline bool memcg1_oom_prepare(struct mem_cgroup *memcg, bool *locked)

_

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