From: Christoph Lameter Conversion of nr_unstable to a per zone counter We need to do some special modifications to the nfs code since there are multiple cases of disposition and we need to have a page ref for proper accounting. This converts the last critical page state of the VM and therefore we need to remove several functions that were depending on GET_PAGE_STATE_LAST in order to make the kernel compile again. We are only left with event type counters in page state. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- drivers/base/node.c | 4 ++-- fs/fs-writeback.c | 2 +- fs/nfs/pagelist.c | 1 + fs/nfs/write.c | 7 +++---- fs/proc/proc_misc.c | 4 ++-- include/linux/mmzone.h | 1 + mm/page-writeback.c | 2 +- mm/page_alloc.c | 4 +--- mm/vmstat.c | 3 +-- 9 files changed, 13 insertions(+), 15 deletions(-) diff -puN drivers/base/node.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter drivers/base/node.c --- 25/drivers/base/node.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/drivers/base/node.c Tue Jun 27 15:22:59 2006 @@ -40,13 +40,11 @@ static ssize_t node_read_meminfo(struct int n; int nid = dev->id; struct sysinfo i; - struct page_state ps; unsigned long inactive; unsigned long active; unsigned long free; si_meminfo_node(&i, nid); - get_page_state_node(&ps, nid); __get_zone_counts(&active, &inactive, &free, NODE_DATA(nid)); @@ -66,6 +64,7 @@ static ssize_t node_read_meminfo(struct "Node %d Mapped: %8lu kB\n" "Node %d AnonPages: %8lu kB\n" "Node %d PageTables: %8lu kB\n" + "Node %d NFS Unstable: %8lu kB\n" "Node %d Slab: %8lu kB\n", nid, K(i.totalram), nid, K(i.freeram), @@ -82,6 +81,7 @@ static ssize_t node_read_meminfo(struct nid, K(node_page_state(nid, NR_FILE_MAPPED)), nid, K(node_page_state(nid, NR_ANON_PAGES)), nid, K(node_page_state(nid, NR_PAGETABLE)), + nid, K(node_page_state(nid, NR_UNSTABLE_NFS)), nid, K(node_page_state(nid, NR_SLAB))); n += hugetlb_report_node_meminfo(nid, buf + n); return n; diff -puN fs/fs-writeback.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter fs/fs-writeback.c --- 25/fs/fs-writeback.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/fs/fs-writeback.c Tue Jun 27 15:22:59 2006 @@ -465,7 +465,7 @@ void sync_inodes_sb(struct super_block * .range_end = LLONG_MAX, }; unsigned long nr_dirty = global_page_state(NR_FILE_DIRTY); - unsigned long nr_unstable = read_page_state(nr_unstable); + unsigned long nr_unstable = global_page_state(NR_UNSTABLE_NFS); wbc.nr_to_write = nr_dirty + nr_unstable + (inodes_stat.nr_inodes - inodes_stat.nr_unused) + diff -puN fs/nfs/pagelist.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter fs/nfs/pagelist.c --- 25/fs/nfs/pagelist.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/fs/nfs/pagelist.c Tue Jun 27 15:22:59 2006 @@ -154,6 +154,7 @@ void nfs_clear_request(struct nfs_page * { struct page *page = req->wb_page; if (page != NULL) { + dec_zone_page_state(page, NR_UNSTABLE_NFS); page_cache_release(page); req->wb_page = NULL; } diff -puN fs/nfs/write.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter fs/nfs/write.c --- 25/fs/nfs/write.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/fs/nfs/write.c Tue Jun 27 15:22:59 2006 @@ -525,7 +525,7 @@ nfs_mark_request_commit(struct nfs_page nfs_list_add_request(req, &nfsi->commit); nfsi->ncommit++; spin_unlock(&nfsi->req_lock); - inc_page_state(nr_unstable); + inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); mark_inode_dirty(inode); } #endif @@ -1393,7 +1393,6 @@ static void nfs_commit_done(struct rpc_t { struct nfs_write_data *data = calldata; struct nfs_page *req; - int res = 0; dprintk("NFS: %4d nfs_commit_done (status %d)\n", task->tk_pid, task->tk_status); @@ -1430,10 +1429,10 @@ static void nfs_commit_done(struct rpc_t dprintk(" mismatch\n"); nfs_mark_request_dirty(req); next: + if (req->wb_page) + dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); nfs_clear_page_writeback(req); - res++; } - sub_page_state(nr_unstable,res); } static const struct rpc_call_ops nfs_commit_ops = { diff -puN fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter fs/proc/proc_misc.c --- 25/fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/fs/proc/proc_misc.c Tue Jun 27 15:22:59 2006 @@ -120,7 +120,6 @@ static int meminfo_read_proc(char *page, { struct sysinfo i; int len; - struct page_state ps; unsigned long inactive; unsigned long active; unsigned long free; @@ -129,7 +128,6 @@ static int meminfo_read_proc(char *page, struct vmalloc_info vmi; long cached; - get_page_state(&ps); get_zone_counts(&active, &inactive, &free); /* @@ -172,6 +170,7 @@ static int meminfo_read_proc(char *page, "Mapped: %8lu kB\n" "Slab: %8lu kB\n" "PageTables: %8lu kB\n" + "NFS Unstable: %8lu kB\n" "CommitLimit: %8lu kB\n" "Committed_AS: %8lu kB\n" "VmallocTotal: %8lu kB\n" @@ -196,6 +195,7 @@ static int meminfo_read_proc(char *page, K(global_page_state(NR_FILE_MAPPED)), K(global_page_state(NR_SLAB)), K(global_page_state(NR_PAGETABLE)), + K(global_page_state(NR_UNSTABLE_NFS)), K(allowed), K(committed), (unsigned long)VMALLOC_TOTAL >> 10, diff -puN include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter include/linux/mmzone.h --- 25/include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/include/linux/mmzone.h Tue Jun 27 15:22:59 2006 @@ -55,6 +55,7 @@ enum zone_stat_item { NR_PAGETABLE, /* used for pagetables */ NR_FILE_DIRTY, NR_WRITEBACK, + NR_UNSTABLE_NFS, /* NFS unstable pages */ NR_VM_ZONE_STAT_ITEMS }; struct per_cpu_pages { diff -puN mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter mm/page_alloc.c --- 25/mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/mm/page_alloc.c Tue Jun 27 15:22:59 2006 @@ -1270,7 +1270,6 @@ void si_meminfo_node(struct sysinfo *val */ void show_free_areas(void) { - struct page_state ps; int cpu, temperature; unsigned long active; unsigned long inactive; @@ -1302,7 +1301,6 @@ void show_free_areas(void) } } - get_page_state(&ps); get_zone_counts(&active, &inactive, &free); printk("Free pages: %11ukB (%ukB HighMem)\n", @@ -1315,7 +1313,7 @@ void show_free_areas(void) inactive, global_page_state(NR_FILE_DIRTY), global_page_state(NR_WRITEBACK), - ps.nr_unstable, + global_page_state(NR_UNSTABLE_NFS), nr_free_pages(), global_page_state(NR_SLAB), global_page_state(NR_FILE_MAPPED), diff -puN mm/page-writeback.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter mm/page-writeback.c --- 25/mm/page-writeback.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/mm/page-writeback.c Tue Jun 27 15:22:59 2006 @@ -110,7 +110,7 @@ struct writeback_state static void get_writeback_state(struct writeback_state *wbs) { wbs->nr_dirty = global_page_state(NR_FILE_DIRTY); - wbs->nr_unstable = read_page_state(nr_unstable); + wbs->nr_unstable = global_page_state(NR_UNSTABLE_NFS); wbs->nr_mapped = global_page_state(NR_FILE_MAPPED) + global_page_state(NR_ANON_PAGES); wbs->nr_writeback = global_page_state(NR_WRITEBACK); diff -puN mm/vmstat.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter mm/vmstat.c --- 25/mm/vmstat.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter Tue Jun 27 15:22:59 2006 +++ 25-akpm/mm/vmstat.c Tue Jun 27 15:22:59 2006 @@ -401,10 +401,9 @@ static char *vmstat_text[] = { "nr_page_table_pages", "nr_dirty", "nr_writeback", - - /* Page state */ "nr_unstable", + /* Event counters */ "pgpgin", "pgpgout", "pswpin", _