Received-SPF: pass (google.com: domain of linux-kernel+bounces-199627-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Mon, 3 Jun 2024 12:13:15 -0700
From: Roman Gushchin <roman.gushchin@linux.dev>
To: Lance Yang <ioworker0@gmail.com>
Cc: akpm@linux-foundation.org, hannes@cmpxchg.org,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org, mhocko@kernel.org,
	muchun.song@linux.dev, shakeel.butt@linux.dev, willy@infradead.org
Subject: Re: [PATCH v1 13/14] mm: memcg: put cgroup v1-related members of
 task_struct under config option
Message-ID: <Zl4VyyGpMH4dnaKs@P9FQF9L96D>
References: <20240528214435.3125304-4-roman.gushchin@linux.dev>
 <20240602120004.62824-1-ioworker0@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240602120004.62824-1-ioworker0@gmail.com>

On Sun, Jun 02, 2024 at 08:00:04PM +0800, Lance Yang wrote:
> Hi Roman,
> 
> I noticed that you changed '#ifdef CONFIG_MEMCG' to '#ifdef CONFIG_MEMCG_V1'.
> However, it seems like the comments for the corresponding #else and #endif were
> not updated accordingly.

Hi Lance!

Good catch, thank you!

I gonna update the patch, if there will be another version.
Otherwise I hope Andrew can pick your change as a fixlet.

Thanks!

>  
> It might be something like:
> 
> diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
> index ba55ebd15354..796cfa842346 100644
> --- a/include/linux/memcontrol.h
> +++ b/include/linux/memcontrol.h
> @@ -1883,7 +1883,7 @@ static inline void mem_cgroup_unlock_pages(void)
>         rcu_read_unlock();
>  }
> 
> -#else /* CONFIG_MEMCG */
> +#else /* CONFIG_MEMCG_V1 */
>  static inline
>  unsigned long memcg1_soft_limit_reclaim(pg_data_t *pgdat, int order,
>                                         gfp_t gfp_mask,
> @@ -1922,6 +1922,6 @@ static inline bool mem_cgroup_oom_synchronize(bool wait)
>         return false;
>  }
> 
> -#endif /* CONFIG_MEMCG */
> +#endif /* CONFIG_MEMCG_V1 */
> 
>  #endif /* _LINUX_MEMCONTROL_H */
> ---
> 
> Thanks,
> Lance