From: Christoph Lameter Extend per node and per zone statistics by printing the additional counters now available. - Add new counters to per node statistics - Add new counters to per zone statistics - Provide an array describing zoned VM counters Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- drivers/base/node.c | 10 +++++++--- mm/page_alloc.c | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff -puN drivers/base/node.c~zoned-vm-counters-add-per-zone-counters-to-zone-node-and-global-vm-statistics drivers/base/node.c --- devel/drivers/base/node.c~zoned-vm-counters-add-per-zone-counters-to-zone-node-and-global-vm-statistics 2006-06-09 02:49:37.000000000 -0700 +++ devel-akpm/drivers/base/node.c 2006-06-09 02:49:37.000000000 -0700 @@ -44,12 +44,14 @@ static ssize_t node_read_meminfo(struct unsigned long inactive; unsigned long active; unsigned long free; - unsigned long nr_mapped; + int j; + unsigned long nr[NR_STAT_ITEMS]; si_meminfo_node(&i, nid); get_page_state_node(&ps, nid); __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); - nr_mapped = node_page_state(nid, NR_MAPPED); + for (j = 0; j < NR_STAT_ITEMS; j++) + nr[j] = node_page_state(nid, j); /* Check for negative values in these approximate counters */ if ((long)ps.nr_dirty < 0) @@ -72,6 +74,7 @@ static ssize_t node_read_meminfo(struct "Node %d Dirty: %8lu kB\n" "Node %d Writeback: %8lu kB\n" "Node %d Mapped: %8lu kB\n" + "Node %d Pagecache: %8lu kB\n" "Node %d Slab: %8lu kB\n", nid, K(i.totalram), nid, K(i.freeram), @@ -84,7 +87,8 @@ static ssize_t node_read_meminfo(struct nid, K(i.freeram - i.freehigh), nid, K(ps.nr_dirty), nid, K(ps.nr_writeback), - nid, K(nr_mapped), + nid, K(nr[NR_MAPPED]), + nid, K(nr[NR_PAGECACHE]), nid, K(ps.nr_slab)); n += hugetlb_report_node_meminfo(nid, buf + n); return n; diff -puN mm/page_alloc.c~zoned-vm-counters-add-per-zone-counters-to-zone-node-and-global-vm-statistics mm/page_alloc.c --- devel/mm/page_alloc.c~zoned-vm-counters-add-per-zone-counters-to-zone-node-and-global-vm-statistics 2006-06-09 02:49:37.000000000 -0700 +++ devel-akpm/mm/page_alloc.c 2006-06-09 02:49:37.000000000 -0700 @@ -613,6 +613,8 @@ static int rmqueue_bulk(struct zone *zon return i; } +char *vm_stat_item_descr[NR_STAT_ITEMS] = { "mapped","pagecache" }; + /* * Manage combined zone based / global counters * @@ -2632,6 +2634,11 @@ static int zoneinfo_show(struct seq_file zone->nr_scan_active, zone->nr_scan_inactive, zone->spanned_pages, zone->present_pages); + for(i = 0; i < NR_STAT_ITEMS; i++) + seq_printf(m, "\n %-8s %lu", + vm_stat_item_descr[i], + zone_page_state(zone, i)); + seq_printf(m, "\n protection: (%lu", zone->lowmem_reserve[0]); _