memcg-v1-remove-charge-move-code.patch removed from -mm tree
The quilt patch titled
Subject: memcg-v1: remove charge move code
has been removed from the -mm tree. Its filename was
memcg-v1-remove-charge-move-code.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-v1: remove charge move code
Date: Thu, 24 Oct 2024 18:22:59 -0700
The memcg-v1 charge move feature has been deprecated completely and let's remove the relevant code as well.
Signed-off-by Shakeel Butt <[email protected]>
Acked-by Michal Hocko <[email protected]>
Reviewed-by Roman Gushchin <[email protected]>
Acked-by Johannes Weiner <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Muchun Song <[email protected]>
Cc Yosry Ahmed <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
include/linux/memcontrol.h | 5 mm/memcontrol-v1.c | 887 ----------------------------------- mm/memcontrol-v1.h | 6 mm/memcontrol.c | 9 4 files changed, 907 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~memcg-v1-remove-charge-move-code +0 -5
@@ -299,11 +299,6 @@ struct mem_cgroup {/* For oom notifier event fd */ struct list_head oom_notify; -/* -* Should we move charges of a task when a task is moved into this -* mem_cgroup ? And what type of charges should we move ? -*/ -unsigned long move_charge_at_immigrate;/* taken only while moving_account > 0 */ spinlock_t move_lock;unsigned long move_lock_flags;
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-v1-remove-charge-move-code +0 -9
@@ -2242,12 +2242,6 @@ retry:*/ if (nr_reclaimed && nr_pages <= (1 <<PAGE_ALLOC_COSTLY_ORDER )) goto retry; -/* -* At task move, charge accounts can be doubly counted. So, it's -* better to wait until the end of task_move if something is going on. -*/ -if (memcg1_wait_acct_move (mem_over_limit)) - goto retry;if (nr_retries--) goto retry;
@@ -4441,9 +4435,6 @@ struct cgroup_subsys memory_cgrp_subsys .exit = mem_cgroup_exit, .dfl_cftypes = memory_files, #ifdef CONFIG_MEMCG_V1 - .can_attach = memcg1_can_attach, - .cancel_attach = memcg1_cancel_attach, - .post_attach = memcg1_move_task, .legacy_cftypes = mem_cgroup_legacy_files, #endif .early_init = 0,
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~memcg-v1-remove-charge-move-code +0 -887
911 lines not on this page · raw message
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~memcg-v1-remove-charge-move-code +0 -6
@@ -80,12 +80,7 @@ static inline void memcg1_soft_limit_resWRITE_ONCE (memcg->soft_limit,PAGE_COUNTER_MAX ); } -bool memcg1_wait_acct_move (struct mem_cgroup *memcg); -struct cgroup_taskset ; -int memcg1_can_attach (struct cgroup_taskset *tset); -void memcg1_cancel_attach (struct cgroup_taskset *tset); -void memcg1_move_task (void );void memcg1_css_offline (struct mem_cgroup *memcg);/* for encoding cft->private value on file */
@@ -130,7 +125,6 @@ static inline void memcg1_free_events(ststatic inline void memcg1_memcg_init (struct mem_cgroup *memcg) {}static inline void memcg1_remove_from_trees (struct mem_cgroup *memcg) {}static inline void memcg1_soft_limit_reset (struct mem_cgroup *memcg) {} -static inline bool memcg1_wait_acct_move (struct mem_cgroup *memcg) {return false; }static inline void memcg1_css_offline (struct mem_cgroup *memcg) {}static inline bool memcg1_oom_prepare (struct mem_cgroup *memcg,bool *locked) {return true; }
_
Patches currently in -mm which might be from [email protected] are