Skip to contentSkip to conversation

lib/show_mem.c: Use for_each_populated_zone() simplify code

PATCH Applied Yajun Deng 3 participants 3 messages Apr 17, 2023 Library code

lore
Share & tools
lore

Yajun Deng

author
#0 lore raw

PATCH 1/1 lib/show_mem.c: Use for_each_populated_zone() simplify code

The __show_mem() needs to iterate over all zones that have memory, we can simplify the code by using for_each_populated_zone().

---
 lib/show_mem.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)
lib/show_mem.c +6 -13
index 0d7585cde2a6..1485c87be935 100644
@@ -10,26 +10,19 @@
 
 void __show_mem(unsigned int filter, nodemask_t *nodemask, int max_zone_idx)
 {
-	pg_data_t *pgdat;
 	unsigned long total = 0, reserved = 0, highmem = 0;
+	struct zone *zone;
 
 	printk("Mem-Info:\n");
 	__show_free_areas(filter, nodemask, max_zone_idx);
 
-	for_each_online_pgdat(pgdat) {
-		int zoneid;
+	for_each_populated_zone(zone) {
 
-		for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) {
-			struct zone *zone = &pgdat->node_zones[zoneid];
-			if (!populated_zone(zone))
-				continue;
+		total += zone->present_pages;
+		reserved += zone->present_pages - zone_managed_pages(zone);
 
-			total += zone->present_pages;
-			reserved += zone->present_pages - zone_managed_pages(zone);
-
-			if (is_highmem_idx(zoneid))
-				highmem += zone->present_pages;
-		}
+		if (is_highmem(zone))
+			highmem += zone->present_pages;
 	}
 
 	printk("%lu pages RAM\n", total);
Signature · 1 line
2.25.1
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Yajun Deng

The __show_mem() needs to iterate over all zones that have memory, we can simplify the code by using for_each_populated_zone().

Quoted 41 lines
---
 lib/show_mem.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)
lib/show_mem.c +6 -13
index 0d7585cde2a6..1485c87be935 100644
@@ -10,26 +10,19 @@
 
 void __show_mem(unsigned int filter, nodemask_t *nodemask, int max_zone_idx)
 {
-	pg_data_t *pgdat;
 	unsigned long total = 0, reserved = 0, highmem = 0;
+	struct zone *zone;
 
 	printk("Mem-Info:\n");
 	__show_free_areas(filter, nodemask, max_zone_idx);
 
-	for_each_online_pgdat(pgdat) {
-		int zoneid;
+	for_each_populated_zone(zone) {
 
-		for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) {
-			struct zone *zone = &pgdat->node_zones[zoneid];
-			if (!populated_zone(zone))
-				continue;
+		total += zone->present_pages;
+		reserved += zone->present_pages - zone_managed_pages(zone);
 
-			total += zone->present_pages;
-			reserved += zone->present_pages - zone_managed_pages(zone);
-
-			if (is_highmem_idx(zoneid))
-				highmem += zone->present_pages;
-		}
+		if (is_highmem(zone))
+			highmem += zone->present_pages;
 	}
 
 	printk("%lu pages RAM\n", total);
Acked-by on v1 1/1
#2 lore raw
In reply to Yajun Deng
Quoted 4 lines · Yajun Deng

The __show_mem() needs to iterate over all zones that have memory, we can simplify the code by using for_each_populated_zone().

Thanks!

Quoted 43 lines
---
 lib/show_mem.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)
lib/show_mem.c +6 -13
index 0d7585cde2a6..1485c87be935 100644
@@ -10,26 +10,19 @@
 
 void __show_mem(unsigned int filter, nodemask_t *nodemask, int max_zone_idx)
 {
-	pg_data_t *pgdat;
 	unsigned long total = 0, reserved = 0, highmem = 0;
+	struct zone *zone;
 
 	printk("Mem-Info:\n");
 	__show_free_areas(filter, nodemask, max_zone_idx);
 
-	for_each_online_pgdat(pgdat) {
-		int zoneid;
+	for_each_populated_zone(zone) {
 
-		for (zoneid = 0; zoneid < MAX_NR_ZONES; zoneid++) {
-			struct zone *zone = &pgdat->node_zones[zoneid];
-			if (!populated_zone(zone))
-				continue;
+		total += zone->present_pages;
+		reserved += zone->present_pages - zone_managed_pages(zone);
 
-			total += zone->present_pages;
-			reserved += zone->present_pages - zone_managed_pages(zone);
-
-			if (is_highmem_idx(zoneid))
-				highmem += zone->present_pages;
-		}
+		if (is_highmem(zone))
+			highmem += zone->present_pages;
 	}
 
 	printk("%lu pages RAM\n", total);
Signature · 1 line
2.25.1
Signature · 2 lines
Michal Hocko
SUSE Labs