| Message ID | 20240625005906.106920-6-roman.gushchin@linux.dev (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm: memcg: separate legacy cgroup v1 code and put under config option | expand |
On Mon 24-06-24 17:58:57, Roman Gushchin wrote: > Rename exported function related to the charge move to have > the memcg1_ prefix. > > Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev> Acked-by: Michal Hocko <mhocko@suse.com> > --- > mm/memcontrol-v1.c | 14 +++++++------- > mm/memcontrol-v1.h | 8 ++++---- > mm/memcontrol.c | 8 ++++---- > 3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c > index f4c8bec5ae1b..c25e038ac874 100644 > --- a/mm/memcontrol-v1.c > +++ b/mm/memcontrol-v1.c > @@ -384,7 +384,7 @@ static bool mem_cgroup_under_move(struct mem_cgroup *memcg) > 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 (mem_cgroup_under_move(memcg)) { > @@ -1056,7 +1056,7 @@ static void mem_cgroup_clear_mc(void) > 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 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; > } > > -void mem_cgroup_cancel_attach(struct cgroup_taskset *tset) > +void memcg1_cancel_attach(struct cgroup_taskset *tset) > { > if (mc.to) > mem_cgroup_clear_mc(); > @@ -1285,7 +1285,7 @@ static void mem_cgroup_move_charge(void) > atomic_dec(&mc.from->moving_account); > } > > -void mem_cgroup_move_task(void) > +void memcg1_move_task(void) > { > if (mc.to) { > mem_cgroup_move_charge(); > @@ -1294,14 +1294,14 @@ void mem_cgroup_move_task(void) > } > > #else /* !CONFIG_MMU */ > -static int mem_cgroup_can_attach(struct cgroup_taskset *tset) > +int memcg1_can_attach(struct cgroup_taskset *tset) > { > 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 > diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h > index 55e7c4f90c39..d377c0be9880 100644 > --- a/mm/memcontrol-v1.h > +++ b/mm/memcontrol-v1.h > @@ -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_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; > -int mem_cgroup_can_attach(struct cgroup_taskset *tset); > -void mem_cgroup_cancel_attach(struct cgroup_taskset *tset); > -void mem_cgroup_move_task(void); > +int memcg1_can_attach(struct cgroup_taskset *tset); > +void memcg1_cancel_attach(struct cgroup_taskset *tset); > +void memcg1_move_task(void); > > struct cftype; > u64 mem_cgroup_move_charge_read(struct cgroup_subsys_state *css, > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 3332c89cae2e..da2c0fa0de1b 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -2582,7 +2582,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 > * 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; > > if (nr_retries--) > @@ -6030,12 +6030,12 @@ struct cgroup_subsys memory_cgrp_subsys = { > .css_free = mem_cgroup_css_free, > .css_reset = mem_cgroup_css_reset, > .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) > .attach = mem_cgroup_attach, > #endif > - .cancel_attach = mem_cgroup_cancel_attach, > - .post_attach = mem_cgroup_move_task, > + .cancel_attach = memcg1_cancel_attach, > + .post_attach = memcg1_move_task, > #ifdef CONFIG_MEMCG_KMEM > .fork = mem_cgroup_fork, > .exit = mem_cgroup_exit, > -- > 2.45.2 >
diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c index f4c8bec5ae1b..c25e038ac874 100644 --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c @@ -384,7 +384,7 @@ static bool mem_cgroup_under_move(struct mem_cgroup *memcg) 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 (mem_cgroup_under_move(memcg)) { @@ -1056,7 +1056,7 @@ static void mem_cgroup_clear_mc(void) 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 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; } -void mem_cgroup_cancel_attach(struct cgroup_taskset *tset) +void memcg1_cancel_attach(struct cgroup_taskset *tset) { if (mc.to) mem_cgroup_clear_mc(); @@ -1285,7 +1285,7 @@ static void mem_cgroup_move_charge(void) atomic_dec(&mc.from->moving_account); } -void mem_cgroup_move_task(void) +void memcg1_move_task(void) { if (mc.to) { mem_cgroup_move_charge(); @@ -1294,14 +1294,14 @@ void mem_cgroup_move_task(void) } #else /* !CONFIG_MMU */ -static int mem_cgroup_can_attach(struct cgroup_taskset *tset) +int memcg1_can_attach(struct cgroup_taskset *tset) { 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 diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h index 55e7c4f90c39..d377c0be9880 100644 --- a/mm/memcontrol-v1.h +++ b/mm/memcontrol-v1.h @@ -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_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; -int mem_cgroup_can_attach(struct cgroup_taskset *tset); -void mem_cgroup_cancel_attach(struct cgroup_taskset *tset); -void mem_cgroup_move_task(void); +int memcg1_can_attach(struct cgroup_taskset *tset); +void memcg1_cancel_attach(struct cgroup_taskset *tset); +void memcg1_move_task(void); struct cftype; u64 mem_cgroup_move_charge_read(struct cgroup_subsys_state *css, diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3332c89cae2e..da2c0fa0de1b 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2582,7 +2582,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 * 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; if (nr_retries--) @@ -6030,12 +6030,12 @@ struct cgroup_subsys memory_cgrp_subsys = { .css_free = mem_cgroup_css_free, .css_reset = mem_cgroup_css_reset, .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) .attach = mem_cgroup_attach, #endif - .cancel_attach = mem_cgroup_cancel_attach, - .post_attach = mem_cgroup_move_task, + .cancel_attach = memcg1_cancel_attach, + .post_attach = memcg1_move_task, #ifdef CONFIG_MEMCG_KMEM .fork = mem_cgroup_fork, .exit = mem_cgroup_exit,
Rename exported function related to the charge move to have the memcg1_ prefix. Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev> --- mm/memcontrol-v1.c | 14 +++++++------- mm/memcontrol-v1.h | 8 ++++---- mm/memcontrol.c | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-)