Commit 0d892bbb authored by Johannes Weiner's avatar Johannes Weiner Committed by Andrew Morton
Browse files

mm: memcontrol: move stray ratelimit bits to v1 

41213dd0 ("memcg: move mem_cgroup_event_ratelimit to v1 code") left
this one behind.  There are no v2 references.

Link: https://lkml.kernel.org/r/20250124043859.18808-2-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 75fe8ec2

mm/memcontrol-v1.c

+13 −0
Original line number Diff line number Diff line
@@ -490,6 +490,19 @@ static void mem_cgroup_threshold(struct mem_cgroup *memcg) 
}



/* Cgroup1: threshold notifications & softlimit tree updates */



/*

 * Per memcg event counter is incremented at every pagein/pageout. With THP,

 * it will be incremented by the number of pages. This counter is used

 * to trigger some periodic events. This is straightforward and better

 * than using jiffies etc. to handle periodic memcg event.

 */

enum mem_cgroup_events_target {

	MEM_CGROUP_TARGET_THRESH,

	MEM_CGROUP_TARGET_SOFTLIMIT,

	MEM_CGROUP_NTARGETS,

};



struct memcg1_events_percpu {

	unsigned long nr_page_events;

	unsigned long targets[MEM_CGROUP_NTARGETS];

mm/memcontrol-v1.h

+0 −12
Original line number Diff line number Diff line
@@ -28,18 +28,6 @@ static inline bool do_memsw_account(void) 
	return !cgroup_subsys_on_dfl(memory_cgrp_subsys);

}



/*

 * Per memcg event counter is incremented at every pagein/pageout. With THP,

 * it will be incremented by the number of pages. This counter is used

 * to trigger some periodic events. This is straightforward and better

 * than using jiffies etc. to handle periodic memcg event.

 */

enum mem_cgroup_events_target {

	MEM_CGROUP_TARGET_THRESH,

	MEM_CGROUP_TARGET_SOFTLIMIT,

	MEM_CGROUP_NTARGETS,

};



unsigned long mem_cgroup_usage(struct mem_cgroup *memcg, bool swap);



void drain_all_stock(struct mem_cgroup *root_memcg);