memcg-move-mem_cgroup_charge_statistics-to-v1-code.patch removed from -mm tree
The quilt patch titled
Subject: memcg: move mem_cgroup_charge_statistics to v1 code
has been removed from the -mm tree. Its filename was
memcg-move-mem_cgroup_charge_statistics-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_charge_statistics to v1 code
Date: Wed, 14 Aug 2024 22:04:49 -0700
There are no callers of mem_cgroup_charge_statistics() in the v2 code base, so move it to the v1 only code and rename it to memcg1_charge_statistics().
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 | 17 +++++++++++++++-- mm/memcontrol-v1.h | 3 ++- mm/memcontrol.c | 19 +++---------------- 3 files changed, 20 insertions(+), 19 deletions(-)
mm/memcontrol.c renamed from mm/memcontrol.c~memcg-move-mem_cgroup_charge_statistics-to-v1-code +3 -16
@@ -840,19 +840,6 @@ unsigned long memcg_events_local(structreturn READ_ONCE (memcg->vmstats->events_local[i]); } -void mem_cgroup_charge_statistics (struct mem_cgroup *memcg,int nr_pages) -{ -/* pagein of a big page is an event. So, ignore page size */ -if (nr_pages >0 ) -__count_memcg_events (memcg,PGPGIN ,1 ); -else { -__count_memcg_events (memcg,PGPGOUT ,1 ); - nr_pages = -nr_pages;/* for event */ - } - -__this_cpu_add (memcg->events_percpu->nr_page_events, nr_pages); -} -struct mem_cgroup *mem_cgroup_from_task (struct task_struct *p) {/*
@@ -2366,7 +2353,7 @@ void mem_cgroup_commit_charge(struct folcommit_charge (folio, memcg);local_irq_disable (); -mem_cgroup_charge_statistics (memcg,folio_nr_pages (folio)); +memcg1_charge_statistics (memcg,folio_nr_pages (folio));memcg1_check_events (memcg,folio_nid (folio));local_irq_enable (); }
@@ -4742,7 +4729,7 @@ void mem_cgroup_replace_folio(struct folcommit_charge (new, memcg);local_irq_save (flags); -mem_cgroup_charge_statistics (memcg, nr_pages); +memcg1_charge_statistics (memcg, nr_pages);memcg1_check_events (memcg,folio_nid (new));local_irq_restore (flags); }
@@ -4987,7 +4974,7 @@ void mem_cgroup_swapout(struct folio *fo* only synchronisation we have for updating the per-CPU variables. */ memcg_stats_lock (); -mem_cgroup_charge_statistics (memcg, -nr_entries); +memcg1_charge_statistics (memcg, -nr_entries);memcg_stats_unlock ();memcg1_check_events (memcg,folio_nid (folio));
mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~memcg-move-mem_cgroup_charge_statistics-to-v1-code +15 -2
@@ -853,9 +853,9 @@ static int mem_cgroup_move_account(struc nid =folio_nid (folio);local_irq_disable (); -mem_cgroup_charge_statistics (to, nr_pages); +memcg1_charge_statistics (to, nr_pages);memcg1_check_events (to, nid); -mem_cgroup_charge_statistics (from, -nr_pages); +memcg1_charge_statistics (from, -nr_pages);memcg1_check_events (from, nid);local_irq_enable (); out:
@@ -1439,6 +1439,19 @@ static void mem_cgroup_threshold(struct } } +void memcg1_charge_statistics (struct mem_cgroup *memcg,int nr_pages) +{ +/* pagein of a big page is an event. So, ignore page size */ +if (nr_pages >0 ) +__count_memcg_events (memcg,PGPGIN ,1 ); +else { +__count_memcg_events (memcg,PGPGOUT ,1 ); + nr_pages = -nr_pages;/* for event */ + } + +__this_cpu_add (memcg->events_percpu->nr_page_events, nr_pages); +} +#define THRESHOLDS_EVENTS_TARGET 128#define SOFTLIMIT_EVENTS_TARGET 1024
mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~memcg-move-mem_cgroup_charge_statistics-to-v1-code +2 -1
@@ -7,7 +7,6 @@/* Cgroup v1 and v2 common declarations */ -void mem_cgroup_charge_statistics (struct mem_cgroup *memcg,int nr_pages);int try_charge_memcg (struct mem_cgroup *memcg,gfp_t gfp_mask,unsigned int nr_pages);
@@ -116,6 +115,7 @@ bool memcg1_oom_prepare(struct mem_cgrouvoid memcg1_oom_finish (struct mem_cgroup *memcg,bool locked);void memcg1_oom_recover (struct mem_cgroup *memcg); +void memcg1_charge_statistics (struct mem_cgroup *memcg,int nr_pages);void memcg1_check_events (struct mem_cgroup *memcg,int nid);void memcg1_stat_format (struct mem_cgroup *memcg,struct seq_buf *s);
@@ -147,6 +147,7 @@ static inline bool memcg1_oom_prepare(ststatic inline void memcg1_oom_finish (struct mem_cgroup *memcg,bool locked) {}static inline void memcg1_oom_recover (struct mem_cgroup *memcg) {} +static inline void memcg1_charge_statistics (struct mem_cgroup *memcg,int nr_pages) {}static inline void memcg1_check_events (struct mem_cgroup *memcg,int nid) {}static inline void memcg1_stat_format (struct mem_cgroup *memcg,struct seq_buf *s) {}
_
Patches currently in -mm which might be from [email protected] are