4.14-stable patches

added patches:
	mm-hide-incomplete-nr_indirectly_reclaimable-in-sysfs.patch

diff --git a/queue-4.14/mm-hide-incomplete-nr_indirectly_reclaimable-in-sysfs.patch b/queue-4.14/mm-hide-incomplete-nr_indirectly_reclaimable-in-sysfs.patch
new file mode 100644 (file)
index 0000000..4bcfeb0
--- /dev/null
+++ b/queue-4.14/mm-hide-incomplete-nr_indirectly_reclaimable-in-sysfs.patch
@@ -0,0 +1,51 @@
+From khlebnikov@yandex-team.ru  Thu Apr 18 17:53:53 2019
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Date: Tue, 09 Apr 2019 20:05:43 +0300
+Subject: [PATCH 4.19.y 2/2] mm: hide incomplete nr_indirectly_reclaimable in sysfs
+To: stable@vger.kernel.org
+Cc: linux-mm@kvack.org, Roman Gushchin <guro@fb.com>, Vlastimil Babka <vbabka@suse.cz>
+Message-ID: <155482954368.2823.12386748649541618609.stgit@buzz>
+
+From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+
+In upstream branch this fixed by commit b29940c1abd7 ("mm: rename and
+change semantics of nr_indirectly_reclaimable_bytes").
+
+This fixes /sys/devices/system/node/node*/vmstat format:
+
+...
+nr_dirtied 6613155
+nr_written 5796802
+ 11089216
+...
+
+Cc: <stable@vger.kernel.org> # 4.19.y
+Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat")
+Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
+Cc: Roman Gushchin <guro@fb.com>
+Cc: Vlastimil Babka <vbabka@suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/base/node.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/drivers/base/node.c
++++ b/drivers/base/node.c
+@@ -197,11 +197,16 @@ static ssize_t node_read_vmstat(struct d
+                            sum_zone_numa_state(nid, i));
+ #endif
+ 
+-      for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++)
++      for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) {
++              /* Skip hidden vmstat items. */
++              if (*vmstat_text[i + NR_VM_ZONE_STAT_ITEMS +
++                               NR_VM_NUMA_STAT_ITEMS] == '\0')
++                      continue;
+               n += sprintf(buf+n, "%s %lu\n",
+                            vmstat_text[i + NR_VM_ZONE_STAT_ITEMS +
+                            NR_VM_NUMA_STAT_ITEMS],
+                            node_page_state(pgdat, i));
++      }
+ 
+       return n;
+ }

diff --git a/queue-4.14/series b/queue-4.14/series
index a04902d5a7d03639dbb9cf9b1ab03257646ad9ca..b8144e16162b49bc9402814bc784945e0dca41fb 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -89,3 +89,4 @@ bpf-fix-sanitation-rewrite-in-case-of-non-pointers.patch
 bpf-fix-selftests-are-changes-for-cve-2019-7308.patch
 tools-include-adopt-linux-bits.h.patch
 net-stmmac-set-dma-ring-length-before-enabling-the-dma.patch
+mm-hide-incomplete-nr_indirectly_reclaimable-in-sysfs.patch