From: Ankita Garg <[email protected]> Change the way vmstats are collected. Since the zones are now present inside regions, scan through all the regions to obtain zone specific statistics.
Signed-off-by: Ankita Garg <[email protected]> Signed-off-by: Srivatsa S. Bhat <[email protected]> --- include/linux/vmstat.h | 21 ++++++++++++++------- mm/vmstat.c | 40 ++++++++++++++++++++++++---------------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 92a86b2..a782f05 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -151,20 +151,27 @@ extern unsigned long zone_reclaimable_pages(struct zone *zone); static inline unsigned long node_page_state(int node, enum zone_stat_item item) { - struct zone *zones = NODE_DATA(node)->node_zones; + unsigned long page_state = 0; + struct mem_region *region; + + for_each_mem_region_in_node(region, node) { + struct zone *zones = region->region_zones; + + page_state = - return #ifdef CONFIG_ZONE_DMA - zone_page_state(&zones[ZONE_DMA], item) + + zone_page_state(&zones[ZONE_DMA], item) + #endif #ifdef CONFIG_ZONE_DMA32 - zone_page_state(&zones[ZONE_DMA32], item) + + zone_page_state(&zones[ZONE_DMA32], item) + #endif #ifdef CONFIG_HIGHMEM - zone_page_state(&zones[ZONE_HIGHMEM], item) + + zone_page_state(&zones[ZONE_HIGHMEM], item) + #endif - zone_page_state(&zones[ZONE_NORMAL], item) + - zone_page_state(&zones[ZONE_MOVABLE], item); + zone_page_state(&zones[ZONE_NORMAL], item) + + zone_page_state(&zones[ZONE_MOVABLE], item); + } + return page_state; } extern void zone_statistics(struct zone *, struct zone *, gfp_t gfp); diff --git a/mm/vmstat.c b/mm/vmstat.c index c737057..86a92a6 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -188,20 +188,24 @@ void refresh_zone_stat_thresholds(void) void set_pgdat_percpu_threshold(pg_data_t *pgdat, int (*calculate_pressure)(struct zone *)) { + struct mem_region *region; struct zone *zone; int cpu; int threshold; int i; for (i = 0; i < pgdat->nr_zones; i++) { - zone = &pgdat->node_zones[i]; - if (!zone->percpu_drift_mark) - continue; + for_each_mem_region_in_node(region, pgdat->node_id) { + struct zone *zone = region->region_zones + i; - threshold = (*calculate_pressure)(zone); - for_each_possible_cpu(cpu) - per_cpu_ptr(zone->pageset, cpu)->stat_threshold - = threshold; + if (!zone->percpu_drift_mark) + continue; + + threshold = (*calculate_pressure)(zone); + for_each_possible_cpu(cpu) + per_cpu_ptr(zone->pageset, cpu)->stat_threshold + = threshold; + } } } @@ -657,19 +661,23 @@ static void frag_stop(struct seq_file *m, void *arg) /* Walk all the zones in a node and print using a callback */ static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat, - void (*print)(struct seq_file *m, pg_data_t *, struct zone *)) + void (*print)(struct seq_file *m, pg_data_t *, + struct mem_region *, struct zone *)) { - struct zone *zone; - struct zone *node_zones = pgdat->node_zones; + int i; unsigned long flags; + struct mem_region *region; - for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) { - if (!populated_zone(zone)) - continue; + for (i = 0; i < MAX_NR_ZONES; ++i) { + for_each_mem_region_in_node(region, pgdat->node_id) { + struct zone *zone = region->region_zones + i; + if (!populated_zone(zone)) + continue; - spin_lock_irqsave(&zone->lock, flags); - print(m, pgdat, zone); - spin_unlock_irqrestore(&zone->lock, flags); + spin_lock_irqsave(&zone->lock, flags); + print(m, pgdat, region, zone); + spin_unlock_irqrestore(&zone->lock, flags); + } } } #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
