Commit 75fe8ec2 authored by Johannes Weiner's avatar Johannes Weiner Committed by Andrew Morton
Browse files

mm: memcontrol: unshare v2-only charge API bits again 

6b611388 ("memcg-v1: remove charge move code") removed the remaining
v1 callers.

Link: https://lkml.kernel.org/r/20250124043859.18808-1-hannes@cmpxchg.org


Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarRoman Gushchin <roman.gushchin@linux.dev>
Acked-by: default avatarShakeel Butt <shakeel.butt@linux.dev>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 610dc18c

mm/memcontrol-v1.h

+0 −15
Original line number Diff line number Diff line
@@ -7,21 +7,6 @@ 


/* Cgroup v1 and v2 common declarations */



int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,

		     unsigned int nr_pages);



static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,

			     unsigned int nr_pages)

{

	if (mem_cgroup_is_root(memcg))

		return 0;



	return try_charge_memcg(memcg, gfp_mask, nr_pages);

}



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);



/*

 * Iteration constructs for visiting all cgroups (under a tree).  If

 * loops are exited prematurely (break), mem_cgroup_iter_break() must

mm/memcontrol.c

+13 −4
Original line number Diff line number Diff line
@@ -2213,7 +2213,7 @@ void mem_cgroup_handle_over_high(gfp_t gfp_mask) 
	css_put(&memcg->css);

}



int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,

static int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask,

			    unsigned int nr_pages)

{

	unsigned int batch = max(MEMCG_CHARGE_BATCH, nr_pages);
@@ -2403,6 +2403,15 @@ int try_charge_memcg(struct mem_cgroup *memcg, gfp_t gfp_mask, 
	return 0;

}



static inline int try_charge(struct mem_cgroup *memcg, gfp_t gfp_mask,

			     unsigned int nr_pages)

{

	if (mem_cgroup_is_root(memcg))

		return 0;



	return try_charge_memcg(memcg, gfp_mask, nr_pages);

}



static void commit_charge(struct folio *folio, struct mem_cgroup *memcg)

{

	VM_BUG_ON_FOLIO(folio_memcg_charged(folio), folio);
@@ -3389,13 +3398,13 @@ static void mem_cgroup_id_remove(struct mem_cgroup *memcg) 
	}

}



void __maybe_unused mem_cgroup_id_get_many(struct mem_cgroup *memcg,

static void __maybe_unused mem_cgroup_id_get_many(struct mem_cgroup *memcg,

					   unsigned int n)

{

	refcount_add(n, &memcg->id.ref);

}



void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n)

static void mem_cgroup_id_put_many(struct mem_cgroup *memcg, unsigned int n)

{

	if (refcount_sub_and_test(n, &memcg->id.ref)) {

		mem_cgroup_id_remove(memcg);