mm: memcg: introduce memcontrol-v1.c
Patch series "mm: memcg: separate legacy cgroup v1 code and put under
config option", v2.
Cgroups v2 have been around for a while and many users have fully adopted
them, so they never use cgroups v1 features and functionality. Yet they
have to "pay" for the cgroup v1 support anyway:
1) the kernel binary contains an unused cgroup v1 code,
2) some code paths have additional checks which are not needed,
3) some common structures like task_struct and mem_cgroup contain unused
cgroup v1-specific members.
Cgroup v1's memory controller has a number of features that are not
supported by cgroup v2 and their implementation is pretty much self
contained. Most notably, these features are: soft limit reclaim, oom
handling in userspace, complicated event notification system, charge
migration. Cgroup v1-specific code in memcontrol.c is close to 4k lines
in size and it's intervened with generic and cgroup v2-specific code.
It's a burden on developers and maintainers.
This patchset aims to solve these problems by:
1) moving cgroup v1-specific memcg code to the new mm/memcontrol-v1.c file,
2) putting definitions shared by memcontrol.c and memcontrol-v1.c into the
mm/memcontrol-v1.h header,
3) introducing the CONFIG_MEMCG_V1 config option, turned off by default,
4) making memcontrol-v1.c to compile only if CONFIG_MEMCG_V1 is set.
If CONFIG_MEMCG_V1 is not set, cgroup v1 memory controller is still available
for mounting, however no memory-specific control knobs are present.
This patch (of 14):
This patch introduces the mm/memcontrol-v1.c source file which will be
used for all legacy (cgroup v1) memory cgroup code. It also introduces
mm/memcontrol-v1.h to keep declarations shared between mm/memcontrol.c and
mm/memcontrol-v1.c.
As of now, let's compile it if CONFIG_MEMCG is set, similar to
mm/memcontrol.c. Later on it can be switched to use a separate config
option, so that the legacy code won't be compiled if not required.
Link: https://lkml.kernel.org/r/20240625005906.106920-1-roman.gushchin@linux.dev
Link: https://lkml.kernel.org/r/20240625005906.106920-2-roman.gushchin@linux.dev
Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2024-06-25 00:58:53 +00:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
|
|
|
|
|
|
#ifndef __MM_MEMCONTROL_V1_H
|
|
|
|
|
#define __MM_MEMCONTROL_V1_H
|
|
|
|
|
|
2024-06-25 00:59:02 +00:00
|
|
|
#include <linux/cgroup-defs.h>
|
|
|
|
|
|
2024-06-25 00:59:04 +00:00
|
|
|
/* Cgroup v1 and v2 common declarations */
|
mm: memcg: introduce memcontrol-v1.c
Patch series "mm: memcg: separate legacy cgroup v1 code and put under
config option", v2.
Cgroups v2 have been around for a while and many users have fully adopted
them, so they never use cgroups v1 features and functionality. Yet they
have to "pay" for the cgroup v1 support anyway:
1) the kernel binary contains an unused cgroup v1 code,
2) some code paths have additional checks which are not needed,
3) some common structures like task_struct and mem_cgroup contain unused
cgroup v1-specific members.
Cgroup v1's memory controller has a number of features that are not
supported by cgroup v2 and their implementation is pretty much self
contained. Most notably, these features are: soft limit reclaim, oom
handling in userspace, complicated event notification system, charge
migration. Cgroup v1-specific code in memcontrol.c is close to 4k lines
in size and it's intervened with generic and cgroup v2-specific code.
It's a burden on developers and maintainers.
This patchset aims to solve these problems by:
1) moving cgroup v1-specific memcg code to the new mm/memcontrol-v1.c file,
2) putting definitions shared by memcontrol.c and memcontrol-v1.c into the
mm/memcontrol-v1.h header,
3) introducing the CONFIG_MEMCG_V1 config option, turned off by default,
4) making memcontrol-v1.c to compile only if CONFIG_MEMCG_V1 is set.
If CONFIG_MEMCG_V1 is not set, cgroup v1 memory controller is still available
for mounting, however no memory-specific control knobs are present.
This patch (of 14):
This patch introduces the mm/memcontrol-v1.c source file which will be
used for all legacy (cgroup v1) memory cgroup code. It also introduces
mm/memcontrol-v1.h to keep declarations shared between mm/memcontrol.c and
mm/memcontrol-v1.c.
As of now, let's compile it if CONFIG_MEMCG is set, similar to
mm/memcontrol.c. Later on it can be switched to use a separate config
option, so that the legacy code won't be compiled if not required.
Link: https://lkml.kernel.org/r/20240625005906.106920-1-roman.gushchin@linux.dev
Link: https://lkml.kernel.org/r/20240625005906.106920-2-roman.gushchin@linux.dev
Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2024-06-25 00:58:53 +00:00
|
|
|
|
2024-06-25 00:58:56 +00:00
|
|
|
int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,
|
|
|
|
|
unsigned int nr_pages);
|
|
|
|
|
|
|
|
|
|
static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,
|
|
|
|
|
unsigned int nr_pages)
|
|
|
|
|
{
|
|
|
|
|
if (mem_cgroup_is_root(memcg))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return try_charge_memcg(memcg, gfp_mask, nr_pages);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n);
|
|
|
|
|
void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n);
|
|
|
|
|
|
2024-06-25 00:59:04 +00:00
|
|
|
/*
|
|
|
|
|
* Iteration constructs for visiting all cgroups (under a tree). If
|
|
|
|
|
* loops are exited prematurely (break), mem_cgroup_iter_break() must
|
|
|
|
|
* be used for reference counting.
|
|
|
|
|
*/
|
|
|
|
|
#define for_each_mem_cgroup_tree(iter, root) \
|
|
|
|
|
for (iter = mem_cgroup_iter(root, NULL, NULL); \
|
|
|
|
|
iter != NULL; \
|
|
|
|
|
iter = mem_cgroup_iter(root, iter, NULL))
|
|
|
|
|
|
|
|
|
|
#define for_each_mem_cgroup(iter) \
|
|
|
|
|
for (iter = mem_cgroup_iter(NULL, NULL, NULL); \
|
|
|
|
|
iter != NULL; \
|
|
|
|
|
iter = mem_cgroup_iter(NULL, iter, NULL))
|
|
|
|
|
|
|
|
|
|
/* Whether legacy memory+swap accounting is active */
|
2024-11-28 20:39:59 +00:00
|
|
|
static inline bool do_memsw_account(void)
|
2024-06-25 00:59:04 +00:00
|
|
|
{
|
|
|
|
|
return !cgroup_subsys_on_dfl(memory_cgrp_subsys);
|
|
|
|
|
}
|
2024-06-25 00:58:56 +00:00
|
|
|
|
2024-06-25 00:58:58 +00:00
|
|
|
/*
|
|
|
|
|
* Per memcg event counter is incremented at every pagein/pageout. With THP,
|
|
|
|
|
* it will be incremented by the number of pages. This counter is used
|
|
|
|
|
* to trigger some periodic events. This is straightforward and better
|
|
|
|
|
* than using jiffies etc. to handle periodic memcg event.
|
|
|
|
|
*/
|
|
|
|
|
enum mem_cgroup_events_target {
|
|
|
|
|
MEM_CGROUP_TARGET_THRESH,
|
|
|
|
|
MEM_CGROUP_TARGET_SOFTLIMIT,
|
|
|
|
|
MEM_CGROUP_NTARGETS,
|
|
|
|
|
};
|
|
|
|
|
|
2024-06-25 00:59:04 +00:00
|
|
|
unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap);
|
|
|
|
|
|
|
|
|
|
void drain_all_stock(struct mem_cgroup *root_memcg);
|
|
|
|
|
|
|
|
|
|
unsigned long memcg_events(struct mem_cgroup *memcg, int event);
|
|
|
|
|
unsigned long memcg_events_local(struct mem_cgroup *memcg, int event);
|
|
|
|
|
unsigned long memcg_page_state_local(struct mem_cgroup *memcg, int idx);
|
|
|
|
|
unsigned long memcg_page_state_output(struct mem_cgroup *memcg, int item);
|
|
|
|
|
unsigned long memcg_page_state_local_output(struct mem_cgroup *memcg, int item);
|
|
|
|
|
int memory_stat_show(struct seq_file *m, void *v);
|
|
|
|
|
|
|
|
|
|
/* Cgroup v1-specific declarations */
|
2024-06-25 00:59:05 +00:00
|
|
|
#ifdef CONFIG_MEMCG_V1
|
2024-08-15 05:04:52 +00:00
|
|
|
|
|
|
|
|
bool memcg1_alloc_events(struct mem_cgroup *memcg);
|
|
|
|
|
void memcg1_free_events(struct mem_cgroup *memcg);
|
|
|
|
|
|
2024-06-28 21:03:12 +00:00
|
|
|
void memcg1_memcg_init(struct mem_cgroup *memcg);
|
2024-06-25 00:59:04 +00:00
|
|
|
void memcg1_remove_from_trees(struct mem_cgroup *memcg);
|
|
|
|
|
|
|
|
|
|
static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg)
|
2024-06-25 00:58:58 +00:00
|
|
|
{
|
2024-06-25 00:59:04 +00:00
|
|
|
WRITE_ONCE(memcg->soft_limit, PAGE_COUNTER_MAX);
|
2024-06-25 00:58:58 +00:00
|
|
|
}
|
|
|
|
|
|
2024-06-25 00:59:04 +00:00
|
|
|
struct cgroup_taskset;
|
2024-06-25 00:58:58 +00:00
|
|
|
void memcg1_css_offline(struct mem_cgroup *memcg);
|
|
|
|
|
|
|
|
|
|
/* for encoding cft->private value on file */
|
|
|
|
|
enum res_type {
|
|
|
|
|
_MEM,
|
|
|
|
|
_MEMSWAP,
|
|
|
|
|
_KMEM,
|
|
|
|
|
_TCP,
|
|
|
|
|
};
|
|
|
|
|
|
2024-06-25 00:59:00 +00:00
|
|
|
bool memcg1_oom_prepare(struct mem_cgroup *memcg, bool *locked);
|
|
|
|
|
void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked);
|
2024-06-25 00:59:01 +00:00
|
|
|
void memcg1_oom_recover(struct mem_cgroup *memcg);
|
2024-06-25 00:58:58 +00:00
|
|
|
|
2024-08-15 05:04:50 +00:00
|
|
|
void memcg1_commit_charge(struct folio *folio, struct mem_cgroup *memcg);
|
|
|
|
|
void memcg1_swapout(struct folio *folio, struct mem_cgroup *memcg);
|
|
|
|
|
void memcg1_uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout,
|
|
|
|
|
unsigned long nr_memory, int nid);
|
|
|
|
|
|
2024-06-25 00:59:02 +00:00
|
|
|
void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s);
|
|
|
|
|
|
2024-06-28 21:03:09 +00:00
|
|
|
void memcg1_account_kmem(struct mem_cgroup *memcg, int nr_pages);
|
2024-06-28 21:03:10 +00:00
|
|
|
static inline bool memcg1_tcpmem_active(struct mem_cgroup *memcg)
|
|
|
|
|
{
|
|
|
|
|
return memcg->tcpmem_active;
|
|
|
|
|
}
|
|
|
|
|
bool memcg1_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages,
|
|
|
|
|
gfp_t gfp_mask);
|
|
|
|
|
static inline void memcg1_uncharge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages)
|
|
|
|
|
{
|
|
|
|
|
page_counter_uncharge(&memcg->tcpmem, nr_pages);
|
|
|
|
|
}
|
|
|
|
|
|
2024-06-25 00:59:02 +00:00
|
|
|
extern struct cftype memsw_files[];
|
|
|
|
|
extern struct cftype mem_cgroup_legacy_files[];
|
|
|
|
|
|
2024-06-25 00:59:05 +00:00
|
|
|
#else /* CONFIG_MEMCG_V1 */
|
|
|
|
|
|
2024-08-15 05:04:52 +00:00
|
|
|
static inline bool memcg1_alloc_events(struct mem_cgroup *memcg) { return true; }
|
|
|
|
|
static inline void memcg1_free_events(struct mem_cgroup *memcg) {}
|
|
|
|
|
|
2024-06-28 21:03:12 +00:00
|
|
|
static inline void memcg1_memcg_init(struct mem_cgroup *memcg) {}
|
2024-06-25 00:59:05 +00:00
|
|
|
static inline void memcg1_remove_from_trees(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) { return true; }
|
|
|
|
|
static inline void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked) {}
|
|
|
|
|
static inline void memcg1_oom_recover(struct mem_cgroup *memcg) {}
|
|
|
|
|
|
2024-08-15 05:04:50 +00:00
|
|
|
static inline void memcg1_commit_charge(struct folio *folio,
|
|
|
|
|
struct mem_cgroup *memcg) {}
|
|
|
|
|
|
|
|
|
|
static inline void memcg1_swapout(struct folio *folio, struct mem_cgroup *memcg) {}
|
|
|
|
|
|
|
|
|
|
static inline void memcg1_uncharge_batch(struct mem_cgroup *memcg,
|
|
|
|
|
unsigned long pgpgout,
|
|
|
|
|
unsigned long nr_memory, int nid) {}
|
|
|
|
|
|
2024-06-25 00:59:05 +00:00
|
|
|
static inline void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) {}
|
|
|
|
|
|
2024-06-28 21:03:09 +00:00
|
|
|
static inline void memcg1_account_kmem(struct mem_cgroup *memcg, int nr_pages) {}
|
2024-06-28 21:03:10 +00:00
|
|
|
static inline bool memcg1_tcpmem_active(struct mem_cgroup *memcg) { return false; }
|
|
|
|
|
static inline bool memcg1_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages,
|
|
|
|
|
gfp_t gfp_mask) { return true; }
|
|
|
|
|
static inline void memcg1_uncharge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages) {}
|
|
|
|
|
|
2024-06-25 00:59:05 +00:00
|
|
|
#endif /* CONFIG_MEMCG_V1 */
|
|
|
|
|
|
mm: memcg: introduce memcontrol-v1.c
Patch series "mm: memcg: separate legacy cgroup v1 code and put under
config option", v2.
Cgroups v2 have been around for a while and many users have fully adopted
them, so they never use cgroups v1 features and functionality. Yet they
have to "pay" for the cgroup v1 support anyway:
1) the kernel binary contains an unused cgroup v1 code,
2) some code paths have additional checks which are not needed,
3) some common structures like task_struct and mem_cgroup contain unused
cgroup v1-specific members.
Cgroup v1's memory controller has a number of features that are not
supported by cgroup v2 and their implementation is pretty much self
contained. Most notably, these features are: soft limit reclaim, oom
handling in userspace, complicated event notification system, charge
migration. Cgroup v1-specific code in memcontrol.c is close to 4k lines
in size and it's intervened with generic and cgroup v2-specific code.
It's a burden on developers and maintainers.
This patchset aims to solve these problems by:
1) moving cgroup v1-specific memcg code to the new mm/memcontrol-v1.c file,
2) putting definitions shared by memcontrol.c and memcontrol-v1.c into the
mm/memcontrol-v1.h header,
3) introducing the CONFIG_MEMCG_V1 config option, turned off by default,
4) making memcontrol-v1.c to compile only if CONFIG_MEMCG_V1 is set.
If CONFIG_MEMCG_V1 is not set, cgroup v1 memory controller is still available
for mounting, however no memory-specific control knobs are present.
This patch (of 14):
This patch introduces the mm/memcontrol-v1.c source file which will be
used for all legacy (cgroup v1) memory cgroup code. It also introduces
mm/memcontrol-v1.h to keep declarations shared between mm/memcontrol.c and
mm/memcontrol-v1.c.
As of now, let's compile it if CONFIG_MEMCG is set, similar to
mm/memcontrol.c. Later on it can be switched to use a separate config
option, so that the legacy code won't be compiled if not required.
Link: https://lkml.kernel.org/r/20240625005906.106920-1-roman.gushchin@linux.dev
Link: https://lkml.kernel.org/r/20240625005906.106920-2-roman.gushchin@linux.dev
Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
2024-06-25 00:58:53 +00:00
|
|
|
#endif /* __MM_MEMCONTROL_V1_H */
|