Commit e8277b3b authored Apr 18, 2019 by Konstantin Khlebnikov Committed by Linus Torvalds Apr 19, 2019

mm/vmstat.c: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n

Commit 58bc4c34 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")
depends on skipping vmstat entries with empty name introduced in
7aaf7727 ("mm: don't show nr_indirectly_reclaimable in
/proc/vmstat") but reverted in b29940c1 ("mm: rename and change
semantics of nr_indirectly_reclaimable_bytes").

So skipping no longer works and /proc/vmstat has misformatted lines " 0".

This patch simply shows debug counters "nr_tlb_remote_*" for UP.

Link: http://lkml.kernel.org/r/155481488468.467.4295519102880913454.stgit@buzz


Fixes: 58bc4c34 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Roman Gushchin <guro@fb.com>
Cc: Jann Horn <jannh@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 37803841

mm/vmstat.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -1274,13 +1274,8 @@ const char * const vmstat_text[] = {
		#endif
		#endif /* CONFIG_MEMORY_BALLOON */
		#ifdef CONFIG_DEBUG_TLBFLUSH
		#ifdef CONFIG_SMP
		"nr_tlb_remote_flush",
		"nr_tlb_remote_flush_received",
		#else
		"", /* nr_tlb_remote_flush */
		"", /* nr_tlb_remote_flush_received */
		#endif /* CONFIG_SMP */
		"nr_tlb_local_flush_all",
		"nr_tlb_local_flush_one",
		#endif /* CONFIG_DEBUG_TLBFLUSH */

Admin message