Re: [PATCH v2 04/23] mm: define mem_cgroup_get_from_ino() outside of CONFIG_SHRINKER_DEBUG

Michal Hocko
2025-10-31T08:32:38Z

On Mon 27-10-25 16:17:07, Roman Gushchin wrote:
> mem_cgroup_get_from_ino() can be reused by the BPF OOM implementation,
> but currently depends on CONFIG_SHRINKER_DEBUG. Remove this dependency.
>
> Signed-off-by: Roman Gushchin <roman.gushchin@linux.dev>

Acked-by: Michal Hocko <mhocko@suse.com>

> ---
> include/linux/memcontrol.h | 4 ++--
> mm/memcontrol.c | 2 --
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
> index 873e510d6f8d..9af9ae28afe7 100644
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -832,9 +832,9 @@ static inline unsigned long mem_cgroup_ino(struct mem_cgroup *memcg)
> {
> return memcg ? cgroup_ino(memcg->css.cgroup) : 0;
> }
> +#endif
>
> struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino);
> -#endif
>
> static inline struct mem_cgroup *mem_cgroup_from_seq(struct seq_file *m)
> {
> @@ -1331,12 +1331,12 @@ static inline unsigned long mem_cgroup_ino(struct mem_cgroup *memcg)
> {
> return 0;
> }
> +#endif
>
> static inline struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino)
> {
> return NULL;
> }
> -#endif
>
> static inline struct mem_cgroup *mem_cgroup_from_seq(struct seq_file *m)
> {
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 4deda33625f4..5d27cd5372aa 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -3618,7 +3618,6 @@ struct mem_cgroup *mem_cgroup_from_id(unsigned short id)
> return xa_load(&mem_cgroup_ids, id);
> }
>
> -#ifdef CONFIG_SHRINKER_DEBUG
> struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino)
> {
> struct cgroup *cgrp;
> @@ -3639,7 +3638,6 @@ struct mem_cgroup *mem_cgroup_get_from_ino(unsigned long ino)
>
> return memcg;
> }
> -#endif
>
> static void free_mem_cgroup_per_node_info(struct mem_cgroup_per_node *pn)
> {
> --
> 2.51.0

--
Michal Hocko
SUSE Labs