From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from imr2.americas.sgi.com (imr2.americas.sgi.com [198.149.16.18]) by omx1.americas.sgi.com (8.12.10/8.12.9/linux-outbound_gateway-1.1) with ESMTP id k5LFksnx030052 for ; Wed, 21 Jun 2006 10:46:54 -0500 Received: from spindle.corp.sgi.com (spindle.corp.sgi.com [198.29.75.13]) by imr2.americas.sgi.com (8.12.9/8.12.10/SGI_generic_relay-1.2) with ESMTP id k5LG3A7p35972658 for ; Wed, 21 Jun 2006 09:03:10 -0700 (PDT) Received: from schroedinger.engr.sgi.com (schroedinger.engr.sgi.com [163.154.5.55]) by spindle.corp.sgi.com (SGI-8.12.5/8.12.9/generic_config-1.2) with ESMTP id k5LFkrnB40052013 for ; Wed, 21 Jun 2006 08:46:53 -0700 (PDT) Received: from christoph (helo=localhost) by schroedinger.engr.sgi.com with local-esmtp (Exim 3.36 #1 (Debian)) id 1Ft4ur-0004xY-00 for ; Wed, 21 Jun 2006 08:46:53 -0700 Date: Wed, 21 Jun 2006 08:45:27 -0700 (PDT) From: Christoph Lameter Message-Id: <20060621154527.18741.94121.sendpatchset@schroedinger.engr.sgi.com> In-Reply-To: <20060621154419.18741.76233.sendpatchset@schroedinger.engr.sgi.com> References: <20060621154419.18741.76233.sendpatchset@schroedinger.engr.sgi.com> Subject: [PATCH 13/14] Conversion of nr_bounce to per zone counter ReSent-To: linux-mm@kvack.org ReSent-Message-ID: Sender: owner-linux-mm@kvack.org Subject: zoned vm counters: conversion of nr_bounce to per zone counter From: Christoph Lameter Return-Path: To: akpm@osdl.org Cc: Martin Bligh , linux-mm@vger.kernel.org, Christoph Lameter List-ID: 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 may not be 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 Signed-off-by: Andrew Morton Index: linux-2.6.17-mm1/drivers/base/node.c =================================================================== --- linux-2.6.17-mm1.orig/drivers/base/node.c 2006-06-21 08:37:27.841917388 -0700 +++ linux-2.6.17-mm1/drivers/base/node.c 2006-06-21 08:37:58.612476132 -0700 @@ -64,6 +64,7 @@ static ssize_t node_read_meminfo(struct "Node %d AnonPages: %8lu kB\n" "Node %d PageTables: %8lu kB\n" "Node %d NFS Unstable: %8lu kB\n" + "Node %d Bounce: %8lu kB\n" "Node %d Slab: %8lu kB\n", nid, K(i.totalram), nid, K(i.freeram), @@ -81,6 +82,7 @@ static ssize_t node_read_meminfo(struct nid, K(node_page_state(nid, NR_ANON_PAGES)), nid, K(node_page_state(nid, NR_PAGETABLE)), nid, K(node_page_state(nid, NR_UNSTABLE_NFS)), + 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-mm1/include/linux/mmzone.h =================================================================== --- linux-2.6.17-mm1.orig/include/linux/mmzone.h 2006-06-21 08:37:27.844846894 -0700 +++ linux-2.6.17-mm1/include/linux/mmzone.h 2006-06-21 08:37:58.613452634 -0700 @@ -57,6 +57,7 @@ enum zone_stat_item { NR_FILE_DIRTY, NR_WRITEBACK, NR_UNSTABLE_NFS, /* NFS unstable pages */ + NR_BOUNCE, NR_VM_ZONE_STAT_ITEMS }; struct per_cpu_pages { Index: linux-2.6.17-mm1/mm/highmem.c =================================================================== --- linux-2.6.17-mm1.orig/mm/highmem.c 2006-06-17 18:49:35.000000000 -0700 +++ linux-2.6.17-mm1/mm/highmem.c 2006-06-21 08:37:58.615405638 -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-mm1/mm/vmstat.c =================================================================== --- linux-2.6.17-mm1.orig/mm/vmstat.c 2006-06-21 08:37:27.848752903 -0700 +++ linux-2.6.17-mm1/mm/vmstat.c 2006-06-21 08:37:58.615405638 -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-mm1/fs/proc/proc_misc.c =================================================================== --- linux-2.6.17-mm1.orig/fs/proc/proc_misc.c 2006-06-21 08:37:27.848752903 -0700 +++ linux-2.6.17-mm1/fs/proc/proc_misc.c 2006-06-21 08:37:58.616382141 -0700 @@ -171,6 +171,7 @@ static int meminfo_read_proc(char *page, "Slab: %8lu kB\n" "PageTables: %8lu kB\n" "NFS 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_NFS)), + K(global_page_state(NR_BOUNCE)), K(allowed), K(committed), (unsigned long)VMALLOC_TOTAL >> 10, -- 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: email@kvack.org