From: Ankita Garg <ankita@in.ibm.com>
To: linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
linux-pm@lists.linux-foundation.org
Cc: ankita@in.ibm.com, svaidy@linux.vnet.ibm.com, thomas.abraham@linaro.org
Subject: [PATCH 07/10] mm: Modify vmstat
Date: Fri, 27 May 2011 18:01:35 +0530 [thread overview]
Message-ID: <1306499498-14263-8-git-send-email-ankita@in.ibm.com> (raw)
In-Reply-To: <1306499498-14263-1-git-send-email-ankita@in.ibm.com>
Change the way vmstats are collected. Since the zones are now present inside
regions, scan through all the regions to obtain zone specific statistics.
Signed-off-by: Ankita Garg <ankita@in.ibm.com>
---
include/linux/vmstat.h | 22 +++++++++++++++-------
mm/vmstat.c | 48 ++++++++++++++++++++++++++++--------------------
2 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 2b3831b..296b9ad 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -211,20 +211,28 @@ extern unsigned long zone_reclaimable_pages(struct zone *zone);
static inline unsigned long node_page_state(int node,
enum zone_stat_item item)
{
- struct zone *zones = NODE_DATA(node)->node_zones;
+ int i;
+ unsigned long page_state = 0;
+
+ for_each_mem_region_in_nid(i, node) {
+ mr_data_t *mrdat = &(NODE_DATA(node)->mem_regions[i]);
+ struct zone *zones = mrdat->zones;
+
+ page_state =
- return
#ifdef CONFIG_ZONE_DMA
- zone_page_state(&zones[ZONE_DMA], item) +
+ zone_page_state(&zones[ZONE_DMA], item) +
#endif
#ifdef CONFIG_ZONE_DMA32
- zone_page_state(&zones[ZONE_DMA32], item) +
+ zone_page_state(&zones[ZONE_DMA32], item) +
#endif
#ifdef CONFIG_HIGHMEM
- zone_page_state(&zones[ZONE_HIGHMEM], item) +
+ zone_page_state(&zones[ZONE_HIGHMEM], item) +
#endif
- zone_page_state(&zones[ZONE_NORMAL], item) +
- zone_page_state(&zones[ZONE_MOVABLE], item);
+ zone_page_state(&zones[ZONE_NORMAL], item) +
+ zone_page_state(&zones[ZONE_MOVABLE], item);
+ }
+ return page_state;
}
extern void zone_statistics(struct zone *, struct zone *, gfp_t gfp);
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 897ea9e..542f8b6 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -191,17 +191,21 @@ void set_pgdat_percpu_threshold(pg_data_t *pgdat,
struct zone *zone;
int cpu;
int threshold;
- int i;
+ int i, p;
for (i = 0; i < pgdat->nr_zones; i++) {
- zone = &pgdat->node_zones[i];
- if (!zone->percpu_drift_mark)
- continue;
-
- threshold = (*calculate_pressure)(zone);
- for_each_possible_cpu(cpu)
- per_cpu_ptr(zone->pageset, cpu)->stat_threshold
- = threshold;
+ for_each_mem_region_in_nid(p, pgdat->node_id) {
+ mem_region_t *mem_region = &pgdat->mem_regions[p];
+ struct zone *zone = mem_region->zones + i;
+
+ if (!zone->percpu_drift_mark)
+ continue;
+
+ threshold = (*calculate_pressure)(zone);
+ for_each_possible_cpu(cpu)
+ per_cpu_ptr(zone->pageset, cpu)->stat_threshold
+ = threshold;
+ }
}
}
@@ -642,19 +646,23 @@ static void frag_stop(struct seq_file *m, void *arg)
/* Walk all the zones in a node and print using a callback */
static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
- void (*print)(struct seq_file *m, pg_data_t *, struct zone *))
+ void (*print)(struct seq_file *m, pg_data_t *,
+ mem_region_t *, struct zone *))
{
- struct zone *zone;
- struct zone *node_zones = pgdat->node_zones;
unsigned long flags;
-
- for (zone = node_zones; zone - node_zones < MAX_NR_ZONES; ++zone) {
- if (!populated_zone(zone))
- continue;
-
- spin_lock_irqsave(&zone->lock, flags);
- print(m, pgdat, zone);
- spin_unlock_irqrestore(&zone->lock, flags);
+ int i, j;
+
+ for (i = 0; i < MAX_NR_ZONES; ++i) {
+ for_each_mem_region_in_nid(j, pgdat->node_id) {
+ mem_region_t *mem_region = &pgdat->mem_regions[j];
+ struct zone *zone = mem_region->zones + i;
+ if (!populated_zone(zone))
+ continue;
+
+ spin_lock_irqsave(&zone->lock, flags);
+ print(m, pgdat, mem_region, zone);
+ spin_unlock_irqrestore(&zone->lock, flags);
+ }
}
}
#endif
--
1.7.4
next prev parent reply other threads:[~2011-05-27 12:32 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-27 12:31 [PATCH 00/10] mm: Linux VM Infrastructure to support Memory Power Management Ankita Garg
2011-05-27 12:31 ` [PATCH 01/10] mm: Introduce the memory regions data structure Ankita Garg
2011-05-27 15:30 ` Dave Hansen
2011-05-27 18:20 ` Vaidyanathan Srinivasan
2011-05-27 21:31 ` Dave Hansen
2011-05-29 8:16 ` Ankita Garg
2011-05-31 17:34 ` Dave Hansen
2011-06-02 8:54 ` Ankita Garg
2011-05-27 12:31 ` [PATCH 02/10] mm: Helper routines Ankita Garg
2011-05-27 12:31 ` [PATCH 03/10] mm: Init zones inside memory regions Ankita Garg
2011-05-27 12:31 ` [PATCH 04/10] mm: Refer to zones from " Ankita Garg
2011-05-27 12:31 ` [PATCH 05/10] mm: Create zonelists Ankita Garg
2011-05-27 12:31 ` [PATCH 06/10] mm: Verify zonelists Ankita Garg
2011-05-27 12:31 ` Ankita Garg [this message]
2011-05-27 12:31 ` [PATCH 08/10] mm: Modify vmscan Ankita Garg
2011-05-27 12:31 ` [PATCH 09/10] mm: Reflect memory region changes in zoneinfo Ankita Garg
2011-05-27 12:31 ` [PATCH 10/10] mm: Create memory regions at boot-up Ankita Garg
2011-05-28 14:39 ` Jean-Christophe PLAGNIOL-VILLARD
2011-05-28 7:56 ` [PATCH 00/10] mm: Linux VM Infrastructure to support Memory Power Management Andrew Morton
2011-05-28 13:16 ` Ankita Garg
2011-06-09 18:52 ` Paul E. McKenney
2011-06-10 0:51 ` Kyungmin Park
2011-06-10 15:11 ` Paul E. McKenney
2011-06-10 15:59 ` Matthew Garrett
2011-06-10 16:55 ` Paul E. McKenney
2011-06-10 17:05 ` Matthew Garrett
2011-06-10 17:19 ` Paul E. McKenney
2011-06-10 17:23 ` Matthew Garrett
2011-06-10 17:52 ` Paul E. McKenney
2011-06-10 18:08 ` Matthew Garrett
2011-06-10 18:47 ` Paul E. McKenney
2011-06-10 19:23 ` Matthew Garrett
2011-06-10 19:37 ` Paul E. McKenney
2011-06-10 20:12 ` Matthew Garrett
2011-06-11 3:02 ` Arjan van de Ven
2011-06-11 17:06 ` Paul E. McKenney
2011-06-11 17:26 ` Arjan van de Ven
2011-06-12 23:07 ` Paul E. McKenney
2011-06-13 14:28 ` Arjan van de Ven
2011-06-13 23:04 ` Paul E. McKenney
2011-06-14 8:51 ` Ankita Garg
2011-06-15 16:53 ` Ankita Garg
2011-06-18 4:08 ` Arjan van de Ven
2011-06-10 17:33 ` Ankita Garg
2011-06-11 17:08 ` Paul E. McKenney
2011-07-12 5:31 ` amit kachhap
2011-06-13 4:47 ` KAMEZAWA Hiroyuki
2011-06-16 4:20 ` Ankita Garg
2011-06-16 9:12 ` KAMEZAWA Hiroyuki
2011-06-17 15:28 ` Ankita Garg
2011-06-19 23:53 ` KAMEZAWA Hiroyuki
2011-06-16 16:04 ` Dave Hansen
2011-06-17 10:03 ` Ankita Garg
2011-06-29 13:00 ` Ankita Garg
2011-06-29 17:06 ` Dave Hansen
2011-06-29 17:42 ` Ankita Garg
2011-06-29 17:59 ` Dave Hansen
2011-06-29 18:17 ` Vaidyanathan Srinivasan
2011-06-30 4:37 ` Ankita Garg
2011-06-29 20:11 ` Andi Kleen
2011-06-30 5:11 ` Ankita Garg
2011-06-29 18:07 ` Vaidyanathan Srinivasan
2011-07-06 8:45 ` Pekka Enberg
2011-07-06 9:01 ` Pekka Enberg
2011-07-06 16:50 ` Vaidyanathan Srinivasan
2011-07-06 16:41 ` Vaidyanathan Srinivasan
2011-07-06 20:20 ` david
2011-07-07 4:54 ` Ankita Garg
2011-07-07 18:00 ` Pekka Enberg
2011-07-08 1:32 ` david
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=1306499498-14263-8-git-send-email-ankita@in.ibm.com \
--to=ankita@in.ibm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=svaidy@linux.vnet.ibm.com \
--cc=thomas.abraham@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).