On Mon 24-06-24 17:59:01, Roman Gushchin wrote:
> Rename memcg_oom_recover() into memcg1_oom_recover() for consistency
> with other memory cgroup v1-related functions.
>
> Move the declaration in mm/memcontrol-v1.h to be nearby other
> memcg v1 oom handling functions.
>
> Signed-off-by: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
> ---
> mm/memcontrol-v1.c | 6 +++---
> mm/memcontrol-v1.h | 2 +-
> mm/memcontrol.c | 6 +++---
> 3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c
> index 253d49d5fb12..1d5608ee1606 100644
> --- a/mm/memcontrol-v1.c
> +++ b/mm/memcontrol-v1.c
> @@ -1090,8 +1090,8 @@ static void __mem_cgroup_clear_mc(void)
>
> mc.moved_swap = 0;
> }
> - memcg_oom_recover(from);
> - memcg_oom_recover(to);
> + memcg1_oom_recover(from);
> + memcg1_oom_recover(to);
> wake_up_all(&mc.waitq);
> }
>
> @@ -2067,7 +2067,7 @@ static int memcg_oom_wake_function(wait_queue_entry_t *wait,
> return autoremove_wake_function(wait, mode, sync, arg);
> }
>
> -void memcg_oom_recover(struct mem_cgroup *memcg)
> +void memcg1_oom_recover(struct mem_cgroup *memcg)
> {
> /*
> * For the following lockless ->under_oom test, the only required
> diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h
> index 3de956b2422f..972c493a8ae3 100644
> --- a/mm/memcontrol-v1.h
> +++ b/mm/memcontrol-v1.h
> @@ -13,7 +13,6 @@ static inline void memcg1_soft_limit_reset(struct mem_cgroup *memcg)
>
> void mem_cgroup_charge_statistics(struct mem_cgroup *memcg, int nr_pages);
> void memcg1_check_events(struct mem_cgroup *memcg, int nid);
> -void memcg_oom_recover(struct mem_cgroup *memcg);
> int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,
> unsigned int nr_pages);
>
> @@ -92,5 +91,6 @@ ssize_t memcg_write_event_control(struct kernfs_open_file *of,
>
> bool memcg1_oom_prepare(struct mem_cgroup *memcg, bool *locked);
> void memcg1_oom_finish(struct mem_cgroup *memcg, bool locked);
> +void memcg1_oom_recover(struct mem_cgroup *memcg);
>
> #endif /* __MM_MEMCONTROL_V1_H */
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 8abd364ac837..37e0af5b26f3 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -3167,7 +3167,7 @@ static int mem_cgroup_resize_max(struct mem_cgroup *memcg,
> } while (true);
>
> if (!ret && enlarge)
> - memcg_oom_recover(memcg);
> + memcg1_oom_recover(memcg);
>
> return ret;
> }
> @@ -3752,7 +3752,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css,
>
> WRITE_ONCE(memcg->oom_kill_disable, val);
> if (!val)
> - memcg_oom_recover(memcg);
> + memcg1_oom_recover(memcg);
>
> return 0;
> }
> @@ -5479,7 +5479,7 @@ static void uncharge_batch(const struct uncharge_gather *ug)
> page_counter_uncharge(&ug->memcg->memsw, ug->nr_memory);
> if (ug->nr_kmem)
> memcg_account_kmem(ug->memcg, -ug->nr_kmem);
> - memcg_oom_recover(ug->memcg);
> + memcg1_oom_recover(ug->memcg);
> }
>
> local_irq_save(flags);
> --
> 2.45.2
>
--
Michal Hocko
SUSE Labs
