mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 01:59:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mm: memcg: rename charge move-related functions

Browse source 
Rename exported function related to the charge move to have the memcg1_
prefix.

Link: https://lkml.kernel.org/r/20240625005906.106920-6-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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Roman Gushchin 2024-06-24 17:58:57 -07:00 committed by Andrew Morton
parent e548ad4a7c
commit b9eaacb1db
3 changed files with 15 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
mm/memcontrol-v1.c
View file

@ -384,7 +384,7 @@ static bool mem_cgroup_under_move(struct mem_cgroup *memcg)
return ret; return ret;
} }
bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg) bool memcg1_wait_acct_move(struct mem_cgroup *memcg)
{ {
if (mc.moving_task && current != mc.moving_task) { if (mc.moving_task && current != mc.moving_task) {
if (mem_cgroup_under_move(memcg)) { if (mem_cgroup_under_move(memcg)) {
@ -1056,7 +1056,7 @@ static void mem_cgroup_clear_mc(void)
mmput(mm); mmput(mm);
} }
int mem_cgroup_can_attach(struct cgroup_taskset *tset) int memcg1_can_attach(struct cgroup_taskset *tset)
{ {
struct cgroup_subsys_state *css; struct cgroup_subsys_state *css;
struct mem_cgroup *memcg = NULL; /* unneeded init to make gcc happy */ struct mem_cgroup *memcg = NULL; /* unneeded init to make gcc happy */
@ -1126,7 +1126,7 @@ int mem_cgroup_can_attach(struct cgroup_taskset *tset)
return ret; return ret;
} }
void mem_cgroup_cancel_attach(struct cgroup_taskset *tset) void memcg1_cancel_attach(struct cgroup_taskset *tset)
{ {
if (mc.to) if (mc.to)
mem_cgroup_clear_mc(); mem_cgroup_clear_mc();
@ -1285,7 +1285,7 @@ static void mem_cgroup_move_charge(void)
atomic_dec(&mc.from->moving_account); atomic_dec(&mc.from->moving_account);
} }
void mem_cgroup_move_task(void) void memcg1_move_task(void)
{ {
if (mc.to) { if (mc.to) {
mem_cgroup_move_charge(); mem_cgroup_move_charge();
@ -1294,14 +1294,14 @@ void mem_cgroup_move_task(void)
} }
#else /* !CONFIG_MMU */ #else /* !CONFIG_MMU */
static int mem_cgroup_can_attach(struct cgroup_taskset *tset) int memcg1_can_attach(struct cgroup_taskset *tset)
{ {
return 0; return 0;
} }
static void mem_cgroup_cancel_attach(struct cgroup_taskset *tset) void memcg1_cancel_attach(struct cgroup_taskset *tset)
{ {
} }
static void mem_cgroup_move_task(void) void memcg1_move_task(void)
{ {
} }
#endif #endif

8
mm/memcontrol-v1.h
View file

@ -29,11 +29,11 @@ static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,
void mem_cgroup_id_get_many(struct mem_cgroup *memcg, unsigned int n); 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); void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n);
bool mem_cgroup_wait_acct_move(struct mem_cgroup *memcg); bool memcg1_wait_acct_move(struct mem_cgroup *memcg);
struct cgroup_taskset; struct cgroup_taskset;
int mem_cgroup_can_attach(struct cgroup_taskset *tset); int memcg1_can_attach(struct cgroup_taskset *tset);
void mem_cgroup_cancel_attach(struct cgroup_taskset *tset); void memcg1_cancel_attach(struct cgroup_taskset *tset);
void mem_cgroup_move_task(void); void memcg1_move_task(void);
struct cftype; struct cftype;
u64 mem_cgroup_move_charge_read(struct cgroup_subsys_state *css, u64 mem_cgroup_move_charge_read(struct cgroup_subsys_state *css,

8
mm/memcontrol.c
View file

@ -2580,7 +2580,7 @@ int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,
* At task move, charge accounts can be doubly counted. So, it's * 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. * better to wait until the end of task_move if something is going on.
*/ */
if (mem_cgroup_wait_acct_move(mem_over_limit)) if (memcg1_wait_acct_move(mem_over_limit))
goto retry; goto retry;
if (nr_retries--) if (nr_retries--)
@ -5995,12 +5995,12 @@ struct cgroup_subsys memory_cgrp_subsys = {
.css_free = mem_cgroup_css_free, .css_free = mem_cgroup_css_free,
.css_reset = mem_cgroup_css_reset, .css_reset = mem_cgroup_css_reset,
.css_rstat_flush = mem_cgroup_css_rstat_flush, .css_rstat_flush = mem_cgroup_css_rstat_flush,
.can_attach = mem_cgroup_can_attach, .can_attach = memcg1_can_attach,
#if defined(CONFIG_LRU_GEN) || defined(CONFIG_MEMCG_KMEM) #if defined(CONFIG_LRU_GEN) || defined(CONFIG_MEMCG_KMEM)
.attach = mem_cgroup_attach, .attach = mem_cgroup_attach,
#endif #endif
.cancel_attach = mem_cgroup_cancel_attach, .cancel_attach = memcg1_cancel_attach,
.post_attach = mem_cgroup_move_task, .post_attach = memcg1_move_task,
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG_KMEM
.fork = mem_cgroup_fork, .fork = mem_cgroup_fork,
.exit = mem_cgroup_exit, .exit = mem_cgroup_exit,