memcg-move-mem_cgroup_event_ratelimit-to-v1-code.patch removed from -mm tree
The quilt patch titled
Subject: memcg: move mem_cgroup_event_ratelimit to v1 code
has been removed from the -mm tree. Its filename was
memcg-move-mem_cgroup_event_ratelimit-to-v1-code.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Shakeel Butt <[email protected]>
Subject: memcg: move mem_cgroup_event_ratelimit to v1 code
Date: Wed, 14 Aug 2024 22:04:48 -0700
There are no callers of mem_cgroup_event_ratelimit() in the v2 code. Move it to v1 only code and rename it to memcg1_event_ratelimit().
Signed-off-by Shakeel Butt <[email protected]>
Cc Johannes Weiner <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Muchun Song <[email protected]>
Cc Roman Gushchin <[email protected]>
Cc T.J. Mercier <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memcontrol-v1.c | 32 ++++++++++++++++++++++++++++++-- mm/memcontrol-v1.h | 2 -- mm/memcontrol.c | 28 ---------------------------- 3 files changed, 30 insertions(+), 32 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-move-mem_cgroup_event_ratelimit-to-v1-code +0 -28
@@ -95,9 +95,6 @@ static bool cgroup_memory_nobpf __ro_aftstatic DECLARE_WAIT_QUEUE_HEAD (memcg_cgwb_frn_waitq);#endif -#define THRESHOLDS_EVENTS_TARGET 128 -#define SOFTLIMIT_EVENTS_TARGET 1024 -static inline bool task_is_dying (void ) { return tsk_is_oom_victim(current) || fatal_signal_pending(current) ||
@@ -856,31 +853,6 @@ void mem_cgroup_charge_statistics(struct__this_cpu_add (memcg->events_percpu->nr_page_events, nr_pages); } -bool mem_cgroup_event_ratelimit (struct mem_cgroup *memcg, -enum mem_cgroup_events_target target) -{ -unsigned long val, next; - - val =__this_cpu_read (memcg->events_percpu->nr_page_events); - next =__this_cpu_read (memcg->events_percpu->targets[target]); -/* from time_after() in jiffies.h */ -if ((long )(next - val) <0 ) { -switch (target) { -case MEM_CGROUP_TARGET_THRESH : - next = val +THRESHOLDS_EVENTS_TARGET ; -break ; -case MEM_CGROUP_TARGET_SOFTLIMIT : - next = val +SOFTLIMIT_EVENTS_TARGET ; -break ; -default : -break ; - } -__this_cpu_write (memcg->events_percpu->targets[target], next); -return true; - } -return false; -} -struct mem_cgroup *mem_cgroup_from_task (struct task_struct *p) {/*
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~memcg-move-mem_cgroup_event_ratelimit-to-v1-code +30 -2
@@ -1439,6 +1439,34 @@ static void mem_cgroup_threshold(struct } } +#define THRESHOLDS_EVENTS_TARGET 128 +#define SOFTLIMIT_EVENTS_TARGET 1024 + +static bool memcg1_event_ratelimit (struct mem_cgroup *memcg, +enum mem_cgroup_events_target target) +{ +unsigned long val, next; + + val =__this_cpu_read (memcg->events_percpu->nr_page_events); + next =__this_cpu_read (memcg->events_percpu->targets[target]); +/* from time_after() in jiffies.h */ +if ((long )(next - val) <0 ) { +switch (target) { +case MEM_CGROUP_TARGET_THRESH : + next = val +THRESHOLDS_EVENTS_TARGET ; +break ; +case MEM_CGROUP_TARGET_SOFTLIMIT : + next = val +SOFTLIMIT_EVENTS_TARGET ; +break ; +default : +break ; + } +__this_cpu_write (memcg->events_percpu->targets[target], next); +return true; + } +return false; +} +/* * Check events in order. *
@@ -1449,11 +1477,11 @@ void memcg1_check_events(struct mem_cgroreturn ;/* threshold event is triggered in finer grain than soft limit */ -if (unlikely (mem_cgroup_event_ratelimit (memcg, +if (unlikely (memcg1_event_ratelimit (memcg,MEM_CGROUP_TARGET_THRESH ))) {bool do_softlimit; - do_softlimit =mem_cgroup_event_ratelimit (memcg, + do_softlimit =memcg1_event_ratelimit (memcg,MEM_CGROUP_TARGET_SOFTLIMIT );mem_cgroup_threshold (memcg);if (unlikely (do_softlimit))
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~memcg-move-mem_cgroup_event_ratelimit-to-v1-code +0 -2
@@ -62,8 +62,6 @@ struct memcg1_events_percpu {unsigned long targets[MEM_CGROUP_NTARGETS ]; }; -bool mem_cgroup_event_ratelimit (struct mem_cgroup *memcg, -enum mem_cgroup_events_target target);unsigned long mem_cgroup_usage (struct mem_cgroup *memcg,bool swap);void drain_all_stock (struct mem_cgroup *root_memcg);
_
Patches currently in -mm which might be from [email protected] are