4.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <ja...@google.com>
commit 58bc4c34d249bf1bc50730a9a209139347cfacfe upstream.
5dd0b16cdaff ("mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available even
on UP") made the availability of the NR_TLB_REMOTE_FLUSH* counters inside
the kernel unconditional to reduce #ifdef soup, but (either to avoid
showing dummy zero counters to userspace, or because that code was missed)
didn't update the vmstat_array, meaning that all following counters would
be shown with incorrect values.
This only affects kernel builds with
CONFIG_VM_EVENT_COUNTERS=y && CONFIG_DEBUG_TLBFLUSH=y && CONFIG_SMP=n.
Link: http://lkml.kernel.org/r/20181001143138.95119-2-ja...@google.com
Fixes: 5dd0b16cdaff ("mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available
even on UP")
Signed-off-by: Jann Horn <ja...@google.com>
Reviewed-by: Kees Cook <keesc...@chromium.org>
Reviewed-by: Andrew Morton <a...@linux-foundation.org>
Acked-by: Michal Hocko <mho...@suse.com>
Acked-by: Roman Gushchin <g...@fb.com>
Cc: Davidlohr Bueso <d...@stgolabs.net>
Cc: Oleg Nesterov <o...@redhat.com>
Cc: Christoph Lameter <clame...@sgi.com>
Cc: Kemi Wang <kemi.w...@intel.com>
Cc: Andy Lutomirski <l...@kernel.org>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: <sta...@vger.kernel.org>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
mm/vmstat.c | 3 +++
1 file changed, 3 insertions(+)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1275,6 +1275,9 @@ const char * const vmstat_text[] = {
#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",
