From: Christoph Lameter <clameter@sgi.com>
From: Christoph Lameter <clameter@sgi.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org, Hugh Dickins <hugh@veritas.com>,
Con Kolivas <kernel@kolivas.org>,
Marcelo Tosatti <marcelo@kvack.org>,
Nick Piggin <nickpiggin@yahoo.com.au>,
linux-mm@kvack.org, Andi Kleen <ak@suse.de>,
Dave Chinner <dgc@sgi.com>, Christoph Lameter <clameter@sgi.com>
Subject: [PATCH 16/21] Conversion of nr_writeback to per zone counter
Subject: zoned vm counters: conversion of nr_writeback to per zone counter
Date: Mon, 12 Jun 2006 14:14:07 -0700 (PDT) [thread overview]
Message-ID: <20060612211407.20862.42200.sendpatchset@schroedinger.engr.sgi.com> (raw)
In-Reply-To: <20060612211244.20862.41106.sendpatchset@schroedinger.engr.sgi.com>
Conversion of nr_writeback to per zone counter.
This removes the last page_state counter from arch/i386/mm/pgtable.c
so we drop the page_state from there.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
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:52.201905469 -0700
+++ linux-2.6.17-rc6-cl/arch/i386/mm/pgtable.c 2006-06-12 13:03:04.914008833 -0700
@@ -30,7 +30,6 @@ void show_mem(void)
struct page *page;
pg_data_t *pgdat;
unsigned long i;
- struct page_state ps;
unsigned long flags;
printk(KERN_INFO "Mem-info:\n");
@@ -58,9 +57,8 @@ void show_mem(void)
printk(KERN_INFO "%d pages shared\n", shared);
printk(KERN_INFO "%d pages swap cached\n", cached);
- get_page_state(&ps);
printk(KERN_INFO "%lu pages dirty\n", global_page_state(NR_DIRTY));
- printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);
+ printk(KERN_INFO "%lu pages writeback\n", global_page_state(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", global_page_state(NR_PAGETABLE));
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:52.202881971 -0700
+++ linux-2.6.17-rc6-cl/drivers/base/node.c 2006-06-12 13:03:04.914985335 -0700
@@ -49,9 +49,6 @@ static ssize_t node_read_meminfo(struct
get_page_state_node(&ps, nid);
__get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
- /* Check for negative values in these approximate counters */
- if ((long)ps.nr_writeback < 0)
- ps.nr_writeback = 0;
n = sprintf(buf, "\n"
"Node %d MemTotal: %8lu kB\n"
@@ -80,7 +77,7 @@ static ssize_t node_read_meminfo(struct
nid, K(i.totalram - i.totalhigh),
nid, K(i.freeram - i.freehigh),
nid, K(node_page_state(nid, NR_DIRTY)),
- nid, K(ps.nr_writeback),
+ nid, K(node_page_state(nid, NR_WRITEBACK)),
nid, K(node_page_state(nid, NR_PAGECACHE)),
nid, K(node_page_state(nid, NR_MAPPED)),
nid, K(node_page_state(nid, NR_ANON)),
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:52.207764481 -0700
+++ linux-2.6.17-rc6-cl/fs/proc/proc_misc.c 2006-06-12 13:03:04.915961837 -0700
@@ -191,7 +191,7 @@ static int meminfo_read_proc(char *page,
K(i.totalswap),
K(i.freeswap),
K(global_page_state(NR_DIRTY)),
- K(ps.nr_writeback),
+ K(global_page_state(NR_WRITEBACK)),
K(global_page_state(NR_ANON)),
K(global_page_state(NR_MAPPED)),
K(global_page_state(NR_SLAB)),
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:52.209717485 -0700
+++ linux-2.6.17-rc6-cl/include/linux/mmzone.h 2006-06-12 13:03:04.916938339 -0700
@@ -54,6 +54,7 @@ enum zone_stat_item {
NR_SLAB, /* Pages used by slab allocator */
NR_PAGETABLE, /* used for pagetables */
NR_DIRTY,
+ NR_WRITEBACK,
NR_STAT_ITEMS };
struct per_cpu_pages {
Index: linux-2.6.17-rc6-cl/include/linux/page-flags.h
===================================================================
--- linux-2.6.17-rc6-cl.orig/include/linux/page-flags.h 2006-06-12 12:43:12.081607020 -0700
+++ linux-2.6.17-rc6-cl/include/linux/page-flags.h 2006-06-12 13:03:04.917914841 -0700
@@ -176,7 +176,7 @@
do { \
if (!test_and_set_bit(PG_writeback, \
&(page)->flags)) \
- inc_page_state(nr_writeback); \
+ inc_zone_page_state(page, NR_WRITEBACK); \
} while (0)
#define TestSetPageWriteback(page) \
({ \
@@ -184,14 +184,14 @@
ret = test_and_set_bit(PG_writeback, \
&(page)->flags); \
if (!ret) \
- inc_page_state(nr_writeback); \
+ inc_zone_page_state(page, NR_WRITEBACK); \
ret; \
})
#define ClearPageWriteback(page) \
do { \
if (test_and_clear_bit(PG_writeback, \
&(page)->flags)) \
- dec_page_state(nr_writeback); \
+ dec_zone_page_state(page, NR_WRITEBACK); \
} while (0)
#define TestClearPageWriteback(page) \
({ \
@@ -199,7 +199,7 @@
ret = test_and_clear_bit(PG_writeback, \
&(page)->flags); \
if (ret) \
- dec_page_state(nr_writeback); \
+ dec_zone_page_state(page, NR_WRITEBACK); \
ret; \
})
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:52.210693987 -0700
+++ linux-2.6.17-rc6-cl/mm/page_alloc.c 2006-06-12 13:03:04.919867845 -0700
@@ -1405,7 +1405,7 @@ void show_free_areas(void)
active,
inactive,
global_page_state(NR_DIRTY),
- ps.nr_writeback,
+ global_page_state(NR_WRITEBACK),
ps.nr_unstable,
nr_free_pages(),
global_page_state(NR_SLAB),
Index: linux-2.6.17-rc6-cl/mm/page-writeback.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/page-writeback.c 2006-06-12 13:02:52.211670489 -0700
+++ linux-2.6.17-rc6-cl/mm/page-writeback.c 2006-06-12 13:03:04.919867845 -0700
@@ -113,7 +113,7 @@ static void get_writeback_state(struct w
wbs->nr_unstable = read_page_state(nr_unstable);
wbs->nr_mapped = global_page_state(NR_MAPPED) +
global_page_state(NR_ANON);
- wbs->nr_writeback = read_page_state(nr_writeback);
+ wbs->nr_writeback = global_page_state(NR_WRITEBACK);
}
/*
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:58.922192406 -0700
+++ linux-2.6.17-rc6-cl/mm/vmstat.c 2006-06-12 13:03:12.036614604 -0700
@@ -469,9 +469,9 @@ static char *vmstat_text[] = {
"nr_slab",
"nr_page_table_pages",
"nr_dirty",
+ "nr_writeback",
/* Page state */
- "nr_writeback",
"nr_unstable",
"pgpgin",
--
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>
next prev parent reply other threads:[~2006-06-12 21:14 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-12 21:12 [PATCH 00/21] Zoned VM counters V3 Christoph Lameter
2006-06-12 21:12 ` [PATCH 01/21] Create vmstat.c/.h from page_alloc.c/.h Christoph Lameter
2006-06-12 21:12 ` [PATCH 02/21] Basic ZVC (zoned vm counter) implementation, zoned vm counters: per zone counter functionality Christoph Lameter, Christoph Lameter
2006-06-13 5:37 ` Nick Piggin
2006-06-13 15:55 ` Christoph Lameter
2006-06-14 1:21 ` Nick Piggin
2006-06-14 5:37 ` Hugh Dickins
2006-06-14 5:53 ` Andi Kleen
2006-06-14 16:14 ` Christoph Lameter
2006-06-12 21:13 ` [PATCH 03/21] Convert nr_mapped to per zone counter, zoned vm counters: conversion of nr_mapped to per zone counter Christoph Lameter, Christoph Lameter
2006-06-12 21:13 ` [PATCH 04/21] swap_prefetch: Convert nr_mapped to ZVC Christoph Lameter
2006-06-12 23:36 ` Con Kolivas
2006-06-12 21:13 ` [PATCH 05/21] Conversion of nr_pagecache to per zone counter, zoned vm counters: conversion of nr_pagecache to per zone counter Christoph Lameter, Christoph Lameter
2006-06-12 21:13 ` [PATCH 06/21] Remove nr_mapped from scan controls structure, zoned VM stats: Remove nr_mapped from scan control Christoph Lameter, Christoph Lameter
2006-06-12 21:13 ` [PATCH 07/21] Split NR_ANON off from NR_MAPPED, zoned VM stats: Add NR_ANON Christoph Lameter, Christoph Lameter
2006-06-12 21:13 ` [PATCH 08/21] swap_prefetch: Split NR_ANON off NR_MAPPED Christoph Lameter
2006-06-12 23:36 ` Con Kolivas
2006-06-12 21:13 ` [PATCH 09/21] zone_reclaim: remove /proc/sys/vm/zone_reclaim_interval, zoned vm counters: use per zone counters to remove zone_reclaim_interval Christoph Lameter, Christoph Lameter
2006-06-12 21:13 ` [PATCH 10/21] Conversion of nr_slab to per zone counter, zoned vm counters: conversion of nr_slab to per zone counter Christoph Lameter, Christoph Lameter
2006-06-12 21:13 ` [PATCH 11/21] swap_prefetch: Conversion of nr_slab to ZVC Christoph Lameter
2006-06-12 21:13 ` [PATCH 12/21] Conversion of nr_pagetables to per zone counter, zoned vm counters: conversion of nr_pagetable to per zone counter Christoph Lameter, Christoph Lameter
2006-06-12 21:13 ` [PATCH 13/21] Conversion of nr_dirty to per zone counter, zoned vm counters: conversion of nr_dirty " Christoph Lameter, Christoph Lameter
2006-06-12 21:13 ` [PATCH 14/21] swap_prefetch: Conversion of nr_dirty to ZVC Christoph Lameter
2006-06-12 23:38 ` Con Kolivas
2006-06-12 21:14 ` [PATCH 15/21] reiser4: Conversiion of nr_dirty to ZVC, reiser4: conversion of nr_dirty to per zone counter Christoph Lameter, Christoph Lameter
2006-06-12 21:14 ` Christoph Lameter, Christoph Lameter [this message]
2006-06-12 21:14 ` [PATCH 17/21] swap_prefetch: Conversion of nr_writeback to ZVC, swap_prefetch: conversion of nr_writeback " Christoph Lameter, Christoph Lameter
2006-06-12 23:38 ` [PATCH 17/21] swap_prefetch: Conversion of nr_writeback to ZVC Con Kolivas
2006-06-12 21:14 ` [PATCH 18/21] Conversion of nr_unstable to per zone counter, zoned vm counters: conversion of nr_unstable to per zone counter Christoph Lameter, Christoph Lameter
2006-06-12 21:14 ` [PATCH 19/21] swap_prefetch: Conversion of nr_unstable to ZVC, swap_prefetch: " Christoph Lameter, Christoph Lameter
2006-06-12 23:40 ` [PATCH 19/21] swap_prefetch: Conversion of nr_unstable to ZVC Con Kolivas
2006-06-12 23:48 ` Christoph Lameter
2006-06-12 23:57 ` Con Kolivas
2006-06-12 23:59 ` Con Kolivas
2006-06-13 0:08 ` Christoph Lameter
2006-06-13 0:19 ` Con Kolivas
2006-06-12 21:14 ` [PATCH 20/21] Conversion of nr_bounce to per zone counter, zoned vm counters: conversion of nr_bounce to per zone counter Christoph Lameter, Christoph Lameter
2006-06-12 21:14 ` [PATCH 21/21] Remove useless struct wbs, zoned vm counters: remove useless writeback structure Christoph Lameter, 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=20060612211407.20862.42200.sendpatchset@schroedinger.engr.sgi.com \
--to=clameter@sgi.com \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=dgc@sgi.com \
--cc=hugh@veritas.com \
--cc=kernel@kolivas.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=marcelo@kvack.org \
--cc=nickpiggin@yahoo.com.au \
/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