Unverified Commit f2c067b5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12698 mm: memcg: don't periodically flush stats when memcg is disabled 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JYUQXFKJ3APNJN7MWNU6OW2W7QGUHY6J/ 
mm: memcg: don't periodically flush stats when memcg is disabled

Shakeel Butt (1):
  mm: writeback: ratelimit stat flush from mem_cgroup_wb_stats

T.J. Mercier (1):
  mm: memcg: don't periodically flush stats when memcg is disabled


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/IB0CT3 
 
Link:https://gitee.com/openeuler/kernel/pulls/12698

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents ab348dfd 1fa38ca8

mm/memcontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -5398,7 +5398,7 @@ void mem_cgroup_wb_stats(struct bdi_writeback *wb, unsigned long *pfilepages, 
	struct mem_cgroup *memcg = mem_cgroup_from_css(wb->memcg_css);

	struct mem_cgroup *parent;



	mem_cgroup_flush_stats();

	mem_cgroup_flush_stats_ratelimited();



	*pdirty = memcg_page_state(memcg, NR_FILE_DIRTY);

	*pwriteback = memcg_page_state(memcg, NR_WRITEBACK);
@@ -6661,7 +6661,7 @@ static int mem_cgroup_css_online(struct cgroup_subsys_state *css) 
	if (alloc_shrinker_info(memcg))

		goto offline_kmem;



	if (unlikely(mem_cgroup_is_root(memcg)))

	if (unlikely(mem_cgroup_is_root(memcg)) && !mem_cgroup_disabled())

		queue_delayed_work(system_unbound_wq, &stats_flush_dwork,

				   FLUSH_TIME);

	lru_gen_online_memcg(memcg);