The patch titled
zoned vm counters: conversion of nr_mapped to per zone counter
has been added to the -mm tree. Its filename is
zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: zoned vm counters: conversion of nr_mapped to per zone counter
From: Christoph Lameter <clameter@xxxxxxx>
Conversion of nr_mapped to a per zone counter
nr_mapped is important because it allows a determination how many pages of a
zone are not mapped, which would allow a more efficient means of determining
when we need to reclaim memory in a zone.
We take the nr_mapped field out of the page state structure and define a new
per zone counter named NR_MAPPED.
We replace the use of nr_mapped in various kernel locations. This avoids the
looping over all processors in try_to_free_pages(), writeback, reclaim (swap +
zone reclaim).
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mm/pgtable.c | 2 +-
drivers/base/node.c | 6 +++---
fs/proc/proc_misc.c | 2 +-
include/linux/mmzone.h | 3 +++
include/linux/page-flags.h | 2 --
mm/page-writeback.c | 2 +-
mm/page_alloc.c | 4 ++--
mm/rmap.c | 6 +++---
mm/vmscan.c | 8 ++++----
9 files changed, 18 insertions(+), 17 deletions(-)
diff -puN arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter arch/i386/mm/pgtable.c
--- devel/arch/i386/mm/pgtable.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/arch/i386/mm/pgtable.c 2006-06-09 02:49:31.000000000 -0700
@@ -61,7 +61,7 @@ void show_mem(void)
get_page_state(&ps);
printk(KERN_INFO "%lu pages dirty\n", ps.nr_dirty);
printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);
- printk(KERN_INFO "%lu pages mapped\n", ps.nr_mapped);
+ printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_MAPPED));
printk(KERN_INFO "%lu pages slab\n", ps.nr_slab);
printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);
}
diff -puN drivers/base/node.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter drivers/base/node.c
--- devel/drivers/base/node.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/drivers/base/node.c 2006-06-09 02:49:31.000000000 -0700
@@ -44,18 +44,18 @@ static ssize_t node_read_meminfo(struct
unsigned long inactive;
unsigned long active;
unsigned long free;
+ unsigned long nr_mapped;
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);
/* Check for negative values in these approximate counters */
if ((long)ps.nr_dirty < 0)
ps.nr_dirty = 0;
if ((long)ps.nr_writeback < 0)
ps.nr_writeback = 0;
- if ((long)ps.nr_mapped < 0)
- ps.nr_mapped = 0;
if ((long)ps.nr_slab < 0)
ps.nr_slab = 0;
@@ -84,7 +84,7 @@ 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(ps.nr_mapped),
+ nid, K(nr_mapped),
nid, K(ps.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_mapped-to-per-zone-counter fs/proc/proc_misc.c
--- devel/fs/proc/proc_misc.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/fs/proc/proc_misc.c 2006-06-09 02:49:31.000000000 -0700
@@ -190,7 +190,7 @@ static int meminfo_read_proc(char *page,
K(i.freeswap),
K(ps.nr_dirty),
K(ps.nr_writeback),
- K(ps.nr_mapped),
+ K(global_page_state(NR_MAPPED)),
K(ps.nr_slab),
K(allowed),
K(committed),
diff -puN include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter include/linux/mmzone.h
--- devel/include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/include/linux/mmzone.h 2006-06-09 02:49:31.000000000 -0700
@@ -47,6 +47,9 @@ struct zone_padding {
#endif
enum zone_stat_item {
+ NR_MAPPED, /* mapped into pagetables.
+ only modified from process context */
+
NR_STAT_ITEMS };
#ifdef CONFIG_SMP
diff -puN include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter include/linux/page-flags.h
--- devel/include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/include/linux/page-flags.h 2006-06-09 02:49:31.000000000 -0700
@@ -121,8 +121,6 @@ struct page_state {
unsigned long nr_writeback; /* Pages under writeback */
unsigned long nr_unstable; /* NFS unstable pages */
unsigned long nr_page_table_pages;/* Pages used for pagetables */
- unsigned long nr_mapped; /* mapped into pagetables.
- * only modified from process context */
unsigned long nr_slab; /* In slab */
#define GET_PAGE_STATE_LAST nr_slab
diff -puN mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter mm/page_alloc.c
--- devel/mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/mm/page_alloc.c 2006-06-09 02:49:31.000000000 -0700
@@ -1726,7 +1726,7 @@ void show_free_areas(void)
ps.nr_unstable,
nr_free_pages(),
ps.nr_slab,
- ps.nr_mapped,
+ global_page_state(NR_MAPPED),
ps.nr_page_table_pages);
for_each_zone(zone) {
@@ -2709,13 +2709,13 @@ struct seq_operations zoneinfo_op = {
static char *vmstat_text[] = {
/* Zoned VM counters */
+ "nr_mapped",
/* Page state */
"nr_dirty",
"nr_writeback",
"nr_unstable",
"nr_page_table_pages",
- "nr_mapped",
"nr_slab",
"pgpgin",
diff -puN mm/page-writeback.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter mm/page-writeback.c
--- devel/mm/page-writeback.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/mm/page-writeback.c 2006-06-09 02:49:31.000000000 -0700
@@ -111,7 +111,7 @@ static void get_writeback_state(struct w
{
wbs->nr_dirty = read_page_state(nr_dirty);
wbs->nr_unstable = read_page_state(nr_unstable);
- wbs->nr_mapped = read_page_state(nr_mapped);
+ wbs->nr_mapped = global_page_state(NR_MAPPED);
wbs->nr_writeback = read_page_state(nr_writeback);
}
diff -puN mm/rmap.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter mm/rmap.c
--- devel/mm/rmap.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/mm/rmap.c 2006-06-09 02:49:31.000000000 -0700
@@ -455,7 +455,7 @@ static void __page_set_anon_rmap(struct
* nr_mapped state can be updated without turning off
* interrupts because it is not modified via interrupt.
*/
- __inc_page_state(nr_mapped);
+ __inc_zone_page_state(page, NR_MAPPED);
}
/**
@@ -499,7 +499,7 @@ void page_add_new_anon_rmap(struct page
void page_add_file_rmap(struct page *page)
{
if (atomic_inc_and_test(&page->_mapcount))
- __inc_page_state(nr_mapped);
+ __inc_zone_page_state(page, NR_MAPPED);
}
/**
@@ -531,7 +531,7 @@ void page_remove_rmap(struct page *page)
*/
if (page_test_and_clear_dirty(page))
set_page_dirty(page);
- __dec_page_state(nr_mapped);
+ __dec_zone_page_state(page, NR_MAPPED);
}
}
diff -puN mm/vmscan.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter mm/vmscan.c
--- devel/mm/vmscan.c~zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter 2006-06-09 02:49:31.000000000 -0700
+++ devel-akpm/mm/vmscan.c 2006-06-09 02:49:31.000000000 -0700
@@ -990,7 +990,7 @@ unsigned long try_to_free_pages(struct z
}
for (priority = DEF_PRIORITY; priority >= 0; priority--) {
- sc.nr_mapped = read_page_state(nr_mapped);
+ sc.nr_mapped = global_page_state(NR_MAPPED);
sc.nr_scanned = 0;
if (!priority)
disable_swap_token();
@@ -1075,7 +1075,7 @@ loop_again:
total_scanned = 0;
nr_reclaimed = 0;
sc.may_writepage = !laptop_mode,
- sc.nr_mapped = read_page_state(nr_mapped);
+ sc.nr_mapped = global_page_state(NR_MAPPED);
inc_page_state(pageoutrun);
@@ -1408,7 +1408,7 @@ unsigned long shrink_all_memory(unsigned
for (prio = DEF_PRIORITY; prio >= 0; prio--) {
unsigned long nr_to_scan = nr_pages - ret;
- sc.nr_mapped = read_page_state(nr_mapped);
+ sc.nr_mapped = global_page_state(NR_MAPPED);
sc.nr_scanned = 0;
ret += shrink_all_zones(nr_to_scan, prio, pass, &sc);
@@ -1550,7 +1550,7 @@ static int __zone_reclaim(struct zone *z
struct scan_control sc = {
.may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE),
.may_swap = !!(zone_reclaim_mode & RECLAIM_SWAP),
- .nr_mapped = read_page_state(nr_mapped),
+ .nr_mapped = global_page_state(NR_MAPPED),
.swap_cluster_max = max_t(unsigned long, nr_pages,
SWAP_CLUSTER_MAX),
.gfp_mask = gfp_mask,
_
Patches currently in -mm which might be from clameter@xxxxxxx are
page-migration-make-do_swap_page-redo-the-fault.patch
slab-extract-cache_free_alien-from-__cache_free.patch
migration-remove-unnecessary-pageswapcache-checks.patch
page-migration-cleanup-rename-ignrefs-to-migration.patch
page-migration-cleanup-group-functions.patch
page-migration-cleanup-remove-useless-definitions.patch
page-migration-cleanup-drop-nr_refs-in-remove_references.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch
page-migration-cleanup-pass-mapping-to-migration-functions.patch
page-migration-cleanup-move-fallback-handling-into-special-function.patch
swapless-pm-add-r-w-migration-entries.patch
swapless-page-migration-rip-out-swap-based-logic.patch
swapless-page-migration-modify-core-logic.patch
more-page-migration-do-not-inc-dec-rss-counters.patch
more-page-migration-use-migration-entries-for-file-pages.patch
page-migration-update-documentation.patch
mm-remove-vm_locked-before-remap_pfn_range-and-drop-vm_shm.patch
page-migration-simplify-migrate_pages.patch
page-migration-simplify-migrate_pages-tweaks.patch
page-migration-handle-freeing-of-pages-in-migrate_pages.patch
page-migration-use-allocator-function-for-migrate_pages.patch
page-migration-support-moving-of-individual-pages.patch
page-migration-detailed-status-for-moving-of-individual-pages.patch
page-migration-support-moving-of-individual-pages-fixes.patch
page-migration-support-moving-of-individual-pages-x86_64-support.patch
page-migration-support-moving-of-individual-pages-x86-support.patch
page-migration-support-a-vma-migration-function.patch
allow-migration-of-mlocked-pages.patch
zoned-vm-counters-per-zone-counter-functionality.patch
zoned-vm-counters-include-per-zone-counters-in-proc-vmstat.patch
zoned-vm-counters-conversion-of-nr_mapped-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_pagecache-to-per-zone-counter.patch
zoned-vm-counters-use-per-zone-counters-to-remove-zone_reclaim_interval.patch
zoned-vm-counters-add-per-zone-counters-to-zone-node-and-global-vm-statistics.patch
zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_pagetable-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_dirty-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter.patch
zoned-vm-counters-remove-unused-get_page_stat-functions.patch
zoned-vm-counters-conversion-of-nr_bounce-to-per-zone-counter.patch
zoned-vm-counters-remove-useless-writeback-structure.patch
cpuset-remove-extra-cpuset_zone_allowed-check-in-__alloc_pages.patch
swap_prefetch-conversion-of-nr_mapped-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_slab-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_dirty-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_writeback-to-per-zone-counter.patch
swap_prefetch-conversion-of-nr_unstable-to-per-zone-counter.patch
swap_prefetch-remove-unused-get_page_stat-functions.patch
reiser4-conversion-of-nr_dirty-to-per-zone-counter.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
