From: Christoph Lameter <clameter@sgi.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org, Con Kolivas <kernel@kolivas.org>,
Christoph Lameter <clameter@sgi.com>,
Trond Myklebust <trond.myklebust@fys.uio.no>,
Dave Chinner <dgc@sgi.com>
Subject: [PATCH 18/21] Conversion of nr_unstable to per zone counter
Date: Tue, 13 Jun 2006 18:04:11 -0700 (PDT) [thread overview]
Message-ID: <20060614010411.859.99305.sendpatchset@schroedinger.engr.sgi.com> (raw)
In-Reply-To: <20060614010238.859.4228.sendpatchset@schroedinger.engr.sgi.com>
Subject: zoned vm counters: conversion of nr_unstable to per zone counter
From: Christoph Lameter <clameter@sgi.com>
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. Needs to be
reviewed by one familiar with NFS.
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 <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Index: linux-2.6.17-rc6-cl/drivers/base/node.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/drivers/base/node.c 2006-06-13 11:25:40.987179436 -0700
+++ linux-2.6.17-rc6-cl/drivers/base/node.c 2006-06-13 11:25:43.386444670 -0700
@@ -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 Anonymous: %8lu kB\n"
"Node %d PageTables: %8lu kB\n"
+ "Node %d 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_MAPPED)),
nid, K(node_page_state(nid, NR_ANON)),
nid, K(node_page_state(nid, NR_PAGETABLE)),
+ nid, K(node_page_state(nid, NR_UNSTABLE)),
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/fs/fs-writeback.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/fs/fs-writeback.c 2006-06-13 11:25:38.014707571 -0700
+++ linux-2.6.17-rc6-cl/fs/fs-writeback.c 2006-06-13 11:25:43.387421172 -0700
@@ -473,7 +473,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) +
Index: linux-2.6.17-rc6-cl/fs/nfs/write.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/fs/nfs/write.c 2006-06-13 11:25:38.016660575 -0700
+++ linux-2.6.17-rc6-cl/fs/nfs/write.c 2006-06-13 11:25:43.388397674 -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);
@@ -1419,10 +1418,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_clear_page_writeback(req);
- res++;
}
- sub_page_state(nr_unstable,res);
}
static const struct rpc_call_ops nfs_commit_ops = {
Index: linux-2.6.17-rc6-cl/include/linux/mmzone.h
===================================================================
--- linux-2.6.17-rc6-cl.orig/include/linux/mmzone.h 2006-06-13 11:25:40.989132440 -0700
+++ linux-2.6.17-rc6-cl/include/linux/mmzone.h 2006-06-13 11:25:43.389374176 -0700
@@ -55,6 +55,7 @@ enum zone_stat_item {
NR_PAGETABLE, /* used for pagetables */
NR_DIRTY,
NR_WRITEBACK,
+ NR_UNSTABLE, /* NFS unstable pages */
NR_VM_ZONE_STAT_ITEMS };
struct per_cpu_pages {
Index: linux-2.6.17-rc6-cl/mm/page_alloc.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/page_alloc.c 2006-06-13 11:25:40.991085444 -0700
+++ linux-2.6.17-rc6-cl/mm/page_alloc.c 2006-06-13 11:25:43.391327180 -0700
@@ -1361,7 +1361,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;
@@ -1393,7 +1392,6 @@ void show_free_areas(void)
}
}
- get_page_state(&ps);
get_zone_counts(&active, &inactive, &free);
printk("Free pages: %11ukB (%ukB HighMem)\n",
@@ -1406,7 +1404,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),
Index: linux-2.6.17-rc6-cl/mm/page-writeback.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/page-writeback.c 2006-06-13 11:25:40.992061946 -0700
+++ linux-2.6.17-rc6-cl/mm/page-writeback.c 2006-06-13 11:25:43.391327180 -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) +
global_page_state(NR_ANON);
wbs->nr_writeback = global_page_state(NR_WRITEBACK);
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-13 11:25:40.988155938 -0700
+++ linux-2.6.17-rc6-cl/fs/proc/proc_misc.c 2006-06-13 11:26:17.045489603 -0700
@@ -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"
+ "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_MAPPED)),
K(global_page_state(NR_SLAB)),
K(global_page_state(NR_PAGETABLE)),
+ K(global_page_state(NR_UNSTABLE)),
K(allowed),
K(committed),
(unsigned long)VMALLOC_TOTAL >> 10,
Index: linux-2.6.17-rc6-cl/mm/vmstat.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/vmstat.c 2006-06-13 11:25:40.992061946 -0700
+++ linux-2.6.17-rc6-cl/mm/vmstat.c 2006-06-13 11:25:43.393280184 -0700
@@ -464,10 +464,9 @@ static char *vmstat_text[] = {
"nr_page_table_pages",
"nr_dirty",
"nr_writeback",
-
- /* Page state */
"nr_unstable",
+ /* Event counters */
"pgpgin",
"pgpgout",
"pswpin",
Index: linux-2.6.17-rc6-cl/fs/nfs/pagelist.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/fs/nfs/pagelist.c 2006-06-13 11:25:38.015684073 -0700
+++ linux-2.6.17-rc6-cl/fs/nfs/pagelist.c 2006-06-13 12:36:29.387269828 -0700
@@ -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);
page_cache_release(page);
req->wb_page = NULL;
}
next prev parent reply other threads:[~2006-06-14 1:06 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-14 1:02 [PATCH 00/21] Zoned VM counters V4 Christoph Lameter
2006-06-14 1:02 ` [PATCH 01/21] Create vmstat.c/.h from page_alloc.c/.h Christoph Lameter
2006-06-14 1:02 ` [PATCH 02/21] Basic ZVC (zoned vm counter) implementation Christoph Lameter
2006-06-14 1:02 ` [PATCH 03/21] Convert nr_mapped to per zone counter Christoph Lameter
2006-06-14 1:02 ` [PATCH 04/21] swap_prefetch: Convert nr_mapped to ZVC Christoph Lameter
2006-06-14 1:03 ` [PATCH 05/21] Conversion of nr_pagecache to per zone counter Christoph Lameter
2006-06-14 1:03 ` [PATCH 06/21] Remove nr_mapped from scan controls structure Christoph Lameter
2006-06-14 1:03 ` [PATCH 07/21] Split NR_ANON off from NR_MAPPED Christoph Lameter
2006-06-14 1:03 ` [PATCH 08/21] swap_prefetch: Split NR_ANON off NR_MAPPED Christoph Lameter
2006-06-14 1:03 ` [PATCH 09/21] zone_reclaim: remove /proc/sys/vm/zone_reclaim_interval Christoph Lameter
2006-06-14 1:03 ` [PATCH 10/21] Conversion of nr_slab to per zone counter Christoph Lameter
2006-06-14 1:03 ` [PATCH 11/21] swap_prefetch: Conversion of nr_slab to ZVC Christoph Lameter
2006-06-14 1:03 ` [PATCH 12/21] Conversion of nr_pagetables to per zone counter Christoph Lameter
2006-06-14 1:03 ` [PATCH 13/21] Conversion of nr_dirty " Christoph Lameter
2006-06-14 1:03 ` [PATCH 14/21] swap_prefetch: Conversion of nr_dirty to ZVC Christoph Lameter
2006-06-14 1:03 ` [PATCH 15/21] reiser4: Conversiion " Christoph Lameter
2006-06-14 1:04 ` [PATCH 16/21] Conversion of nr_writeback to per zone counter Christoph Lameter
2006-06-14 1:04 ` [PATCH 17/21] swap_prefetch: Conversion of nr_writeback to ZVC Christoph Lameter
2006-06-14 1:04 ` Christoph Lameter [this message]
2006-06-14 1:04 ` [PATCH 19/21] swap_prefetch: Conversion of nr_unstable " Christoph Lameter
2006-06-14 1:04 ` [PATCH 20/21] Conversion of nr_bounce to per zone counter Christoph Lameter
2006-06-14 1:04 ` [PATCH 21/21] Remove useless struct wbs Christoph Lameter
-- strict thread matches above, loose matches on Subject: below --
2006-06-12 21:12 [PATCH 00/21] Zoned VM counters V3 Christoph Lameter
2006-06-12 21:14 ` [PATCH 18/21] Conversion of nr_unstable to per zone counter Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060614010411.859.99305.sendpatchset@schroedinger.engr.sgi.com \
--to=clameter@sgi.com \
--cc=akpm@osdl.org \
--cc=dgc@sgi.com \
--cc=kernel@kolivas.org \
--cc=linux-kernel@vger.kernel.org \
--cc=trond.myklebust@fys.uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox