Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1591629 > unrolled thread

[patch] mm, zoneinfo: print non-populated zones

Started byDavid Rientjes <rientjes@google.com>
First post2017-03-03 03:30 +0100
Last post2017-03-08 16:00 +0100
Articles 8 — 4 participants

Back to article view | Back to linux.kernel


Contents

  [patch] mm, zoneinfo: print non-populated zones David Rientjes <rientjes@google.com> - 2017-03-03 03:30 +0100
    Re: [patch] mm, zoneinfo: print non-populated zones Anshuman Khandual <khandual@linux.vnet.ibm.com> - 2017-03-03 20:50 +0100
      Re: [patch] mm, zoneinfo: print non-populated zones David Rientjes <rientjes@google.com> - 2017-03-03 23:50 +0100
        [patch v2] mm, vmstat: print non-populated zones in zoneinfo David Rientjes <rientjes@google.com> - 2017-03-04 00:00 +0100
          Re: [patch v2] mm, vmstat: print non-populated zones in zoneinfo Anshuman Khandual <khandual@linux.vnet.ibm.com> - 2017-03-04 09:30 +0100
          [patch -mm] mm, vmstat: suppress pcp stats for unpopulated zones in  zoneinfo David Rientjes <rientjes@google.com> - 2017-03-06 23:20 +0100
            Re: [patch -mm] mm, vmstat: suppress pcp stats for unpopulated  zones in zoneinfo Andrew Morton <akpm@linux-foundation.org> - 2017-03-06 23:30 +0100
          Re: [patch v2] mm, vmstat: print non-populated zones in zoneinfo Michal Hocko <mhocko@kernel.org> - 2017-03-08 16:00 +0100

#1591629 — [patch] mm, zoneinfo: print non-populated zones

FromDavid Rientjes <rientjes@google.com>
Date2017-03-03 03:30 +0100
Subject[patch] mm, zoneinfo: print non-populated zones
Message-ID<tgL8J-2LO-1@gated-at.bofh.it>
Initscripts can use the information (protection levels) from
/proc/zoneinfo to configure vm.lowmem_reserve_ratio at boot.

vm.lowmem_reserve_ratio is an array of ratios for each configured zone on
the system.  If a zone is not populated on an arch, /proc/zoneinfo
suppresses its output.

This results in there not being a 1:1 mapping between the set of zones
emitted by /proc/zoneinfo and the zones configured by
vm.lowmem_reserve_ratio.

This patch shows statistics for non-populated zones in /proc/zoneinfo.
The zones exist and hold a spot in the vm.lowmem_reserve_ratio array.
Without this patch, it is not possible to determine which index in the
array controls which zone if one or more zones on the system are not
populated.

Remaining users of walk_zones_in_node() are unchanged.  Files such as
/proc/pagetypeinfo require certain zone data to be initialized properly
for display, which is not done for unpopulated zones.

Signed-off-by: David Rientjes <rientjes@google.com>
---
 mm/vmstat.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/mm/vmstat.c b/mm/vmstat.c
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1121,8 +1121,12 @@ static void frag_stop(struct seq_file *m, void *arg)
 {
 }
 
-/* Walk all the zones in a node and print using a callback */
+/*
+ * Walk zones in a node and print using a callback.
+ * If @populated is true, only use callback for zones that are populated.
+ */
 static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
+		bool populated,
 		void (*print)(struct seq_file *m, pg_data_t *, struct zone *))
 {
 	struct zone *zone;
@@ -1130,7 +1134,7 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
 	unsigned long flags;
 
 	for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) {
-		if (!populated_zone(zone))
+		if (populated && !populated_zone(zone))
 			continue;
 
 		spin_lock_irqsave(&zone->lock, flags);
@@ -1158,7 +1162,7 @@ static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
 static int frag_show(struct seq_file *m, void *arg)
 {
 	pg_data_t *pgdat = (pg_data_t *)arg;
-	walk_zones_in_node(m, pgdat, frag_show_print);
+	walk_zones_in_node(m, pgdat, true, frag_show_print);
 	return 0;
 }
 
@@ -1199,7 +1203,7 @@ static int pagetypeinfo_showfree(struct seq_file *m, void *arg)
 		seq_printf(m, "%6d ", order);
 	seq_putc(m, '\n');
 
-	walk_zones_in_node(m, pgdat, pagetypeinfo_showfree_print);
+	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showfree_print);
 
 	return 0;
 }
@@ -1251,7 +1255,7 @@ static int pagetypeinfo_showblockcount(struct seq_file *m, void *arg)
 	for (mtype = 0; mtype < MIGRATE_TYPES; mtype++)
 		seq_printf(m, "%12s ", migratetype_names[mtype]);
 	seq_putc(m, '\n');
-	walk_zones_in_node(m, pgdat, pagetypeinfo_showblockcount_print);
+	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showblockcount_print);
 
 	return 0;
 }
@@ -1277,7 +1281,7 @@ static void pagetypeinfo_showmixedcount(struct seq_file *m, pg_data_t *pgdat)
 		seq_printf(m, "%12s ", migratetype_names[mtype]);
 	seq_putc(m, '\n');
 
-	walk_zones_in_node(m, pgdat, pagetypeinfo_showmixedcount_print);
+	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showmixedcount_print);
 #endif /* CONFIG_PAGE_OWNER */
 }
 
@@ -1434,7 +1438,7 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
 static int zoneinfo_show(struct seq_file *m, void *arg)
 {
 	pg_data_t *pgdat = (pg_data_t *)arg;
-	walk_zones_in_node(m, pgdat, zoneinfo_show_print);
+	walk_zones_in_node(m, pgdat, false, zoneinfo_show_print);
 	return 0;
 }
 
@@ -1853,7 +1857,7 @@ static int unusable_show(struct seq_file *m, void *arg)
 	if (!node_state(pgdat->node_id, N_MEMORY))
 		return 0;
 
-	walk_zones_in_node(m, pgdat, unusable_show_print);
+	walk_zones_in_node(m, pgdat, true, unusable_show_print);
 
 	return 0;
 }
@@ -1905,7 +1909,7 @@ static int extfrag_show(struct seq_file *m, void *arg)
 {
 	pg_data_t *pgdat = (pg_data_t *)arg;
 
-	walk_zones_in_node(m, pgdat, extfrag_show_print);
+	walk_zones_in_node(m, pgdat, true, extfrag_show_print);
 
 	return 0;
 }

[toc] | [next] | [standalone]


#1592258

FromAnshuman Khandual <khandual@linux.vnet.ibm.com>
Date2017-03-03 20:50 +0100
Message-ID<th1nc-5Qy-23@gated-at.bofh.it>
In reply to#1591629
On 03/03/2017 04:56 AM, David Rientjes wrote:
> Initscripts can use the information (protection levels) from
> /proc/zoneinfo to configure vm.lowmem_reserve_ratio at boot.
> 
> vm.lowmem_reserve_ratio is an array of ratios for each configured zone on
> the system.  If a zone is not populated on an arch, /proc/zoneinfo
> suppresses its output.
> 
> This results in there not being a 1:1 mapping between the set of zones
> emitted by /proc/zoneinfo and the zones configured by
> vm.lowmem_reserve_ratio.
> 
> This patch shows statistics for non-populated zones in /proc/zoneinfo.
> The zones exist and hold a spot in the vm.lowmem_reserve_ratio array.
> Without this patch, it is not possible to determine which index in the
> array controls which zone if one or more zones on the system are not
> populated.

Right, its a problem when it does not even display array elements with
an index value associated with it. But changing the array display will
break the interface where as displaying non populated zones in the
/proc/zoneinfo does not break anything.

> 
> Remaining users of walk_zones_in_node() are unchanged.  Files such as
> /proc/pagetypeinfo require certain zone data to be initialized properly
> for display, which is not done for unpopulated zones.
> 
> Signed-off-by: David Rientjes <rientjes@google.com>
> ---
>  mm/vmstat.c | 22 +++++++++++++---------
>  1 file changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/mm/vmstat.c b/mm/vmstat.c
> --- a/mm/vmstat.c
> +++ b/mm/vmstat.c
> @@ -1121,8 +1121,12 @@ static void frag_stop(struct seq_file *m, void *arg)
>  {
>  }
>  
> -/* Walk all the zones in a node and print using a callback */
> +/*
> + * Walk zones in a node and print using a callback.
> + * If @populated is true, only use callback for zones that are populated.
> + */
>  static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
> +		bool populated,
>  		void (*print)(struct seq_file *m, pg_data_t *, struct zone *))
>  {
>  	struct zone *zone;
> @@ -1130,7 +1134,7 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
>  	unsigned long flags;
>  
>  	for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) {
> -		if (!populated_zone(zone))
> +		if (populated && !populated_zone(zone))

The name of the Boolean "populated" is bit misleading IMHO. What I think you
want here is to invoke the callback if the zone is populated as well as this
variable is true. The variable can be named something like 'assert_populated'.

[toc] | [prev] | [next] | [standalone]


#1592323

FromDavid Rientjes <rientjes@google.com>
Date2017-03-03 23:50 +0100
Message-ID<th4bn-7P9-15@gated-at.bofh.it>
In reply to#1592258
On Fri, 3 Mar 2017, Anshuman Khandual wrote:

> > This patch shows statistics for non-populated zones in /proc/zoneinfo.
> > The zones exist and hold a spot in the vm.lowmem_reserve_ratio array.
> > Without this patch, it is not possible to determine which index in the
> > array controls which zone if one or more zones on the system are not
> > populated.
> 
> Right, its a problem when it does not even display array elements with
> an index value associated with it. But changing the array display will
> break the interface where as displaying non populated zones in the
> /proc/zoneinfo does not break anything.
> 

Precisely.

> The name of the Boolean "populated" is bit misleading IMHO. What I think you
> want here is to invoke the callback if the zone is populated as well as this
> variable is true. The variable can be named something like 'assert_populated'.
> 

I like it, I'll send a v2.  Thanks.

[toc] | [prev] | [next] | [standalone]


#1592331 — [patch v2] mm, vmstat: print non-populated zones in zoneinfo

FromDavid Rientjes <rientjes@google.com>
Date2017-03-04 00:00 +0100
Subject[patch v2] mm, vmstat: print non-populated zones in zoneinfo
Message-ID<th4l4-7SF-9@gated-at.bofh.it>
In reply to#1592323
Initscripts can use the information (protection levels) from
/proc/zoneinfo to configure vm.lowmem_reserve_ratio at boot.

vm.lowmem_reserve_ratio is an array of ratios for each configured zone on
the system.  If a zone is not populated on an arch, /proc/zoneinfo
suppresses its output.

This results in there not being a 1:1 mapping between the set of zones
emitted by /proc/zoneinfo and the zones configured by
vm.lowmem_reserve_ratio.

This patch shows statistics for non-populated zones in /proc/zoneinfo.
The zones exist and hold a spot in the vm.lowmem_reserve_ratio array.
Without this patch, it is not possible to determine which index in the
array controls which zone if one or more zones on the system are not
populated.

Remaining users of walk_zones_in_node() are unchanged.  Files such as
/proc/pagetypeinfo require certain zone data to be initialized properly
for display, which is not done for unpopulated zones.

Signed-off-by: David Rientjes <rientjes@google.com>
---
 v2: - s/bool populated/b assert_populated/ per Anshuman
     - add comment to zoneinfo_show() to describe why we care

 mm/vmstat.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/mm/vmstat.c b/mm/vmstat.c
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1121,8 +1121,12 @@ static void frag_stop(struct seq_file *m, void *arg)
 {
 }
 
-/* Walk all the zones in a node and print using a callback */
+/*
+ * Walk zones in a node and print using a callback.
+ * If @assert_populated is true, only use callback for zones that are populated.
+ */
 static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
+		bool assert_populated,
 		void (*print)(struct seq_file *m, pg_data_t *, struct zone *))
 {
 	struct zone *zone;
@@ -1130,7 +1134,7 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
 	unsigned long flags;
 
 	for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) {
-		if (!populated_zone(zone))
+		if (assert_populated && !populated_zone(zone))
 			continue;
 
 		spin_lock_irqsave(&zone->lock, flags);
@@ -1158,7 +1162,7 @@ static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
 static int frag_show(struct seq_file *m, void *arg)
 {
 	pg_data_t *pgdat = (pg_data_t *)arg;
-	walk_zones_in_node(m, pgdat, frag_show_print);
+	walk_zones_in_node(m, pgdat, true, frag_show_print);
 	return 0;
 }
 
@@ -1199,7 +1203,7 @@ static int pagetypeinfo_showfree(struct seq_file *m, void *arg)
 		seq_printf(m, "%6d ", order);
 	seq_putc(m, '\n');
 
-	walk_zones_in_node(m, pgdat, pagetypeinfo_showfree_print);
+	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showfree_print);
 
 	return 0;
 }
@@ -1251,7 +1255,7 @@ static int pagetypeinfo_showblockcount(struct seq_file *m, void *arg)
 	for (mtype = 0; mtype < MIGRATE_TYPES; mtype++)
 		seq_printf(m, "%12s ", migratetype_names[mtype]);
 	seq_putc(m, '\n');
-	walk_zones_in_node(m, pgdat, pagetypeinfo_showblockcount_print);
+	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showblockcount_print);
 
 	return 0;
 }
@@ -1277,7 +1281,7 @@ static void pagetypeinfo_showmixedcount(struct seq_file *m, pg_data_t *pgdat)
 		seq_printf(m, "%12s ", migratetype_names[mtype]);
 	seq_putc(m, '\n');
 
-	walk_zones_in_node(m, pgdat, pagetypeinfo_showmixedcount_print);
+	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showmixedcount_print);
 #endif /* CONFIG_PAGE_OWNER */
 }
 
@@ -1429,12 +1433,15 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
 }
 
 /*
- * Output information about zones in @pgdat.
+ * Output information about zones in @pgdat.  All zones are printed regardless
+ * of whether they are populated or not: lowmem_reserve_ratio operates on the
+ * set of all zones and userspace would not be aware of such zones if they are
+ * suppressed here (zoneinfo displays the effect of lowmem_reserve_ratio).
  */
 static int zoneinfo_show(struct seq_file *m, void *arg)
 {
 	pg_data_t *pgdat = (pg_data_t *)arg;
-	walk_zones_in_node(m, pgdat, zoneinfo_show_print);
+	walk_zones_in_node(m, pgdat, false, zoneinfo_show_print);
 	return 0;
 }
 
@@ -1853,7 +1860,7 @@ static int unusable_show(struct seq_file *m, void *arg)
 	if (!node_state(pgdat->node_id, N_MEMORY))
 		return 0;
 
-	walk_zones_in_node(m, pgdat, unusable_show_print);
+	walk_zones_in_node(m, pgdat, true, unusable_show_print);
 
 	return 0;
 }
@@ -1905,7 +1912,7 @@ static int extfrag_show(struct seq_file *m, void *arg)
 {
 	pg_data_t *pgdat = (pg_data_t *)arg;
 
-	walk_zones_in_node(m, pgdat, extfrag_show_print);
+	walk_zones_in_node(m, pgdat, true, extfrag_show_print);
 
 	return 0;
 }

[toc] | [prev] | [next] | [standalone]


#1592422 — Re: [patch v2] mm, vmstat: print non-populated zones in zoneinfo

FromAnshuman Khandual <khandual@linux.vnet.ibm.com>
Date2017-03-04 09:30 +0100
SubjectRe: [patch v2] mm, vmstat: print non-populated zones in zoneinfo
Message-ID<thdeG-6jT-1@gated-at.bofh.it>
In reply to#1592331
On 03/04/2017 04:23 AM, David Rientjes wrote:
> Initscripts can use the information (protection levels) from
> /proc/zoneinfo to configure vm.lowmem_reserve_ratio at boot.
> 
> vm.lowmem_reserve_ratio is an array of ratios for each configured zone on
> the system.  If a zone is not populated on an arch, /proc/zoneinfo
> suppresses its output.
> 
> This results in there not being a 1:1 mapping between the set of zones
> emitted by /proc/zoneinfo and the zones configured by
> vm.lowmem_reserve_ratio.
> 
> This patch shows statistics for non-populated zones in /proc/zoneinfo.
> The zones exist and hold a spot in the vm.lowmem_reserve_ratio array.
> Without this patch, it is not possible to determine which index in the
> array controls which zone if one or more zones on the system are not
> populated.
> 
> Remaining users of walk_zones_in_node() are unchanged.  Files such as
> /proc/pagetypeinfo require certain zone data to be initialized properly
> for display, which is not done for unpopulated zones.
> 
> Signed-off-by: David Rientjes <rientjes@google.com>

Reviewed-by: Anshuman Khandual <khandual@linux.vnet.ibm.com>

[toc] | [prev] | [next] | [standalone]


#1593765 — [patch -mm] mm, vmstat: suppress pcp stats for unpopulated zones in zoneinfo

FromDavid Rientjes <rientjes@google.com>
Date2017-03-06 23:20 +0100
Subject[patch -mm] mm, vmstat: suppress pcp stats for unpopulated zones in zoneinfo
Message-ID<ti990-6eI-19@gated-at.bofh.it>
In reply to#1592331
After "mm, vmstat: print non-populated zones in zoneinfo", /proc/zoneinfo 
will show unpopulated zones.

The per-cpu pageset statistics are not relevant for unpopulated zones and 
can be potentially lengthy, so supress them when they are not interesting.

Also moves lowmem reserve protection information above pcp stats since it 
is relevant for all zones per vm.lowmem_reserve_ratio.

Signed-off-by: David Rientjes <rientjes@google.com>
---
 mm/vmstat.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/mm/vmstat.c b/mm/vmstat.c
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1392,18 +1392,24 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
 		   zone->present_pages,
 		   zone->managed_pages);
 
-	for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
-		seq_printf(m, "\n      %-12s %lu", vmstat_text[i],
-				zone_page_state(zone, i));
-
 	seq_printf(m,
 		   "\n        protection: (%ld",
 		   zone->lowmem_reserve[0]);
 	for (i = 1; i < ARRAY_SIZE(zone->lowmem_reserve); i++)
 		seq_printf(m, ", %ld", zone->lowmem_reserve[i]);
-	seq_printf(m,
-		   ")"
-		   "\n  pagesets");
+	seq_putc(m, ')');
+
+	/* If unpopulated, no other information is useful */
+	if (!populated_zone(zone)) {
+		seq_putc(m, '\n');
+		return;
+	}
+
+	for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
+		seq_printf(m, "\n      %-12s %lu", vmstat_text[i],
+				zone_page_state(zone, i));
+
+	seq_printf(m, "\n  pagesets");
 	for_each_online_cpu(i) {
 		struct per_cpu_pageset *pageset;
 

[toc] | [prev] | [next] | [standalone]


#1593769 — Re: [patch -mm] mm, vmstat: suppress pcp stats for unpopulated zones in zoneinfo

FromAndrew Morton <akpm@linux-foundation.org>
Date2017-03-06 23:30 +0100
SubjectRe: [patch -mm] mm, vmstat: suppress pcp stats for unpopulated zones in zoneinfo
Message-ID<ti9iG-6ij-13@gated-at.bofh.it>
In reply to#1593765
On Mon, 6 Mar 2017 14:03:32 -0800 (PST) David Rientjes <rientjes@google.com> wrote:

> After "mm, vmstat: print non-populated zones in zoneinfo", /proc/zoneinfo 
> will show unpopulated zones.
> 
> The per-cpu pageset statistics are not relevant for unpopulated zones and 
> can be potentially lengthy, so supress them when they are not interesting.
> 
> Also moves lowmem reserve protection information above pcp stats since it 
> is relevant for all zones per vm.lowmem_reserve_ratio.

Well it's not strictly back-compatible, but /proc/zoneinfo is such a
mess that parsers will be few and hopefully smart enough to handle
this.

btw,

  pagesets
    cpu: 0
              count: 118
              high:  186
              batch: 31
  vm stats threshold: 72
    cpu: 1
              count: 53
              high:  186
              batch: 31
  vm stats threshold: 72

Should the "vm stats threshold" thing be indented further?

Do we need to print it out N times anyway?  Can different CPUs have
different values?

[toc] | [prev] | [next] | [standalone]


#1595236 — Re: [patch v2] mm, vmstat: print non-populated zones in zoneinfo

FromMichal Hocko <mhocko@kernel.org>
Date2017-03-08 16:00 +0100
SubjectRe: [patch v2] mm, vmstat: print non-populated zones in zoneinfo
Message-ID<tiLei-7ZD-21@gated-at.bofh.it>
In reply to#1592331
On Fri 03-03-17 14:53:07, David Rientjes wrote:
> Initscripts can use the information (protection levels) from
> /proc/zoneinfo to configure vm.lowmem_reserve_ratio at boot.
> 
> vm.lowmem_reserve_ratio is an array of ratios for each configured zone on
> the system.  If a zone is not populated on an arch, /proc/zoneinfo
> suppresses its output.
> 
> This results in there not being a 1:1 mapping between the set of zones
> emitted by /proc/zoneinfo and the zones configured by
> vm.lowmem_reserve_ratio.
>
> This patch shows statistics for non-populated zones in /proc/zoneinfo.
> The zones exist and hold a spot in the vm.lowmem_reserve_ratio array.
> Without this patch, it is not possible to determine which index in the
> array controls which zone if one or more zones on the system are not
> populated.
> 
> Remaining users of walk_zones_in_node() are unchanged.  Files such as
> /proc/pagetypeinfo require certain zone data to be initialized properly
> for display, which is not done for unpopulated zones.

Does it really make sense to print any counters of that zone though?
Your follow up patch just suggests that we don't want some but what
about others?

I can see how skipping empty zones completely can be clumsy but wouldn't
it be sufficient to just provide

Node $NUM, zone $NAME
(unpopulated)

instead?

> 
> Signed-off-by: David Rientjes <rientjes@google.com>
> ---
>  v2: - s/bool populated/b assert_populated/ per Anshuman
>      - add comment to zoneinfo_show() to describe why we care
> 
>  mm/vmstat.c | 27 +++++++++++++++++----------
>  1 file changed, 17 insertions(+), 10 deletions(-)
> 
> diff --git a/mm/vmstat.c b/mm/vmstat.c
> --- a/mm/vmstat.c
> +++ b/mm/vmstat.c
> @@ -1121,8 +1121,12 @@ static void frag_stop(struct seq_file *m, void *arg)
>  {
>  }
>  
> -/* Walk all the zones in a node and print using a callback */
> +/*
> + * Walk zones in a node and print using a callback.
> + * If @assert_populated is true, only use callback for zones that are populated.
> + */
>  static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
> +		bool assert_populated,
>  		void (*print)(struct seq_file *m, pg_data_t *, struct zone *))
>  {
>  	struct zone *zone;
> @@ -1130,7 +1134,7 @@ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
>  	unsigned long flags;
>  
>  	for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) {
> -		if (!populated_zone(zone))
> +		if (assert_populated && !populated_zone(zone))
>  			continue;
>  
>  		spin_lock_irqsave(&zone->lock, flags);
> @@ -1158,7 +1162,7 @@ static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
>  static int frag_show(struct seq_file *m, void *arg)
>  {
>  	pg_data_t *pgdat = (pg_data_t *)arg;
> -	walk_zones_in_node(m, pgdat, frag_show_print);
> +	walk_zones_in_node(m, pgdat, true, frag_show_print);
>  	return 0;
>  }
>  
> @@ -1199,7 +1203,7 @@ static int pagetypeinfo_showfree(struct seq_file *m, void *arg)
>  		seq_printf(m, "%6d ", order);
>  	seq_putc(m, '\n');
>  
> -	walk_zones_in_node(m, pgdat, pagetypeinfo_showfree_print);
> +	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showfree_print);
>  
>  	return 0;
>  }
> @@ -1251,7 +1255,7 @@ static int pagetypeinfo_showblockcount(struct seq_file *m, void *arg)
>  	for (mtype = 0; mtype < MIGRATE_TYPES; mtype++)
>  		seq_printf(m, "%12s ", migratetype_names[mtype]);
>  	seq_putc(m, '\n');
> -	walk_zones_in_node(m, pgdat, pagetypeinfo_showblockcount_print);
> +	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showblockcount_print);
>  
>  	return 0;
>  }
> @@ -1277,7 +1281,7 @@ static void pagetypeinfo_showmixedcount(struct seq_file *m, pg_data_t *pgdat)
>  		seq_printf(m, "%12s ", migratetype_names[mtype]);
>  	seq_putc(m, '\n');
>  
> -	walk_zones_in_node(m, pgdat, pagetypeinfo_showmixedcount_print);
> +	walk_zones_in_node(m, pgdat, true, pagetypeinfo_showmixedcount_print);
>  #endif /* CONFIG_PAGE_OWNER */
>  }
>  
> @@ -1429,12 +1433,15 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
>  }
>  
>  /*
> - * Output information about zones in @pgdat.
> + * Output information about zones in @pgdat.  All zones are printed regardless
> + * of whether they are populated or not: lowmem_reserve_ratio operates on the
> + * set of all zones and userspace would not be aware of such zones if they are
> + * suppressed here (zoneinfo displays the effect of lowmem_reserve_ratio).
>   */
>  static int zoneinfo_show(struct seq_file *m, void *arg)
>  {
>  	pg_data_t *pgdat = (pg_data_t *)arg;
> -	walk_zones_in_node(m, pgdat, zoneinfo_show_print);
> +	walk_zones_in_node(m, pgdat, false, zoneinfo_show_print);
>  	return 0;
>  }
>  
> @@ -1853,7 +1860,7 @@ static int unusable_show(struct seq_file *m, void *arg)
>  	if (!node_state(pgdat->node_id, N_MEMORY))
>  		return 0;
>  
> -	walk_zones_in_node(m, pgdat, unusable_show_print);
> +	walk_zones_in_node(m, pgdat, true, unusable_show_print);
>  
>  	return 0;
>  }
> @@ -1905,7 +1912,7 @@ static int extfrag_show(struct seq_file *m, void *arg)
>  {
>  	pg_data_t *pgdat = (pg_data_t *)arg;
>  
> -	walk_zones_in_node(m, pgdat, extfrag_show_print);
> +	walk_zones_in_node(m, pgdat, true, extfrag_show_print);
>  
>  	return 0;
>  }
> 
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@kvack.org.  For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

-- 
Michal Hocko
SUSE Labs

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web