From: Greg Kroah-Hartman Date: Thu, 18 Apr 2019 15:55:49 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.9.170~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40ef3879f4886c673cd19c957c37e97958e48e9c;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..4bcfeb04a88 --- /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 +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 , Vlastimil Babka +Message-ID: <155482954368.2823.12386748649541618609.stgit@buzz> + +From: Konstantin Khlebnikov + +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: # 4.19.y +Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat") +Signed-off-by: Konstantin Khlebnikov +Cc: Roman Gushchin +Cc: Vlastimil Babka +Signed-off-by: Greg Kroah-Hartman +--- + 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 a04902d5a7d..b8144e16162 100644 --- 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