Commit 60b1e24c authored by Miaohe Lin's avatar Miaohe Lin Committed by Andrew Morton
Browse files

mm/memcg: minor cleanup for MEM_CGROUP_ID_MAX 

MEM_CGROUP_ID_MAX is only used when CONFIG_MEMCG is configured.  So remove
unneeded !CONFIG_MEMCG variant.  Also it's only used in
mem_cgroup_alloc(), so move it from memcontrol.h to memcontrol.c.  And
further define it as:

  #define MEM_CGROUP_ID_MAX ((1UL << MEM_CGROUP_ID_SHIFT) - 1)

so if someone changes MEM_CGROUP_ID_SHIFT in the future, then
MEM_CGROUP_ID_MAX will be updated accordingly, as suggested by Muchun.

Link: https://lkml.kernel.org/r/20230708023304.1184111-1-linmiaohe@huawei.com


Signed-off-by: default avatarMiaohe Lin <linmiaohe@huawei.com>
Reviewed-by: default avatarMuchun Song <songmuchun@bytedance.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 22d1e68f

include/linux/memcontrol.h

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct mem_cgroup_reclaim_cookie { 
#ifdef CONFIG_MEMCG



#define MEM_CGROUP_ID_SHIFT	16

#define MEM_CGROUP_ID_MAX	USHRT_MAX



struct mem_cgroup_id {

	int id;
@@ -1158,7 +1157,6 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, 
#else /* CONFIG_MEMCG */



#define MEM_CGROUP_ID_SHIFT	0

#define MEM_CGROUP_ID_MAX	0



static inline struct mem_cgroup *folio_memcg(struct folio *folio)

{

mm/memcontrol.c

+1 −0
Original line number Diff line number Diff line
@@ -5155,6 +5155,7 @@ static struct cftype mem_cgroup_legacy_files[] = { 
 * those references are manageable from userspace.

 */



#define MEM_CGROUP_ID_MAX	((1UL << MEM_CGROUP_ID_SHIFT) - 1)

static DEFINE_IDR(mem_cgroup_idr);



static void mem_cgroup_id_remove(struct mem_cgroup *memcg)