On Thu 23-01-25 23:38:59, Johannes Weiner wrote:
> 41213dd0f816 ("memcg: move mem_cgroup_event_ratelimit to v1 code")
> left this one behind. There are no v2 references.
>
> Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Thanks!
> ---
> mm/memcontrol-v1.c | 13 +++++++++++++
> mm/memcontrol-v1.h | 12 ------------
> 2 files changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/mm/memcontrol-v1.c b/mm/memcontrol-v1.c
> index 2be6b9112808..6d184fae0ad1 100644
> --- a/mm/memcontrol-v1.c
> +++ b/mm/memcontrol-v1.c
> @@ -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];
> diff --git a/mm/memcontrol-v1.h b/mm/memcontrol-v1.h
> index 6dd7eaf96856..4c8f36430fe9 100644
> --- a/mm/memcontrol-v1.h
> +++ b/mm/memcontrol-v1.h
> @@ -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);
> --
> 2.48.1
--
Michal Hocko
SUSE Labs
