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 20/21] Conversion of nr_bounce to per zone counter
Date: Tue, 13 Jun 2006 18:04:21 -0700 (PDT) [thread overview]
Message-ID: <20060614010421.859.91283.sendpatchset@schroedinger.engr.sgi.com> (raw)
In-Reply-To: <20060614010238.859.4228.sendpatchset@schroedinger.engr.sgi.com>
Subject: zoned vm counters: conversion of nr_bounce to per zone counter
From: Christoph Lameter <clameter@sgi.com>
Conversion of nr_bounce to a per zone counter
nr_bounce is only used for proc output. So it could be left as an
event counter. However, the event counters are not accurate and nr_bounce is
categorizing types of pages in a zone. So we really need this to also be a
per zone counter.
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:43.386444670 -0700
+++ linux-2.6.17-rc6-cl/drivers/base/node.c 2006-06-13 11:26:21.881127149 -0700
@@ -65,6 +65,7 @@ static ssize_t node_read_meminfo(struct
"Node %d Anonymous: %8lu kB\n"
"Node %d PageTables: %8lu kB\n"
"Node %d Unstable: %8lu kB\n"
+ "Node %d Bounce: %8lu kB\n"
"Node %d Slab: %8lu kB\n",
nid, K(i.totalram),
nid, K(i.freeram),
@@ -82,6 +83,7 @@ static ssize_t node_read_meminfo(struct
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_BOUNCE)),
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/include/linux/mmzone.h
===================================================================
--- linux-2.6.17-rc6-cl.orig/include/linux/mmzone.h 2006-06-13 11:25:43.389374176 -0700
+++ linux-2.6.17-rc6-cl/include/linux/mmzone.h 2006-06-13 11:26:21.882103651 -0700
@@ -56,6 +56,7 @@ enum zone_stat_item {
NR_DIRTY,
NR_WRITEBACK,
NR_UNSTABLE, /* NFS unstable pages */
+ NR_BOUNCE,
NR_VM_ZONE_STAT_ITEMS };
struct per_cpu_pages {
Index: linux-2.6.17-rc6-cl/mm/highmem.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/mm/highmem.c 2006-06-05 17:57:02.000000000 -0700
+++ linux-2.6.17-rc6-cl/mm/highmem.c 2006-06-13 11:26:21.883080153 -0700
@@ -316,7 +316,7 @@ static void bounce_end_io(struct bio *bi
continue;
mempool_free(bvec->bv_page, pool);
- dec_page_state(nr_bounce);
+ dec_zone_page_state(bvec->bv_page, NR_BOUNCE);
}
bio_endio(bio_orig, bio_orig->bi_size, err);
@@ -397,7 +397,7 @@ static void __blk_queue_bounce(request_q
to->bv_page = mempool_alloc(pool, q->bounce_gfp);
to->bv_len = from->bv_len;
to->bv_offset = from->bv_offset;
- inc_page_state(nr_bounce);
+ inc_zone_page_state(to->bv_page, NR_BOUNCE);
if (rw == WRITE) {
char *vto, *vfrom;
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:43.393280184 -0700
+++ linux-2.6.17-rc6-cl/mm/vmstat.c 2006-06-13 11:26:21.883080153 -0700
@@ -465,6 +465,7 @@ static char *vmstat_text[] = {
"nr_dirty",
"nr_writeback",
"nr_unstable",
+ "nr_bounce",
/* Event counters */
"pgpgin",
@@ -512,7 +513,6 @@ static char *vmstat_text[] = {
"allocstall",
"pgrotated",
- "nr_bounce",
};
/*
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:26:17.045489603 -0700
+++ linux-2.6.17-rc6-cl/fs/proc/proc_misc.c 2006-06-13 11:26:52.629219866 -0700
@@ -171,6 +171,7 @@ static int meminfo_read_proc(char *page,
"Slab: %8lu kB\n"
"PageTables: %8lu kB\n"
"Unstable: %8lu kB\n"
+ "Bounce: %8lu kB\n"
"CommitLimit: %8lu kB\n"
"Committed_AS: %8lu kB\n"
"VmallocTotal: %8lu kB\n"
@@ -196,6 +197,7 @@ static int meminfo_read_proc(char *page,
K(global_page_state(NR_SLAB)),
K(global_page_state(NR_PAGETABLE)),
K(global_page_state(NR_UNSTABLE)),
+ K(global_page_state(NR_BOUNCE)),
K(allowed),
K(committed),
(unsigned long)VMALLOC_TOTAL >> 10,
next prev parent reply other threads:[~2006-06-14 1:07 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 ` [PATCH 18/21] Conversion of nr_unstable to per zone counter Christoph Lameter
2006-06-14 1:04 ` [PATCH 19/21] swap_prefetch: Conversion of nr_unstable to ZVC Christoph Lameter
2006-06-14 1:04 ` Christoph Lameter [this message]
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 20/21] Conversion of nr_bounce 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=20060614010421.859.91283.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