| Message ID | 155482954368.2823.12386748649541618609.stgit@buzz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [4.19.y,1/2] mm: hide incomplete nr_indirectly_reclaimable in /proc/zoneinfo | expand |
On 4/9/19 7:05 PM, Konstantin Khlebnikov wrote: > This fixes /sys/devices/system/node/node*/vmstat format: > > ... > nr_dirtied 6613155 > nr_written 5796802 > 11089216 > ... > > In upstream branch this fixed by commit b29940c1abd7 ("mm: rename and > change semantics of nr_indirectly_reclaimable_bytes"). > > Cc: <stable@vger.kernel.org> # 4.19.y So given the same circumstances as patch 1/2, shouldn't this also include 4.14.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> > --- > drivers/base/node.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/base/node.c b/drivers/base/node.c > index 1ac4c36e13bb..c3968e2d0a98 100644 > --- a/drivers/base/node.c > +++ b/drivers/base/node.c > @@ -197,11 +197,16 @@ static ssize_t node_read_vmstat(struct device *dev, > 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; > } >
On 09.04.2019 21:22, Vlastimil Babka wrote: > On 4/9/19 7:05 PM, Konstantin Khlebnikov wrote: >> This fixes /sys/devices/system/node/node*/vmstat format: >> >> ... >> nr_dirtied 6613155 >> nr_written 5796802 >> 11089216 >> ... >> >> In upstream branch this fixed by commit b29940c1abd7 ("mm: rename and >> change semantics of nr_indirectly_reclaimable_bytes"). >> >> Cc: <stable@vger.kernel.org> # 4.19.y > > So given the same circumstances as patch 1/2, shouldn't this also > include 4.14.y ? Oh, yes. Second patch should be applied for 4.14.y too. > >> 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> >> --- >> drivers/base/node.c | 7 ++++++- >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/base/node.c b/drivers/base/node.c >> index 1ac4c36e13bb..c3968e2d0a98 100644 >> --- a/drivers/base/node.c >> +++ b/drivers/base/node.c >> @@ -197,11 +197,16 @@ static ssize_t node_read_vmstat(struct device *dev, >> 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; >> } >> >
On Tue, Apr 09, 2019 at 08:05:43PM +0300, Konstantin Khlebnikov wrote: > This fixes /sys/devices/system/node/node*/vmstat format: > > ... > nr_dirtied 6613155 > nr_written 5796802 > 11089216 > ... > > In upstream branch this fixed by commit b29940c1abd7 ("mm: rename and > change semantics of nr_indirectly_reclaimable_bytes"). We are running at almost 100% for the times we add a patch to the tree that is not in Linus's tree, for a fixup being needed for it after-the-fact. {sigh} Now queued up, thanks. greg k-h
diff --git a/drivers/base/node.c b/drivers/base/node.c index 1ac4c36e13bb..c3968e2d0a98 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -197,11 +197,16 @@ static ssize_t node_read_vmstat(struct device *dev, 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; }
This fixes /sys/devices/system/node/node*/vmstat format: ... nr_dirtied 6613155 nr_written 5796802 11089216 ... In upstream branch this fixed by commit b29940c1abd7 ("mm: rename and change semantics of nr_indirectly_reclaimable_bytes"). 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> --- drivers/base/node.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)