[PATCH 12/21] Conversion of nr_pagetables to per zone counter
From: Christoph Lameter <hidden>
Date: 2006-06-12 21:14:06
Also in:
lkml
Conversion of nr_page_table_pages to a per zone counter Signed-off-by: Christoph Lameter <redacted> Signed-off-by: Andrew Morton <redacted> Index: linux-2.6.17-rc6-cl/arch/i386/mm/pgtable.c ===================================================================
--- linux-2.6.17-rc6-cl.orig/arch/i386/mm/pgtable.c 2006-06-12 13:02:16.916004785 -0700
+++ linux-2.6.17-rc6-cl/arch/i386/mm/pgtable.c 2006-06-12 13:02:33.254836674 -0700@@ -63,7 +63,7 @@ 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_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)); } /*
Index: linux-2.6.17-rc6-cl/fs/proc/proc_misc.c ===================================================================
--- linux-2.6.17-rc6-cl.orig/fs/proc/proc_misc.c 2006-06-12 13:02:16.917957789 -0700
+++ linux-2.6.17-rc6-cl/fs/proc/proc_misc.c 2006-06-12 13:02:33.256789678 -0700@@ -197,7 +197,7 @@ static int meminfo_read_proc(char *page, K(global_page_state(NR_SLAB)), K(allowed), K(committed), - K(ps.nr_page_table_pages), + K(global_page_state(NR_PAGETABLE)), (unsigned long)VMALLOC_TOTAL >> 10, vmi.used >> 10, vmi.largest_chunk >> 10
Index: linux-2.6.17-rc6-cl/include/linux/mmzone.h ===================================================================
--- linux-2.6.17-rc6-cl.orig/include/linux/mmzone.h 2006-06-12 13:02:16.918934291 -0700
+++ linux-2.6.17-rc6-cl/include/linux/mmzone.h 2006-06-12 13:02:33.257766180 -0700@@ -52,6 +52,7 @@ enum zone_stat_item { only modified from process context */ NR_PAGECACHE, NR_SLAB, /* Pages used by slab allocator */ + NR_PAGETABLE, /* used for pagetables */ NR_STAT_ITEMS }; struct per_cpu_pages {
Index: linux-2.6.17-rc6-cl/mm/memory.c ===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/memory.c 2006-06-12 12:42:52.030113494 -0700
+++ linux-2.6.17-rc6-cl/mm/memory.c 2006-06-12 13:02:33.259719184 -0700@@ -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);
Index: linux-2.6.17-rc6-cl/mm/page_alloc.c ===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/page_alloc.c 2006-06-12 13:02:16.920887295 -0700
+++ linux-2.6.17-rc6-cl/mm/page_alloc.c 2006-06-12 13:02:33.260695686 -0700@@ -1410,7 +1410,7 @@ void show_free_areas(void) nr_free_pages(), global_page_state(NR_SLAB), global_page_state(NR_MAPPED), - ps.nr_page_table_pages); + global_page_state(NR_PAGETABLE)); for_each_zone(zone) { int i;
Index: linux-2.6.17-rc6-cl/drivers/base/node.c ===================================================================
--- linux-2.6.17-rc6-cl.orig/drivers/base/node.c 2006-06-12 13:02:16.916981287 -0700
+++ linux-2.6.17-rc6-cl/drivers/base/node.c 2006-06-12 13:02:33.261672188 -0700@@ -70,6 +70,7 @@ static ssize_t node_read_meminfo(struct "Node %d PageCache: %8lu kB\n" "Node %d Mapped: %8lu kB\n" "Node %d Anonymous: %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_PAGECACHE)), nid, K(node_page_state(nid, NR_MAPPED)), nid, K(node_page_state(nid, NR_ANON)), + 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;
Index: linux-2.6.17-rc6-cl/arch/um/kernel/skas/mmu.c ===================================================================
--- linux-2.6.17-rc6-cl.orig/arch/um/kernel/skas/mmu.c 2006-06-05 17:57:02.000000000 -0700
+++ linux-2.6.17-rc6-cl/arch/um/kernel/skas/mmu.c 2006-06-12 13:02:33.262648690 -0700@@ -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
Index: linux-2.6.17-rc6-cl/arch/arm/mm/mm-armv.c ===================================================================
--- linux-2.6.17-rc6-cl.orig/arch/arm/mm/mm-armv.c 2006-06-05 17:57:02.000000000 -0700
+++ linux-2.6.17-rc6-cl/arch/arm/mm/mm-armv.c 2006-06-12 13:02:33.263625192 -0700@@ -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);
Index: linux-2.6.17-rc6-cl/mm/vmstat.c ===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/vmstat.c 2006-06-12 13:02:26.602904877 -0700
+++ linux-2.6.17-rc6-cl/mm/vmstat.c 2006-06-12 13:02:46.391718420 -0700@@ -467,12 +467,12 @@ static char *vmstat_text[] = { "nr_pagecache", "nr_anon", "nr_slab", + "nr_page_table_pages", /* Page state */ "nr_dirty", "nr_writeback", "nr_unstable", - "nr_page_table_pages", "pgpgin", "pgpgout", --
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>