From d9660d8277eda0ea18412bb306225261d1c8dd92 Mon Sep 17 00:00:00 2001 From: Akinobu Mita Date: Mon, 23 Aug 2004 21:45:14 -0700 Subject: [PATCH] [PATCH] show Active/Inactive on per-node meminfo The patch below enable to display the size of Active/Inactive pages on per-node meminfo (/sys/devices/system/node/node%d/meminfo) like /proc/meminfo. By a little change to procps, "vmstat -a" can show these statistics about particular node. From: mita akinobu get_zone_counts() is used by max_sane_readahead(), and max_sane_readahead() is often called in filemap_nopage(). Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/base/node.c | 10 ++++++++++ include/linux/mmzone.h | 2 ++ mm/page_alloc.c | 28 +++++++++++++++++++++++----- mm/readahead.c | 2 +- 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 76dc545535b2d..df74785efa5f1 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -38,11 +38,19 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) int n; int nid = dev->id; struct sysinfo i; + unsigned long inactive; + unsigned long active; + unsigned long free; + si_meminfo_node(&i, nid); + __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); + n = sprintf(buf, "\n" "Node %d MemTotal: %8lu kB\n" "Node %d MemFree: %8lu kB\n" "Node %d MemUsed: %8lu kB\n" + "Node %d Active: %8lu kB\n" + "Node %d Inactive: %8lu kB\n" "Node %d HighTotal: %8lu kB\n" "Node %d HighFree: %8lu kB\n" "Node %d LowTotal: %8lu kB\n" @@ -50,6 +58,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf) nid, K(i.totalram), nid, K(i.freeram), nid, K(i.totalram - i.freeram), + nid, K(active), + nid, K(inactive), nid, K(i.totalhigh), nid, K(i.freehigh), nid, K(i.totalram - i.totalhigh), diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 47431567a76fa..7c36a10f6720a 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -272,6 +272,8 @@ typedef struct pglist_data { extern int numnodes; extern struct pglist_data *pgdat_list; +void __get_zone_counts(unsigned long *active, unsigned long *inactive, + unsigned long *free, struct pglist_data *pgdat); void get_zone_counts(unsigned long *active, unsigned long *inactive, unsigned long *free); void build_all_zonelists(void); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 050f5a41c37dc..d156d5dab9d99 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -961,18 +961,36 @@ unsigned long __read_page_state(unsigned offset) return ret; } +void __get_zone_counts(unsigned long *active, unsigned long *inactive, + unsigned long *free, struct pglist_data *pgdat) +{ + struct zone *zones = pgdat->node_zones; + int i; + + *active = 0; + *inactive = 0; + *free = 0; + for (i = 0; i < MAX_NR_ZONES; i++) { + *active += zones[i].nr_active; + *inactive += zones[i].nr_inactive; + *free += zones[i].free_pages; + } +} + void get_zone_counts(unsigned long *active, unsigned long *inactive, unsigned long *free) { - struct zone *zone; + struct pglist_data *pgdat; *active = 0; *inactive = 0; *free = 0; - for_each_zone(zone) { - *active += zone->nr_active; - *inactive += zone->nr_inactive; - *free += zone->free_pages; + for_each_pgdat(pgdat) { + unsigned long l, m, n; + __get_zone_counts(&l, &m, &n, pgdat); + *active += l; + *inactive += m; + *free += n; } } diff --git a/mm/readahead.c b/mm/readahead.c index c58ae5694421f..a5e6906a01e03 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -571,6 +571,6 @@ unsigned long max_sane_readahead(unsigned long nr) unsigned long inactive; unsigned long free; - get_zone_counts(&active, &inactive, &free); + __get_zone_counts(&active, &inactive, &free, NODE_DATA(numa_node_id())); return min(nr, (inactive + free) / 2); } -- 2.53.0