The patch titled
zoned vm counters: conversion of nr_unstable to per zone counter
has been added to the -mm tree. Its filename is
zoned-vm-counters-conversion-of-nr_unstable-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_unstable to per zone counter
From: Christoph Lameter <clameter@xxxxxxx>
Conversion of nr_unstable to a per zone counter
Avoids looping over processor to establish writeback state.
This converts the last critical page state for the VM and therefore
GET_PAGE_STATE_LAST becomes invalid. The next patch is needed to make the
kernel compile again.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/base/node.c | 2 ++
fs/fs-writeback.c | 2 +-
fs/nfs/write.c | 6 ++----
include/linux/mmzone.h | 1 +
include/linux/page-flags.h | 3 +--
mm/page-writeback.c | 2 +-
mm/page_alloc.c | 8 ++++----
7 files changed, 12 insertions(+), 12 deletions(-)
diff -puN drivers/base/node.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter drivers/base/node.c
--- devel/drivers/base/node.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter 2006-06-09 02:49:47.000000000 -0700
+++ devel-akpm/drivers/base/node.c 2006-06-09 02:49:47.000000000 -0700
@@ -66,6 +66,7 @@ static ssize_t node_read_meminfo(struct
"Node %d LowFree: %8lu kB\n"
"Node %d Dirty: %8lu kB\n"
"Node %d Writeback: %8lu kB\n"
+ "Node %d Unstable: %8lu kB\n"
"Node %d Mapped: %8lu kB\n"
"Node %d Pagecache: %8lu kB\n"
"Node %d Slab: %8lu kB\n",
@@ -80,6 +81,7 @@ static ssize_t node_read_meminfo(struct
nid, K(i.freeram - i.freehigh),
nid, K(nr[NR_DIRTY]),
nid, K(nr[NR_WRITEBACK]),
+ nid, K(nr[NR_UNSTABLE]),
nid, K(nr[NR_MAPPED]),
nid, K(nr[NR_PAGECACHE]),
nid, K(nr[NR_SLAB]));
diff -puN fs/fs-writeback.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter fs/fs-writeback.c
--- devel/fs/fs-writeback.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter 2006-06-09 02:49:47.000000000 -0700
+++ devel-akpm/fs/fs-writeback.c 2006-06-09 02:49:47.000000000 -0700
@@ -465,7 +465,7 @@ void sync_inodes_sb(struct super_block *
.range_end = LLONG_MAX,
};
unsigned long nr_dirty = global_page_state(NR_DIRTY);
- unsigned long nr_unstable = read_page_state(nr_unstable);
+ unsigned long nr_unstable = global_page_state(NR_UNSTABLE);
wbc.nr_to_write = nr_dirty + nr_unstable +
(inodes_stat.nr_inodes - inodes_stat.nr_unused) +
diff -puN fs/nfs/write.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter fs/nfs/write.c
--- devel/fs/nfs/write.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter 2006-06-09 02:49:47.000000000 -0700
+++ devel-akpm/fs/nfs/write.c 2006-06-09 02:49:47.000000000 -0700
@@ -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);
mark_inode_dirty(inode);
}
#endif
@@ -1382,7 +1382,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);
@@ -1420,9 +1419,8 @@ static void nfs_commit_done(struct rpc_t
nfs_mark_request_dirty(req);
next:
nfs_clear_page_writeback(req);
- res++;
+ dec_zone_page_state(req->wb_page, NR_UNSTABLE);
}
- sub_page_state(nr_unstable,res);
}
static const struct rpc_call_ops nfs_commit_ops = {
diff -puN include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter include/linux/mmzone.h
--- devel/include/linux/mmzone.h~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter 2006-06-09 02:49:47.000000000 -0700
+++ devel-akpm/include/linux/mmzone.h 2006-06-09 02:49:47.000000000 -0700
@@ -54,6 +54,7 @@ enum zone_stat_item {
NR_PAGETABLE, /* used for pagetables */
NR_DIRTY,
NR_WRITEBACK,
+ NR_UNSTABLE, /* NFS unstable pages */
NR_STAT_ITEMS };
#ifdef CONFIG_SMP
diff -puN include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter include/linux/page-flags.h
--- devel/include/linux/page-flags.h~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter 2006-06-09 02:49:47.000000000 -0700
+++ devel-akpm/include/linux/page-flags.h 2006-06-09 02:49:47.000000000 -0700
@@ -117,8 +117,7 @@
* commented here.
*/
struct page_state {
- unsigned long nr_unstable; /* NFS unstable pages */
-#define GET_PAGE_STATE_LAST nr_unstable
+#define GET_PAGE_STATE_LAST xxx
/*
* The below are zeroed by get_page_state(). Use get_full_page_state()
diff -puN mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter mm/page_alloc.c
--- devel/mm/page_alloc.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter 2006-06-09 02:49:47.000000000 -0700
+++ devel-akpm/mm/page_alloc.c 2006-06-09 02:49:47.000000000 -0700
@@ -614,7 +614,8 @@ static int rmqueue_bulk(struct zone *zon
}
char *vm_stat_item_descr[NR_STAT_ITEMS] = {
- "mapped", "pagecache", "slab", "pagetable", "dirty", "writeback"
+ "mapped", "pagecache", "slab", "pagetable", "dirty", "writeback",
+ "unstable"
};
/*
@@ -1721,7 +1722,7 @@ void show_free_areas(void)
inactive,
global_page_state(NR_DIRTY),
global_page_state(NR_WRITEBACK),
- ps.nr_unstable,
+ global_page_state(NR_UNSTABLE),
nr_free_pages(),
global_page_state(NR_SLAB),
global_page_state(NR_MAPPED),
@@ -2718,10 +2719,9 @@ static char *vmstat_text[] = {
"nr_page_table_pages",
"nr_dirty",
"nr_writeback",
-
- /* Page state */
"nr_unstable",
+ /* Page state */
"pgpgin",
"pgpgout",
"pswpin",
diff -puN mm/page-writeback.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter mm/page-writeback.c
--- devel/mm/page-writeback.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter 2006-06-09 02:49:47.000000000 -0700
+++ devel-akpm/mm/page-writeback.c 2006-06-09 02:49:47.000000000 -0700
@@ -110,7 +110,7 @@ struct writeback_state
static void get_writeback_state(struct writeback_state *wbs)
{
wbs->nr_dirty = global_page_state(NR_DIRTY);
- wbs->nr_unstable = read_page_state(nr_unstable);
+ wbs->nr_unstable = global_page_state(NR_UNSTABLE);
wbs->nr_mapped = global_page_state(NR_MAPPED);
wbs->nr_writeback = global_page_state(NR_WRITEBACK);
}
_
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
