mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
memcg-v1: remove charge move code
The memcg-v1 charge move feature has been deprecated completely and let's remove the relevant code as well. Link: https://lkml.kernel.org/r/20241025012304.2473312-3-shakeel.butt@linux.dev Signed-off-by: Shakeel Butt <shakeel.butt@linux.dev> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Cc: Hugh Dickins <hughd@google.com> Cc: Muchun Song <muchun.song@linux.dev> Cc: Yosry Ahmed <yosryahmed@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
committed by
Andrew Morton
parent
aa6b4fdf59
commit
6b611388b6
@@ -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;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -80,12 +80,7 @@ static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg)
|
||||
WRITE_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(struct mem_cgroup *memcg) {}
|
||||
static 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; }
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user