Commit 63861ca1 authored by Shakeel Butt's avatar Shakeel Butt Committed by Liu Shixin
Browse files

mm: ratelimit stat flush from workingset shrinker

mainline inclusion
from mainline-v6.8-rc1
commit d4a5b369ad6d8aae552752ff438dddde653a72ec
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9OCYO
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d4a5b369ad6d8aae552752ff438dddde653a72ec

--------------------------------

One of our workloads (Postgres 14 + sysbench OLTP) regressed on newer
upstream kernel and on further investigation, it seems like the cause is
the always synchronous rstat flush in the count_shadow_nodes() added by
the commit f82e6bf9 ("mm: memcg: use rstat for non-hierarchical
stats").  On further inspection it seems like we don't really need
accurate stats in this function as it was already approximating the amount
of appropriate shadow entries to keep for maintaining the refault
information.  Since there is already 2 sec periodic rstat flush, we don't
need exact stats here.  Let's ratelimit the rstat flush in this code path.

Link: https://lkml.kernel.org/r/20231228073055.4046430-1-shakeelb@google.com


Fixes: f82e6bf9 ("mm: memcg: use rstat for non-hierarchical stats")
Signed-off-by: default avatarShakeel Butt <shakeelb@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Yosry Ahmed <yosryahmed@google.com>
Cc: Yu Zhao <yuzhao@google.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Roman Gushchin <roman.gushchin@linux.dev>
Cc: Muchun Song <songmuchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Conflicts:
	mm/workingset.c
[ Context conflicts with commit 7d7ef0a4686a. ]
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent f6a4c825
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
		struct lruvec *lruvec;
		int i;

		mem_cgroup_flush_stats();
		mem_cgroup_flush_stats_ratelimited();
		lruvec = mem_cgroup_lruvec(sc->memcg, NODE_DATA(sc->nid));
		for (pages = 0, i = 0; i < NR_LRU_LISTS; i++)
			pages += lruvec_page_state_local(lruvec,