* Re: [PATCH] mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo
2018-10-30 17:48 [PATCH] mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo Roman Gushchin
@ 2018-10-31 8:12 ` Vlastimil Babka
2018-11-29 12:52 ` Greg KH
2018-12-06 11:31 ` Patch "mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo" has been added to the 4.14-stable tree gregkh
2 siblings, 0 replies; 6+ messages in thread
From: Vlastimil Babka @ 2018-10-31 8:12 UTC (permalink / raw)
To: Roman Gushchin, stable@vger.kernel.org
Cc: Yongqin Liu, linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Kernel Team, Andrew Morton
On 10/30/18 6:48 PM, Roman Gushchin wrote:
> Yongqin reported that /proc/zoneinfo format is broken in 4.14
> due to commit 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable
> in /proc/vmstat")
>
> Node 0, zone DMA
> per-node stats
> nr_inactive_anon 403
> nr_active_anon 89123
> nr_inactive_file 128887
> nr_active_file 47377
> nr_unevictable 2053
> nr_slab_reclaimable 7510
> nr_slab_unreclaimable 10775
> nr_isolated_anon 0
> nr_isolated_file 0
> <...>
> nr_vmscan_write 0
> nr_vmscan_immediate_reclaim 0
> nr_dirtied 6022
> nr_written 5985
> 74240
> ^^^^^^^^^^
> pages free 131656
>
> The problem is caused by the nr_indirectly_reclaimable counter,
> which is hidden from the /proc/vmstat, but not from the
> /proc/zoneinfo. Let's fix this inconsistency and hide the
> counter from /proc/zoneinfo exactly as from /proc/vmstat.
Ooops, good catch.
> BTW, in 4.19+ the counter has been renamed and exported by
> the commit b29940c1abd7 ("mm: rename and change semantics of
> nr_indirectly_reclaimable_bytes"), so there is no such a problem
> anymore.
Yeah and that commit depends on introducing a new set kmalloc
reclaimable caches, which is definitely not a stable material, so a
stable-only patch seems to be the only option.
> Cc: <stable@vger.kernel.org> # 4.14.x-4.18.x
> Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat")
> Reported-by: Yongqin Liu <yongqin.liu@linaro.org>
> Signed-off-by: Roman Gushchin <guro@fb.com>
> Cc: Vlastimil Babka <vbabka@suse.cz>
> Cc: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
> ---
> mm/vmstat.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/mm/vmstat.c b/mm/vmstat.c
> index 527ae727d547..6389e876c7a7 100644
> --- a/mm/vmstat.c
> +++ b/mm/vmstat.c
> @@ -1500,6 +1500,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
> if (is_zone_first_populated(pgdat, zone)) {
> seq_printf(m, "\n per-node stats");
> 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;
> seq_printf(m, "\n %-12s %lu",
> vmstat_text[i + NR_VM_ZONE_STAT_ITEMS +
> NR_VM_NUMA_STAT_ITEMS],
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo
2018-10-30 17:48 [PATCH] mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo Roman Gushchin
2018-10-31 8:12 ` Vlastimil Babka
@ 2018-11-29 12:52 ` Greg KH
2018-11-29 14:54 ` Vlastimil Babka
2018-12-06 11:31 ` Patch "mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo" has been added to the 4.14-stable tree gregkh
2 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2018-11-29 12:52 UTC (permalink / raw)
To: Roman Gushchin
Cc: stable@vger.kernel.org, Yongqin Liu, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Kernel Team, Vlastimil Babka,
Andrew Morton
On Tue, Oct 30, 2018 at 05:48:25PM +0000, Roman Gushchin wrote:
> Yongqin reported that /proc/zoneinfo format is broken in 4.14
> due to commit 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable
> in /proc/vmstat")
>
> Node 0, zone DMA
> per-node stats
> nr_inactive_anon 403
> nr_active_anon 89123
> nr_inactive_file 128887
> nr_active_file 47377
> nr_unevictable 2053
> nr_slab_reclaimable 7510
> nr_slab_unreclaimable 10775
> nr_isolated_anon 0
> nr_isolated_file 0
> <...>
> nr_vmscan_write 0
> nr_vmscan_immediate_reclaim 0
> nr_dirtied 6022
> nr_written 5985
> 74240
> ^^^^^^^^^^
> pages free 131656
>
> The problem is caused by the nr_indirectly_reclaimable counter,
> which is hidden from the /proc/vmstat, but not from the
> /proc/zoneinfo. Let's fix this inconsistency and hide the
> counter from /proc/zoneinfo exactly as from /proc/vmstat.
>
> BTW, in 4.19+ the counter has been renamed and exported by
> the commit b29940c1abd7 ("mm: rename and change semantics of
> nr_indirectly_reclaimable_bytes"), so there is no such a problem
> anymore.
>
> Cc: <stable@vger.kernel.org> # 4.14.x-4.18.x
> Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat")
> Reported-by: Yongqin Liu <yongqin.liu@linaro.org>
> Signed-off-by: Roman Gushchin <guro@fb.com>
> Cc: Vlastimil Babka <vbabka@suse.cz>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> ---
> mm/vmstat.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/mm/vmstat.c b/mm/vmstat.c
> index 527ae727d547..6389e876c7a7 100644
> --- a/mm/vmstat.c
> +++ b/mm/vmstat.c
> @@ -1500,6 +1500,10 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
> if (is_zone_first_populated(pgdat, zone)) {
> seq_printf(m, "\n per-node stats");
> 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;
> seq_printf(m, "\n %-12s %lu",
> vmstat_text[i + NR_VM_ZONE_STAT_ITEMS +
> NR_VM_NUMA_STAT_ITEMS],
> --
> 2.17.2
>
I do not see this patch in Linus's tree, do you?
If not, what am I supposed to do with this?
confused,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo
2018-11-29 12:52 ` Greg KH
@ 2018-11-29 14:54 ` Vlastimil Babka
2018-12-06 11:13 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Vlastimil Babka @ 2018-11-29 14:54 UTC (permalink / raw)
To: Greg KH, Roman Gushchin
Cc: stable@vger.kernel.org, Yongqin Liu, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, Kernel Team, Andrew Morton
On 11/29/18 1:52 PM, Greg KH wrote:
> On Tue, Oct 30, 2018 at 05:48:25PM +0000, Roman Gushchin wrote:
>> BTW, in 4.19+ the counter has been renamed and exported by
>> the commit b29940c1abd7 ("mm: rename and change semantics of
>> nr_indirectly_reclaimable_bytes"), so there is no such a problem
>> anymore.
>>
>> Cc: <stable@vger.kernel.org> # 4.14.x-4.18.x
>> Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat")
...
> I do not see this patch in Linus's tree, do you?
>
> If not, what am I supposed to do with this?
Yeah it wasn't probably clear enough, but this is stable-only patch, as
upstream avoided the (then-unknown) problem in 4.19 as part of a far
more intrusive series. As I've said in my previous reply to this thread,
I don't think we can backport that series to stable (e.g. it introduces
a set of new kmalloc caches that will suddenly appear in /proc/slabinfo)
so I think this is a case for exception from the stable rules.
Vlastimil
> confused,
>
> greg k-h
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo
2018-11-29 14:54 ` Vlastimil Babka
@ 2018-12-06 11:13 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2018-12-06 11:13 UTC (permalink / raw)
To: Vlastimil Babka
Cc: Roman Gushchin, stable@vger.kernel.org, Yongqin Liu,
linux-mm@kvack.org, linux-kernel@vger.kernel.org, Kernel Team,
Andrew Morton
On Thu, Nov 29, 2018 at 03:54:10PM +0100, Vlastimil Babka wrote:
> On 11/29/18 1:52 PM, Greg KH wrote:
> > On Tue, Oct 30, 2018 at 05:48:25PM +0000, Roman Gushchin wrote:
> >> BTW, in 4.19+ the counter has been renamed and exported by
> >> the commit b29940c1abd7 ("mm: rename and change semantics of
> >> nr_indirectly_reclaimable_bytes"), so there is no such a problem
> >> anymore.
> >>
> >> Cc: <stable@vger.kernel.org> # 4.14.x-4.18.x
> >> Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat")
>
> ...
>
> > I do not see this patch in Linus's tree, do you?
> >
> > If not, what am I supposed to do with this?
>
> Yeah it wasn't probably clear enough, but this is stable-only patch, as
> upstream avoided the (then-unknown) problem in 4.19 as part of a far
> more intrusive series. As I've said in my previous reply to this thread,
> I don't think we can backport that series to stable (e.g. it introduces
> a set of new kmalloc caches that will suddenly appear in /proc/slabinfo)
> so I think this is a case for exception from the stable rules.
Ok, now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Patch "mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo" has been added to the 4.14-stable tree
2018-10-30 17:48 [PATCH] mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo Roman Gushchin
2018-10-31 8:12 ` Vlastimil Babka
2018-11-29 12:52 ` Greg KH
@ 2018-12-06 11:31 ` gregkh
2 siblings, 0 replies; 6+ messages in thread
From: gregkh @ 2018-12-06 11:31 UTC (permalink / raw)
To: Kernel-team, akpm, gregkh, guro, linux-mm, vbabka, yongqin.liu
Cc: stable-commits
This is a note to let you know that I've just added the patch titled
mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mm-hide-incomplete-nr_indirectly_reclaimable-in-proc-zoneinfo.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From guro@fb.com Thu Dec 6 12:12:35 2018
From: Roman Gushchin <guro@fb.com>
Date: Tue, 30 Oct 2018 17:48:25 +0000
Subject: mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo
To: "stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: Yongqin Liu <yongqin.liu@linaro.org>, "linux-mm@kvack.org" <linux-mm@kvack.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Kernel Team <Kernel-team@fb.com>, "Roman Gushchin" <guro@fb.com>, Vlastimil Babka <vbabka@suse.cz>, Andrew Morton <akpm@linux-foundation.org>
Message-ID: <20181030174649.16778-1-guro@fb.com>
From: Roman Gushchin <guro@fb.com>
[fixed differently upstream, this is a work-around to resolve it for 4.14.y]
Yongqin reported that /proc/zoneinfo format is broken in 4.14
due to commit 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable
in /proc/vmstat")
Node 0, zone DMA
per-node stats
nr_inactive_anon 403
nr_active_anon 89123
nr_inactive_file 128887
nr_active_file 47377
nr_unevictable 2053
nr_slab_reclaimable 7510
nr_slab_unreclaimable 10775
nr_isolated_anon 0
nr_isolated_file 0
<...>
nr_vmscan_write 0
nr_vmscan_immediate_reclaim 0
nr_dirtied 6022
nr_written 5985
74240
^^^^^^^^^^
pages free 131656
The problem is caused by the nr_indirectly_reclaimable counter,
which is hidden from the /proc/vmstat, but not from the
/proc/zoneinfo. Let's fix this inconsistency and hide the
counter from /proc/zoneinfo exactly as from /proc/vmstat.
BTW, in 4.19+ the counter has been renamed and exported by
the commit b29940c1abd7 ("mm: rename and change semantics of
nr_indirectly_reclaimable_bytes"), so there is no such a problem
anymore.
Cc: <stable@vger.kernel.org> # 4.14.x-4.18.x
Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat")
Reported-by: Yongqin Liu <yongqin.liu@linaro.org>
Signed-off-by: Roman Gushchin <guro@fb.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
mm/vmstat.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1500,6 +1500,10 @@ static void zoneinfo_show_print(struct s
if (is_zone_first_populated(pgdat, zone)) {
seq_printf(m, "\n per-node stats");
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;
seq_printf(m, "\n %-12s %lu",
vmstat_text[i + NR_VM_ZONE_STAT_ITEMS +
NR_VM_NUMA_STAT_ITEMS],
Patches currently in stable-queue which might be from guro@fb.com are
queue-4.14/mm-hide-incomplete-nr_indirectly_reclaimable-in-proc-zoneinfo.patch
^ permalink raw reply [flat|nested] 6+ messages in thread