Commit 7de2e9f1 authored Nov 01, 2020 by zhongjiang-ali Committed by Linus Torvalds Nov 02, 2020

mm: memcontrol: correct the NR_ANON_THPS counter of hierarchical memcg



memcg_page_state will get the specified number in hierarchical memcg, It
should multiply by HPAGE_PMD_NR rather than an page if the item is
NR_ANON_THPS.

[akpm@linux-foundation.org: fix printk warning]
[akpm@linux-foundation.org: use u64 cast, per Michal]

Fixes: 468c3982 ("mm: memcontrol: switch to native NR_ANON_THPS counter")
Signed-off-by: zhongjiang-ali <zhongjiang-ali@linux.alibaba.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Link: https://lkml.kernel.org/r/1603722395-72443-1-git-send-email-zhongjiang-ali@linux.alibaba.com


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 79aa925b

mm/memcontrol.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -4110,11 +4110,17 @@ static int memcg_stat_show(struct seq_file m, void v)
		(u64)memsw * PAGE_SIZE);

		for (i = 0; i < ARRAY_SIZE(memcg1_stats); i++) {
		unsigned long nr;

		if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account())
		continue;
		nr = memcg_page_state(memcg, memcg1_stats[i]);
		#ifdef CONFIG_TRANSPARENT_HUGEPAGE
		if (memcg1_stats[i] == NR_ANON_THPS)
		nr *= HPAGE_PMD_NR;
		#endif
		seq_printf(m, "total_%s %llu\n", memcg1_stat_names[i],
		(u64)memcg_page_state(memcg, memcg1_stats[i]) *
		PAGE_SIZE);
		(u64)nr * PAGE_SIZE);
		}

		for (i = 0; i < ARRAY_SIZE(memcg1_events); i++)

Admin message