From: Christoph Lameter Conversion of nr_page_table_pages to a per zone counter Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- arch/arm/mm/mm-armv.c | 2 +- arch/i386/mm/pgtable.c | 3 ++- arch/um/kernel/skas/mmu.c | 2 +- drivers/base/node.c | 2 ++ fs/proc/proc_misc.c | 4 ++-- include/linux/mmzone.h | 1 + mm/memory.c | 4 ++-- mm/page_alloc.c | 2 +- mm/vmstat.c | 2 +- 9 files changed, 13 insertions(+), 9 deletions(-) diff -puN arch/arm/mm/mm-armv.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter arch/arm/mm/mm-armv.c --- a/arch/arm/mm/mm-armv.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/arch/arm/mm/mm-armv.c @@ -227,7 +227,7 @@ void free_pgd_slow(pgd_t *pgd) pte = pmd_page(*pmd); pmd_clear(pmd); - dec_page_state(nr_page_table_pages); + dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE); pte_lock_deinit(pte); pte_free(pte); pmd_free(pmd); diff -puN arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter arch/i386/mm/pgtable.c --- a/arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/arch/i386/mm/pgtable.c @@ -63,7 +63,8 @@ void show_mem(void) printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback); printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED)); printk(KERN_INFO "%lu pages slab\n", global_page_state(NR_SLAB)); - printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages); + printk(KERN_INFO "%lu pages pagetables\n", + global_page_state(NR_PAGETABLE)); } /* diff -puN arch/um/kernel/skas/mmu.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter arch/um/kernel/skas/mmu.c --- a/arch/um/kernel/skas/mmu.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/arch/um/kernel/skas/mmu.c @@ -152,7 +152,7 @@ void destroy_context_skas(struct mm_stru free_page(mmu->id.stack); pte_lock_deinit(virt_to_page(mmu->last_page_table)); pte_free_kernel((pte_t *) mmu->last_page_table); - dec_page_state(nr_page_table_pages); + dec_zone_page_state(virt_to_page(mmu->last_page_table), NR_PAGETABLE); #ifdef CONFIG_3_LEVEL_PGTABLES pmd_free((pmd_t *) mmu->last_pmd); #endif diff -puN drivers/base/node.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter drivers/base/node.c --- a/drivers/base/node.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/drivers/base/node.c @@ -70,6 +70,7 @@ static ssize_t node_read_meminfo(struct "Node %d FilePages: %8lu kB\n" "Node %d Mapped: %8lu kB\n" "Node %d AnonPages: %8lu kB\n" + "Node %d PageTables: %8lu kB\n" "Node %d Slab: %8lu kB\n", nid, K(i.totalram), nid, K(i.freeram), @@ -85,6 +86,7 @@ static ssize_t node_read_meminfo(struct nid, K(node_page_state(nid, NR_FILE_PAGES)), 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_SLAB))); n += hugetlb_report_node_meminfo(nid, buf + n); return n; diff -puN fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter fs/proc/proc_misc.c --- a/fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/fs/proc/proc_misc.c @@ -171,9 +171,9 @@ static int meminfo_read_proc(char *page, "AnonPages: %8lu kB\n" "Mapped: %8lu kB\n" "Slab: %8lu kB\n" + "PageTables: %8lu kB\n" "CommitLimit: %8lu kB\n" "Committed_AS: %8lu kB\n" - "PageTables: %8lu kB\n" "VmallocTotal: %8lu kB\n" "VmallocUsed: %8lu kB\n" "VmallocChunk: %8lu kB\n", @@ -195,9 +195,9 @@ static int meminfo_read_proc(char *page, K(global_page_state(NR_ANON_PAGES)), K(global_page_state(NR_FILE_MAPPED)), K(global_page_state(NR_SLAB)), + K(global_page_state(NR_PAGETABLE)), K(allowed), K(committed), - K(ps.nr_page_table_pages), (unsigned long)VMALLOC_TOTAL >> 10, vmi.used >> 10, vmi.largest_chunk >> 10 diff -puN include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter include/linux/mmzone.h --- a/include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/include/linux/mmzone.h @@ -52,6 +52,7 @@ enum zone_stat_item { only modified from process context */ NR_FILE_PAGES, NR_SLAB, /* Pages used by slab allocator */ + NR_PAGETABLE, /* used for pagetables */ NR_VM_ZONE_STAT_ITEMS }; struct per_cpu_pages { diff -puN mm/memory.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter mm/memory.c --- a/mm/memory.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/mm/memory.c @@ -127,7 +127,7 @@ static void free_pte_range(struct mmu_ga pmd_clear(pmd); pte_lock_deinit(page); pte_free_tlb(tlb, page); - dec_page_state(nr_page_table_pages); + dec_zone_page_state(page, NR_PAGETABLE); tlb->mm->nr_ptes--; } @@ -312,7 +312,7 @@ int __pte_alloc(struct mm_struct *mm, pm pte_free(new); } else { mm->nr_ptes++; - inc_page_state(nr_page_table_pages); + inc_zone_page_state(new, NR_PAGETABLE); pmd_populate(mm, pmd, new); } spin_unlock(&mm->page_table_lock); diff -puN mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter mm/page_alloc.c --- a/mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/mm/page_alloc.c @@ -1320,7 +1320,7 @@ void show_free_areas(void) nr_free_pages(), global_page_state(NR_SLAB), global_page_state(NR_FILE_MAPPED), - ps.nr_page_table_pages); + global_page_state(NR_PAGETABLE)); for_each_zone(zone) { int i; diff -puN mm/vmstat.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter mm/vmstat.c --- a/mm/vmstat.c~zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter +++ a/mm/vmstat.c @@ -461,12 +461,12 @@ static char *vmstat_text[] = { "nr_mapped", "nr_file_pages", "nr_slab", + "nr_page_table_pages", /* Page state */ "nr_dirty", "nr_writeback", "nr_unstable", - "nr_page_table_pages", "pgpgin", "pgpgout", _