| Message ID | 20230328221644.803272-3-yosryahmed@google.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | memcg: make rstat flushing irq and sleep | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Tue 28-03-23 22:16:37, Yosry Ahmed wrote: > 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(). > > Suggested-by: Johannes Weiner <hannes@cmpxchg.org> > Signed-off-by: Yosry Ahmed <yosryahmed@google.com> > Acked-by: Shakeel Butt <shakeelb@google.com> > Acked-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.com> > --- > include/linux/memcontrol.h | 4 ++-- > mm/memcontrol.c | 2 +- > mm/workingset.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h > index b6eda2ab205d..ac3f3b3a45e2 100644 > --- a/include/linux/memcontrol.h > +++ b/include/linux/memcontrol.h > @@ -1037,7 +1037,7 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec, > } > > 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, > int val); > @@ -1535,7 +1535,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) > { > } > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index 0205e58ea430..c3b6aae78901 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -653,7 +653,7 @@ void mem_cgroup_flush_stats(void) > __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)) > mem_cgroup_flush_stats(); > diff --git a/mm/workingset.c b/mm/workingset.c > index 00c6f4d9d9be..af862c6738c3 100644 > --- a/mm/workingset.c > +++ b/mm/workingset.c > @@ -462,7 +462,7 @@ void workingset_refault(struct folio *folio, void *shadow) > > 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 > * don't activate pages that couldn't stay resident even if > -- > 2.40.0.348.gf938b09366-goog
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index b6eda2ab205d..ac3f3b3a45e2 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1037,7 +1037,7 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec, } 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, int val); @@ -1535,7 +1535,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) { } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 0205e58ea430..c3b6aae78901 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -653,7 +653,7 @@ void mem_cgroup_flush_stats(void) __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)) mem_cgroup_flush_stats(); diff --git a/mm/workingset.c b/mm/workingset.c index 00c6f4d9d9be..af862c6738c3 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -462,7 +462,7 @@ void workingset_refault(struct folio *folio, void *shadow) 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 * don't activate pages that couldn't stay resident even if