Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd923990 authored by Yafang Shao's avatar Yafang Shao Committed by Linus Torvalds
Browse files

mm/memcontrol: fix wrong statistics in memory.stat 

When we calculate total statistics for memcg1_stats and memcg1_events,
we use the the index 'i' in the for loop as the events index.  Actually
we should use memcg1_stats[i] and memcg1_events[i] as the events index.

Link: http://lkml.kernel.org/r/1562116978-19539-1-git-send-email-laoar.shao@gmail.com


Fixes: 42a30035 ("mm: memcontrol: fix recursive statistics correctness & scalabilty").
Signed-off-by: default avatarYafang Shao <laoar.shao@gmail.com>
Reviewed-by: default avatarShakeel Butt <shakeelb@google.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Yafang Shao <shaoyafang@didiglobal.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9bd3bb67

mm/memcontrol.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -3530,12 +3530,13 @@ static int memcg_stat_show(struct seq_file *m, void *v) 
		if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account())

		if (memcg1_stats[i] == MEMCG_SWAP && !do_memsw_account())

			continue;

			continue;

		seq_printf(m, "total_%s %llu\n", memcg1_stat_names[i],

		seq_printf(m, "total_%s %llu\n", memcg1_stat_names[i],

			   (u64)memcg_page_state(memcg, i) * PAGE_SIZE);

			   (u64)memcg_page_state(memcg, memcg1_stats[i]) *

			   PAGE_SIZE);

	}

	}





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

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

		seq_printf(m, "total_%s %llu\n", memcg1_event_names[i],

		seq_printf(m, "total_%s %llu\n", memcg1_event_names[i],

			   (u64)memcg_events(memcg, i));

			   (u64)memcg_events(memcg, memcg1_events[i]));





	for (i = 0; i < NR_LRU_LISTS; i++)

	for (i = 0; i < NR_LRU_LISTS; i++)

		seq_printf(m, "total_%s %llu\n", mem_cgroup_lru_names[i],

		seq_printf(m, "total_%s %llu\n", mem_cgroup_lru_names[i],