shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: memcg: rename mem_cgroup_flush_stats_"delayed" to "ratelimited"

Browse Source 
mem_cgroup_flush_stats_delayed() suggests his is using a delayed_work, but
this is actually sometimes flushing directly from the callsite.

What it's doing is ratelimited calls.  A better name would be
mem_cgroup_flush_stats_ratelimited().

Link: https://lkml.kernel.org/r/20230330191801.1967435-3-yosryahmed@google.com
Change-Id: Ib418ae17599d10c520b766f0c0e4396a43906256
Signed-off-by: Yosry Ahmed <yosryahmed@google.com>
Suggested-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Shakeel Butt <shakeelb@google.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Josef Bacik <josef@toxicpanda.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Michal Koutný <mkoutny@suse.com>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Tejun Heo <tj@kernel.org>
Cc: Vasily Averin <vasily.averin@linux.dev>
Cc: Zefan Li <lizefan.x@bytedance.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
(cherry picked from commit 92fbbc7202)
Bug: 322544714
Signed-off-by: T.J. Mercier <tjmercier@google.com>
This commit is contained in:
Yosry Ahmed
2023-03-30 19:17:55 +00:00
committed by T.J. Mercier
parent 978adc3d3a
commit a77a4ca4f4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/memcontrol.h
View File

@@ -1033,7 +1033,7 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec,
} }
void mem_cgroup_flush_stats(void); void mem_cgroup_flush_stats(void);
void mem_cgroup_flush_stats_delayed(void); void mem_cgroup_flush_stats_ratelimited(void);
void __mod_memcg_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx, void __mod_memcg_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx,
int val); int val);
@@ -1519,7 +1519,7 @@ static inline void mem_cgroup_flush_stats(void)
{ {
} }
static inline void mem_cgroup_flush_stats_delayed(void) static inline void mem_cgroup_flush_stats_ratelimited(void)
{ {
} }

2
mm/memcontrol.c
View File

@@ -651,7 +651,7 @@ void mem_cgroup_flush_stats(void)
__mem_cgroup_flush_stats(); __mem_cgroup_flush_stats();
} }
void mem_cgroup_flush_stats_delayed(void) void mem_cgroup_flush_stats_ratelimited(void)
{ {
if (time_after64(jiffies_64, flush_next_time)) if (time_after64(jiffies_64, flush_next_time))
mem_cgroup_flush_stats(); mem_cgroup_flush_stats();

2
mm/workingset.c
View File

@@ -464,7 +464,7 @@ void workingset_refault(struct folio *folio, void *shadow)
mod_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file, nr); mod_lruvec_state(lruvec, WORKINGSET_REFAULT_BASE + file, nr);
mem_cgroup_flush_stats_delayed(); mem_cgroup_flush_stats_ratelimited();
/* /*
* Compare the distance to the existing workingset size. We * Compare the distance to the existing workingset size. We
* don't activate pages that couldn't stay resident even if * don't activate pages that couldn't stay resident even if