Commit e9b257ed authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm/memcontrol.c: fix memory.stat item ordering 

The refault stats go better with the page fault stats, and are of
higher interest than the stats on LRU operations. In fact they used to
be grouped together; when the LRU operation stats were added later on,
they were wedged in between.

Move them back together. Documentation/admin-guide/cgroup-v2.rst
already lists them in the right order.

Link: http://lkml.kernel.org/r/20181010140239.GA2527@cmpxchg.org


Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b85afbd

mm/memcontrol.c

+7 −7
Original line number Diff line number Diff line
@@ -5597,6 +5597,13 @@ static int memory_stat_show(struct seq_file *m, void *v) 
	seq_printf(m, "pgfault %lu\n", acc.events[PGFAULT]);

	seq_printf(m, "pgmajfault %lu\n", acc.events[PGMAJFAULT]);



	seq_printf(m, "workingset_refault %lu\n",

		   acc.stat[WORKINGSET_REFAULT]);

	seq_printf(m, "workingset_activate %lu\n",

		   acc.stat[WORKINGSET_ACTIVATE]);

	seq_printf(m, "workingset_nodereclaim %lu\n",

		   acc.stat[WORKINGSET_NODERECLAIM]);



	seq_printf(m, "pgrefill %lu\n", acc.events[PGREFILL]);

	seq_printf(m, "pgscan %lu\n", acc.events[PGSCAN_KSWAPD] +

		   acc.events[PGSCAN_DIRECT]);
@@ -5607,13 +5614,6 @@ static int memory_stat_show(struct seq_file *m, void *v) 
	seq_printf(m, "pglazyfree %lu\n", acc.events[PGLAZYFREE]);

	seq_printf(m, "pglazyfreed %lu\n", acc.events[PGLAZYFREED]);



	seq_printf(m, "workingset_refault %lu\n",

		   acc.stat[WORKINGSET_REFAULT]);

	seq_printf(m, "workingset_activate %lu\n",

		   acc.stat[WORKINGSET_ACTIVATE]);

	seq_printf(m, "workingset_nodereclaim %lu\n",

		   acc.stat[WORKINGSET_NODERECLAIM]);



	return 0;

}