* [PATCH V2 1/2] memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages() @ 2011-05-19 0:55 Ying Han 2011-05-19 0:55 ` [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics Ying Han 2011-05-19 8:26 ` [PATCH V2 1/2] memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages() Johannes Weiner 0 siblings, 2 replies; 10+ messages in thread From: Ying Han @ 2011-05-19 0:55 UTC (permalink / raw) To: KOSAKI Motohiro, Minchan Kim, Daisuke Nishimura, Balbir Singh, Tejun Heo, Pavel Emelyanov, KAMEZAWA Hiroyuki, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai Cc: linux-mm The caller of the function has been renamed to zone_nr_lru_pages(), and this is just fixing up in the memcg code. The current name is easily to be mis-read as zone's total number of pages. This patch is based on mmotm-2011-05-06-16-39 no change on this patch from v1. Signed-off-by: Ying Han <yinghan@google.com> --- include/linux/memcontrol.h | 10 +++++----- mm/memcontrol.c | 6 +++--- mm/vmscan.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 77e47f5..22b3190 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -109,9 +109,9 @@ extern void mem_cgroup_end_migration(struct mem_cgroup *mem, int mem_cgroup_inactive_anon_is_low(struct mem_cgroup *memcg); int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg); int mem_cgroup_select_victim_node(struct mem_cgroup *memcg); -unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, - struct zone *zone, - enum lru_list lru); +unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, + struct zone *zone, + enum lru_list lru); struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, struct zone *zone); struct zone_reclaim_stat* @@ -306,8 +306,8 @@ mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg) } static inline unsigned long -mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, struct zone *zone, - enum lru_list lru) +mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, struct zone *zone, + enum lru_list lru) { return 0; } diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 95aecca..da183dc 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1151,9 +1151,9 @@ int mem_cgroup_inactive_file_is_low(struct mem_cgroup *memcg) return (active > inactive); } -unsigned long mem_cgroup_zone_nr_pages(struct mem_cgroup *memcg, - struct zone *zone, - enum lru_list lru) +unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, + struct zone *zone, + enum lru_list lru) { int nid = zone_to_nid(zone); int zid = zone_idx(zone); diff --git a/mm/vmscan.c b/mm/vmscan.c index 292582c..fbbb958 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -172,7 +172,7 @@ static unsigned long zone_nr_lru_pages(struct zone *zone, struct scan_control *sc, enum lru_list lru) { if (!scanning_global_lru(sc)) - return mem_cgroup_zone_nr_pages(sc->mem_cgroup, zone, lru); + return mem_cgroup_zone_nr_lru_pages(sc->mem_cgroup, zone, lru); return zone_page_state(zone, NR_LRU_BASE + lru); } -- 1.7.3.1 -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics 2011-05-19 0:55 [PATCH V2 1/2] memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages() Ying Han @ 2011-05-19 0:55 ` Ying Han 2011-05-19 1:10 ` [PATCH][BUGFIX] memcg: fix a routine for counting pages in node (Re: " KAMEZAWA Hiroyuki ` (2 more replies) 2011-05-19 8:26 ` [PATCH V2 1/2] memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages() Johannes Weiner 1 sibling, 3 replies; 10+ messages in thread From: Ying Han @ 2011-05-19 0:55 UTC (permalink / raw) To: KOSAKI Motohiro, Minchan Kim, Daisuke Nishimura, Balbir Singh, Tejun Heo, Pavel Emelyanov, KAMEZAWA Hiroyuki, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai Cc: linux-mm The new API exports numa_maps per-memcg basis. This is a piece of useful information where it exports per-memcg page distribution across real numa nodes. One of the usecase is evaluating application performance by combining this information w/ the cpu allocation to the application. The output of the memory.numastat tries to follow w/ simiar format of numa_maps like: total=<total pages> N0=<node 0 pages> N1=<node 1 pages> ... file=<total file pages> N0=<node 0 pages> N1=<node 1 pages> ... anon=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ... $ cat /dev/cgroup/memory/memory.numa_stat total=317674 N0=101850 N1=72552 N2=30120 N3=113142 file=288219 N0=98046 N1=59220 N2=23578 N3=107375 anon=25699 N0=3804 N1=10124 N2=6540 N3=5231 Note: I noticed <total pages> is not equal to the sum of the rest of counters. I might need to change the way get that counter, comments are welcomed. change v2..v1: 1. add also the file and anon pages on per-node distribution. Signed-off-by: Ying Han <yinghan@google.com> --- mm/memcontrol.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 109 insertions(+), 0 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index da183dc..cffc3a6 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1162,6 +1162,62 @@ unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, return MEM_CGROUP_ZSTAT(mz, lru); } +unsigned long mem_cgroup_node_nr_file_pages(struct mem_cgroup *memcg, int nid) +{ + unsigned long ret; + + ret = mem_cgroup_get_zonestat_node(memcg, nid, LRU_INACTIVE_FILE) + + mem_cgroup_get_zonestat_node(memcg, nid, LRU_ACTIVE_FILE); + + return ret; +} + +unsigned long mem_cgroup_node_nr_anon_pages(struct mem_cgroup *memcg, int nid) +{ + unsigned long ret; + + ret = mem_cgroup_get_zonestat_node(memcg, nid, LRU_INACTIVE_ANON) + + mem_cgroup_get_zonestat_node(memcg, nid, LRU_ACTIVE_ANON); + + return ret; +} + +unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, + int nid, bool file) +{ + if (file) + return mem_cgroup_node_nr_file_pages(memcg, nid); + else + return mem_cgroup_node_nr_anon_pages(memcg, nid); +} + +unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, bool file) +{ + u64 total = 0; + int nid; + + for_each_node_state(nid, N_HIGH_MEMORY) + total += mem_cgroup_node_nr_lru_pages(memcg, nid, file); + + return total; +} + +unsigned long mem_cgroup_node_nr_pages(struct mem_cgroup *memcg, int nid) +{ + int zid; + struct mem_cgroup_per_zone *mz; + enum lru_list l; + u64 total = 0; + + for (zid = 0; zid < MAX_NR_ZONES; zid++) { + mz = mem_cgroup_zoneinfo(memcg, nid, zid); + for_each_lru(l) + total += MEM_CGROUP_ZSTAT(mz, l); + } + + return total; +} + struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, struct zone *zone) { @@ -4048,6 +4104,41 @@ mem_cgroup_get_total_stat(struct mem_cgroup *mem, struct mcs_total_stat *s) mem_cgroup_get_local_stat(iter, s); } +static int mem_control_numa_stat_show(struct seq_file *m, void *arg) +{ + int nid; + unsigned long total_nr, file_nr, anon_nr; + unsigned long node_nr; + struct cgroup *cont = m->private; + struct mem_cgroup *mem_cont = mem_cgroup_from_cont(cont); + + total_nr = mem_cgroup_local_usage(mem_cont); + seq_printf(m, "total=%lu", total_nr); + for_each_node_state(nid, N_HIGH_MEMORY) { + node_nr = mem_cgroup_node_nr_pages(mem_cont, nid); + seq_printf(m, " N%d=%lu", nid, node_nr); + } + seq_putc(m, '\n'); + + file_nr = mem_cgroup_nr_lru_pages(mem_cont, 1); + seq_printf(m, "file=%lu", file_nr); + for_each_node_state(nid, N_HIGH_MEMORY) { + node_nr = mem_cgroup_node_nr_lru_pages(mem_cont, nid, 1); + seq_printf(m, " N%d=%lu", nid, node_nr); + } + seq_putc(m, '\n'); + + anon_nr = mem_cgroup_nr_lru_pages(mem_cont, 0); + seq_printf(m, "anon=%lu", anon_nr); + for_each_node_state(nid, N_HIGH_MEMORY) { + node_nr = mem_cgroup_node_nr_lru_pages(mem_cont, nid, 0); + seq_printf(m, " N%d=%lu", nid, node_nr); + } + seq_putc(m, '\n'); + + return 0; +} + static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft, struct cgroup_map_cb *cb) { @@ -4481,6 +4572,20 @@ static int mem_cgroup_oom_control_write(struct cgroup *cgrp, return 0; } +static const struct file_operations mem_control_numa_stat_file_operations = { + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int mem_control_numa_stat_open(struct inode *unused, struct file *file) +{ + struct cgroup *cont = file->f_dentry->d_parent->d_fsdata; + + file->f_op = &mem_control_numa_stat_file_operations; + return single_open(file, mem_control_numa_stat_show, cont); +} + static struct cftype mem_cgroup_files[] = { { .name = "usage_in_bytes", @@ -4544,6 +4649,10 @@ static struct cftype mem_cgroup_files[] = { .unregister_event = mem_cgroup_oom_unregister_event, .private = MEMFILE_PRIVATE(_OOM_TYPE, OOM_CONTROL), }, + { + .name = "numa_stat", + .open = mem_control_numa_stat_open, + }, }; #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP -- 1.7.3.1 -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH][BUGFIX] memcg: fix a routine for counting pages in node (Re: [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics 2011-05-19 0:55 ` [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics Ying Han @ 2011-05-19 1:10 ` KAMEZAWA Hiroyuki 2011-05-19 2:55 ` Ying Han 2011-05-19 6:22 ` Daisuke Nishimura 2011-05-19 8:01 ` Balbir Singh 2 siblings, 1 reply; 10+ messages in thread From: KAMEZAWA Hiroyuki @ 2011-05-19 1:10 UTC (permalink / raw) To: Ying Han Cc: KOSAKI Motohiro, Minchan Kim, Daisuke Nishimura, Balbir Singh, Tejun Heo, Pavel Emelyanov, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai, linux-mm On Wed, 18 May 2011 17:55:11 -0700 Ying Han <yinghan@google.com> wrote: $ cat /dev/cgroup/memory/memory.numa_stat > total=317674 N0=101850 N1=72552 N2=30120 N3=113142 > file=288219 N0=98046 N1=59220 N2=23578 N3=107375 > anon=25699 N0=3804 N1=10124 N2=6540 N3=5231 > > Note: I noticed <total pages> is not equal to the sum of the rest of counters. > I might need to change the way get that counter, comments are welcomed. > Please debug when you feel strange ;) Here is a fix. Could you test ? == The value for counter base should be initialized. If not, this returns wrong value. Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> --- mm/memcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: mmotm-May11/mm/memcontrol.c =================================================================== --- mmotm-May11.orig/mm/memcontrol.c +++ mmotm-May11/mm/memcontrol.c @@ -710,7 +710,7 @@ static unsigned long mem_cgroup_get_zonestat_node(struct mem_cgroup *mem, int nid, enum lru_list idx) { struct mem_cgroup_per_zone *mz; - u64 total; + u64 total = 0; int zid; for (zid = 0; zid < MAX_NR_ZONES; zid++) { -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][BUGFIX] memcg: fix a routine for counting pages in node (Re: [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics 2011-05-19 1:10 ` [PATCH][BUGFIX] memcg: fix a routine for counting pages in node (Re: " KAMEZAWA Hiroyuki @ 2011-05-19 2:55 ` Ying Han 2011-05-19 3:53 ` Ying Han 0 siblings, 1 reply; 10+ messages in thread From: Ying Han @ 2011-05-19 2:55 UTC (permalink / raw) To: KAMEZAWA Hiroyuki Cc: KOSAKI Motohiro, Minchan Kim, Daisuke Nishimura, Balbir Singh, Tejun Heo, Pavel Emelyanov, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai, linux-mm [-- Attachment #1: Type: text/plain, Size: 1412 bytes --] On Wed, May 18, 2011 at 6:10 PM, KAMEZAWA Hiroyuki < kamezawa.hiroyu@jp.fujitsu.com> wrote: > On Wed, 18 May 2011 17:55:11 -0700 > Ying Han <yinghan@google.com> wrote: > $ cat /dev/cgroup/memory/memory.numa_stat > > total=317674 N0=101850 N1=72552 N2=30120 N3=113142 > > file=288219 N0=98046 N1=59220 N2=23578 N3=107375 > > anon=25699 N0=3804 N1=10124 N2=6540 N3=5231 > > > > Note: I noticed <total pages> is not equal to the sum of the rest of > counters. > > I might need to change the way get that counter, comments are welcomed. > > > > Please debug when you feel strange ;) > > Here is a fix. Could you test ? > Thanks for the patch. I will test it and post it again. --Ying > > == > The value for counter base should be initialized. If not, > this returns wrong value. > > Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> > --- > mm/memcontrol.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > Index: mmotm-May11/mm/memcontrol.c > =================================================================== > --- mmotm-May11.orig/mm/memcontrol.c > +++ mmotm-May11/mm/memcontrol.c > @@ -710,7 +710,7 @@ static unsigned long > mem_cgroup_get_zonestat_node(struct mem_cgroup *mem, int nid, enum > lru_list idx) > { > struct mem_cgroup_per_zone *mz; > - u64 total; > + u64 total = 0; > int zid; > > for (zid = 0; zid < MAX_NR_ZONES; zid++) { > > [-- Attachment #2: Type: text/html, Size: 2073 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH][BUGFIX] memcg: fix a routine for counting pages in node (Re: [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics 2011-05-19 2:55 ` Ying Han @ 2011-05-19 3:53 ` Ying Han 0 siblings, 0 replies; 10+ messages in thread From: Ying Han @ 2011-05-19 3:53 UTC (permalink / raw) To: KAMEZAWA Hiroyuki Cc: KOSAKI Motohiro, Minchan Kim, Daisuke Nishimura, Balbir Singh, Tejun Heo, Pavel Emelyanov, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai, linux-mm [-- Attachment #1: Type: text/plain, Size: 1643 bytes --] On Wed, May 18, 2011 at 7:55 PM, Ying Han <yinghan@google.com> wrote: > > > On Wed, May 18, 2011 at 6:10 PM, KAMEZAWA Hiroyuki < > kamezawa.hiroyu@jp.fujitsu.com> wrote: > >> On Wed, 18 May 2011 17:55:11 -0700 >> Ying Han <yinghan@google.com> wrote: >> $ cat /dev/cgroup/memory/memory.numa_stat >> > total=317674 N0=101850 N1=72552 N2=30120 N3=113142 >> > file=288219 N0=98046 N1=59220 N2=23578 N3=107375 >> > anon=25699 N0=3804 N1=10124 N2=6540 N3=5231 >> > >> > Note: I noticed <total pages> is not equal to the sum of the rest of >> counters. >> > I might need to change the way get that counter, comments are welcomed. >> > >> >> Please debug when you feel strange ;) >> >> Here is a fix. Could you test ? >> > > Thanks for the patch. I will test it and post it again. > I tested and it doesn't fix the problem. Anyway, I will dig into that from now. thanks --Ying > > --Ying > >> >> == >> The value for counter base should be initialized. If not, >> this returns wrong value. >> >> Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> >> --- >> mm/memcontrol.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> Index: mmotm-May11/mm/memcontrol.c >> =================================================================== >> --- mmotm-May11.orig/mm/memcontrol.c >> +++ mmotm-May11/mm/memcontrol.c >> @@ -710,7 +710,7 @@ static unsigned long >> mem_cgroup_get_zonestat_node(struct mem_cgroup *mem, int nid, enum >> lru_list idx) >> { >> struct mem_cgroup_per_zone *mz; >> - u64 total; >> + u64 total = 0; >> int zid; >> >> for (zid = 0; zid < MAX_NR_ZONES; zid++) { >> >> > [-- Attachment #2: Type: text/html, Size: 2823 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics 2011-05-19 0:55 ` [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics Ying Han 2011-05-19 1:10 ` [PATCH][BUGFIX] memcg: fix a routine for counting pages in node (Re: " KAMEZAWA Hiroyuki @ 2011-05-19 6:22 ` Daisuke Nishimura 2011-05-19 15:23 ` Ying Han 2011-05-19 8:01 ` Balbir Singh 2 siblings, 1 reply; 10+ messages in thread From: Daisuke Nishimura @ 2011-05-19 6:22 UTC (permalink / raw) To: Ying Han Cc: KOSAKI Motohiro, Minchan Kim, Balbir Singh, Tejun Heo, Pavel Emelyanov, KAMEZAWA Hiroyuki, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai, linux-mm, Daisuke Nishimura On Wed, 18 May 2011 17:55:11 -0700 Ying Han <yinghan@google.com> wrote: > The new API exports numa_maps per-memcg basis. This is a piece of useful > information where it exports per-memcg page distribution across real numa > nodes. > > One of the usecase is evaluating application performance by combining this > information w/ the cpu allocation to the application. > > The output of the memory.numastat tries to follow w/ simiar format of numa_maps > like: > > total=<total pages> N0=<node 0 pages> N1=<node 1 pages> ... > file=<total file pages> N0=<node 0 pages> N1=<node 1 pages> ... > anon=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ... > > $ cat /dev/cgroup/memory/memory.numa_stat > total=317674 N0=101850 N1=72552 N2=30120 N3=113142 > file=288219 N0=98046 N1=59220 N2=23578 N3=107375 > anon=25699 N0=3804 N1=10124 N2=6540 N3=5231 > > Note: I noticed <total pages> is not equal to the sum of the rest of counters. > I might need to change the way get that counter, comments are welcomed. > Isn't it just because <total pages>(mem_cgroup_local_usage()) includes pages which are not on any LRU, while other counters doesn't ? > change v2..v1: > 1. add also the file and anon pages on per-node distribution. > > Signed-off-by: Ying Han <yinghan@google.com> > --- > mm/memcontrol.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 109 insertions(+), 0 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index da183dc..cffc3a6 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -1162,6 +1162,62 @@ unsigned long mem_cgroup_zone_nr_lru_pages(struct mem_cgroup *memcg, > return MEM_CGROUP_ZSTAT(mz, lru); > } > > +unsigned long mem_cgroup_node_nr_file_pages(struct mem_cgroup *memcg, int nid) > +{ > + unsigned long ret; > + > + ret = mem_cgroup_get_zonestat_node(memcg, nid, LRU_INACTIVE_FILE) + > + mem_cgroup_get_zonestat_node(memcg, nid, LRU_ACTIVE_FILE); > + > + return ret; > +} > + > +unsigned long mem_cgroup_node_nr_anon_pages(struct mem_cgroup *memcg, int nid) > +{ > + unsigned long ret; > + > + ret = mem_cgroup_get_zonestat_node(memcg, nid, LRU_INACTIVE_ANON) + > + mem_cgroup_get_zonestat_node(memcg, nid, LRU_ACTIVE_ANON); > + > + return ret; > +} > + > +unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, > + int nid, bool file) > +{ > + if (file) > + return mem_cgroup_node_nr_file_pages(memcg, nid); > + else > + return mem_cgroup_node_nr_anon_pages(memcg, nid); > +} > + > +unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, bool file) > +{ > + u64 total = 0; > + int nid; > + > + for_each_node_state(nid, N_HIGH_MEMORY) > + total += mem_cgroup_node_nr_lru_pages(memcg, nid, file); > + > + return total; > +} > + Can these functions defined as "static" ? > +unsigned long mem_cgroup_node_nr_pages(struct mem_cgroup *memcg, int nid) > +{ > + int zid; > + struct mem_cgroup_per_zone *mz; > + enum lru_list l; > + u64 total = 0; > + > + for (zid = 0; zid < MAX_NR_ZONES; zid++) { > + mz = mem_cgroup_zoneinfo(memcg, nid, zid); > + for_each_lru(l) > + total += MEM_CGROUP_ZSTAT(mz, l); > + } > + > + return total; > +} > + ditto. And I think this function can be implemented by using mem_cgroup_get_zonestat_node(). for_each_lru(l) total += mem_cgroup_get_zonestat_node(memcg, nid, l); As KAMEZAWA-san posted a fix already, mem_cgroup_get_zonestat_node() must be fixed first. Thanks, Daisuke Nishimura. > struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup *memcg, > struct zone *zone) > { > @@ -4048,6 +4104,41 @@ mem_cgroup_get_total_stat(struct mem_cgroup *mem, struct mcs_total_stat *s) > mem_cgroup_get_local_stat(iter, s); > } > > +static int mem_control_numa_stat_show(struct seq_file *m, void *arg) > +{ > + int nid; > + unsigned long total_nr, file_nr, anon_nr; > + unsigned long node_nr; > + struct cgroup *cont = m->private; > + struct mem_cgroup *mem_cont = mem_cgroup_from_cont(cont); > + > + total_nr = mem_cgroup_local_usage(mem_cont); > + seq_printf(m, "total=%lu", total_nr); > + for_each_node_state(nid, N_HIGH_MEMORY) { > + node_nr = mem_cgroup_node_nr_pages(mem_cont, nid); > + seq_printf(m, " N%d=%lu", nid, node_nr); > + } > + seq_putc(m, '\n'); > + > + file_nr = mem_cgroup_nr_lru_pages(mem_cont, 1); > + seq_printf(m, "file=%lu", file_nr); > + for_each_node_state(nid, N_HIGH_MEMORY) { > + node_nr = mem_cgroup_node_nr_lru_pages(mem_cont, nid, 1); > + seq_printf(m, " N%d=%lu", nid, node_nr); > + } > + seq_putc(m, '\n'); > + > + anon_nr = mem_cgroup_nr_lru_pages(mem_cont, 0); > + seq_printf(m, "anon=%lu", anon_nr); > + for_each_node_state(nid, N_HIGH_MEMORY) { > + node_nr = mem_cgroup_node_nr_lru_pages(mem_cont, nid, 0); > + seq_printf(m, " N%d=%lu", nid, node_nr); > + } > + seq_putc(m, '\n'); > + > + return 0; > +} > + > static int mem_control_stat_show(struct cgroup *cont, struct cftype *cft, > struct cgroup_map_cb *cb) > { > @@ -4481,6 +4572,20 @@ static int mem_cgroup_oom_control_write(struct cgroup *cgrp, > return 0; > } > > +static const struct file_operations mem_control_numa_stat_file_operations = { > + .read = seq_read, > + .llseek = seq_lseek, > + .release = single_release, > +}; > + > +static int mem_control_numa_stat_open(struct inode *unused, struct file *file) > +{ > + struct cgroup *cont = file->f_dentry->d_parent->d_fsdata; > + > + file->f_op = &mem_control_numa_stat_file_operations; > + return single_open(file, mem_control_numa_stat_show, cont); > +} > + > static struct cftype mem_cgroup_files[] = { > { > .name = "usage_in_bytes", > @@ -4544,6 +4649,10 @@ static struct cftype mem_cgroup_files[] = { > .unregister_event = mem_cgroup_oom_unregister_event, > .private = MEMFILE_PRIVATE(_OOM_TYPE, OOM_CONTROL), > }, > + { > + .name = "numa_stat", > + .open = mem_control_numa_stat_open, > + }, > }; > > #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP > -- > 1.7.3.1 > -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics 2011-05-19 6:22 ` Daisuke Nishimura @ 2011-05-19 15:23 ` Ying Han 0 siblings, 0 replies; 10+ messages in thread From: Ying Han @ 2011-05-19 15:23 UTC (permalink / raw) To: Daisuke Nishimura Cc: KOSAKI Motohiro, Minchan Kim, Balbir Singh, Tejun Heo, Pavel Emelyanov, KAMEZAWA Hiroyuki, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai, linux-mm [-- Attachment #1: Type: text/plain, Size: 7459 bytes --] On Wed, May 18, 2011 at 11:22 PM, Daisuke Nishimura < nishimura@mxp.nes.nec.co.jp> wrote: > On Wed, 18 May 2011 17:55:11 -0700 > Ying Han <yinghan@google.com> wrote: > > > The new API exports numa_maps per-memcg basis. This is a piece of useful > > information where it exports per-memcg page distribution across real numa > > nodes. > > > > One of the usecase is evaluating application performance by combining > this > > information w/ the cpu allocation to the application. > > > > The output of the memory.numastat tries to follow w/ simiar format of > numa_maps > > like: > > > > total=<total pages> N0=<node 0 pages> N1=<node 1 pages> ... > > file=<total file pages> N0=<node 0 pages> N1=<node 1 pages> ... > > anon=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ... > > > > $ cat /dev/cgroup/memory/memory.numa_stat > > total=317674 N0=101850 N1=72552 N2=30120 N3=113142 > > file=288219 N0=98046 N1=59220 N2=23578 N3=107375 > > anon=25699 N0=3804 N1=10124 N2=6540 N3=5231 > > > > Note: I noticed <total pages> is not equal to the sum of the rest of > counters. > > I might need to change the way get that counter, comments are welcomed. > > > Isn't it just because <total pages>(mem_cgroup_local_usage()) includes > pages > which are not on any LRU, while other counters doesn't ? > Yes, i noticed that also and I am preparing for the next post :) > > > change v2..v1: > > 1. add also the file and anon pages on per-node distribution. > > > > Signed-off-by: Ying Han <yinghan@google.com> > > --- > > mm/memcontrol.c | 109 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > 1 files changed, 109 insertions(+), 0 deletions(-) > > > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > index da183dc..cffc3a6 100644 > > --- a/mm/memcontrol.c > > +++ b/mm/memcontrol.c > > @@ -1162,6 +1162,62 @@ unsigned long mem_cgroup_zone_nr_lru_pages(struct > mem_cgroup *memcg, > > return MEM_CGROUP_ZSTAT(mz, lru); > > } > > > > +unsigned long mem_cgroup_node_nr_file_pages(struct mem_cgroup *memcg, > int nid) > > +{ > > + unsigned long ret; > > + > > + ret = mem_cgroup_get_zonestat_node(memcg, nid, LRU_INACTIVE_FILE) + > > + mem_cgroup_get_zonestat_node(memcg, nid, LRU_ACTIVE_FILE); > > + > > + return ret; > > +} > > + > > +unsigned long mem_cgroup_node_nr_anon_pages(struct mem_cgroup *memcg, > int nid) > > +{ > > + unsigned long ret; > > + > > + ret = mem_cgroup_get_zonestat_node(memcg, nid, LRU_INACTIVE_ANON) + > > + mem_cgroup_get_zonestat_node(memcg, nid, LRU_ACTIVE_ANON); > > + > > + return ret; > > +} > > + > > +unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, > > + int nid, bool file) > > +{ > > + if (file) > > + return mem_cgroup_node_nr_file_pages(memcg, nid); > > + else > > + return mem_cgroup_node_nr_anon_pages(memcg, nid); > > +} > > + > > +unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg, bool > file) > > +{ > > + u64 total = 0; > > + int nid; > > + > > + for_each_node_state(nid, N_HIGH_MEMORY) > > + total += mem_cgroup_node_nr_lru_pages(memcg, nid, file); > > + > > + return total; > > +} > > + > Can these functions defined as "static" ? > > > > +unsigned long mem_cgroup_node_nr_pages(struct mem_cgroup *memcg, int > nid) > > +{ > > + int zid; > > + struct mem_cgroup_per_zone *mz; > > + enum lru_list l; > > + u64 total = 0; > > + > > + for (zid = 0; zid < MAX_NR_ZONES; zid++) { > > + mz = mem_cgroup_zoneinfo(memcg, nid, zid); > > + for_each_lru(l) > > + total += MEM_CGROUP_ZSTAT(mz, l); > > + } > > + > > + return total; > > +} > > + > ditto. > And I think this function can be implemented by using > mem_cgroup_get_zonestat_node(). > > for_each_lru(l) > total += mem_cgroup_get_zonestat_node(memcg, nid, l); > > As KAMEZAWA-san posted a fix already, mem_cgroup_get_zonestat_node() must > be fixed first. > > > Yes, I can include that in the patchset. Thanks --Ying > Thanks, > Daisuke Nishimura. > > > struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup > *memcg, > > struct zone *zone) > > { > > @@ -4048,6 +4104,41 @@ mem_cgroup_get_total_stat(struct mem_cgroup *mem, > struct mcs_total_stat *s) > > mem_cgroup_get_local_stat(iter, s); > > } > > > > +static int mem_control_numa_stat_show(struct seq_file *m, void *arg) > > +{ > > + int nid; > > + unsigned long total_nr, file_nr, anon_nr; > > + unsigned long node_nr; > > + struct cgroup *cont = m->private; > > + struct mem_cgroup *mem_cont = mem_cgroup_from_cont(cont); > > + > > + total_nr = mem_cgroup_local_usage(mem_cont); > > + seq_printf(m, "total=%lu", total_nr); > > + for_each_node_state(nid, N_HIGH_MEMORY) { > > + node_nr = mem_cgroup_node_nr_pages(mem_cont, nid); > > + seq_printf(m, " N%d=%lu", nid, node_nr); > > + } > > + seq_putc(m, '\n'); > > + > > + file_nr = mem_cgroup_nr_lru_pages(mem_cont, 1); > > + seq_printf(m, "file=%lu", file_nr); > > + for_each_node_state(nid, N_HIGH_MEMORY) { > > + node_nr = mem_cgroup_node_nr_lru_pages(mem_cont, nid, 1); > > + seq_printf(m, " N%d=%lu", nid, node_nr); > > + } > > + seq_putc(m, '\n'); > > + > > + anon_nr = mem_cgroup_nr_lru_pages(mem_cont, 0); > > + seq_printf(m, "anon=%lu", anon_nr); > > + for_each_node_state(nid, N_HIGH_MEMORY) { > > + node_nr = mem_cgroup_node_nr_lru_pages(mem_cont, nid, 0); > > + seq_printf(m, " N%d=%lu", nid, node_nr); > > + } > > + seq_putc(m, '\n'); > > + > > + return 0; > > +} > > + > > static int mem_control_stat_show(struct cgroup *cont, struct cftype > *cft, > > struct cgroup_map_cb *cb) > > { > > @@ -4481,6 +4572,20 @@ static int mem_cgroup_oom_control_write(struct > cgroup *cgrp, > > return 0; > > } > > > > +static const struct file_operations > mem_control_numa_stat_file_operations = { > > + .read = seq_read, > > + .llseek = seq_lseek, > > + .release = single_release, > > +}; > > + > > +static int mem_control_numa_stat_open(struct inode *unused, struct file > *file) > > +{ > > + struct cgroup *cont = file->f_dentry->d_parent->d_fsdata; > > + > > + file->f_op = &mem_control_numa_stat_file_operations; > > + return single_open(file, mem_control_numa_stat_show, cont); > > +} > > + > > static struct cftype mem_cgroup_files[] = { > > { > > .name = "usage_in_bytes", > > @@ -4544,6 +4649,10 @@ static struct cftype mem_cgroup_files[] = { > > .unregister_event = mem_cgroup_oom_unregister_event, > > .private = MEMFILE_PRIVATE(_OOM_TYPE, OOM_CONTROL), > > }, > > + { > > + .name = "numa_stat", > > + .open = mem_control_numa_stat_open, > > + }, > > }; > > > > #ifdef CONFIG_CGROUP_MEM_RES_CTLR_SWAP > > -- > > 1.7.3.1 > > > > -- > 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/ . > Fight unfair telecom internet charges in Canada: sign > http://stopthemeter.ca/ > Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> > [-- Attachment #2: Type: text/html, Size: 9979 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics 2011-05-19 0:55 ` [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics Ying Han 2011-05-19 1:10 ` [PATCH][BUGFIX] memcg: fix a routine for counting pages in node (Re: " KAMEZAWA Hiroyuki 2011-05-19 6:22 ` Daisuke Nishimura @ 2011-05-19 8:01 ` Balbir Singh 2011-05-19 15:36 ` Ying Han 2 siblings, 1 reply; 10+ messages in thread From: Balbir Singh @ 2011-05-19 8:01 UTC (permalink / raw) To: Ying Han Cc: KOSAKI Motohiro, Minchan Kim, Daisuke Nishimura, Tejun Heo, Pavel Emelyanov, KAMEZAWA Hiroyuki, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai, linux-mm * Ying Han <yinghan@google.com> [2011-05-18 17:55:11]: > The new API exports numa_maps per-memcg basis. This is a piece of useful > information where it exports per-memcg page distribution across real numa > nodes. > > One of the usecase is evaluating application performance by combining this > information w/ the cpu allocation to the application. > > The output of the memory.numastat tries to follow w/ simiar format of numa_maps > like: > > total=<total pages> N0=<node 0 pages> N1=<node 1 pages> ... > file=<total file pages> N0=<node 0 pages> N1=<node 1 pages> ... > anon=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ... > That seems like a good idea, so +1 for we need to do this. > $ cat /dev/cgroup/memory/memory.numa_stat > total=317674 N0=101850 N1=72552 N2=30120 N3=113142 > file=288219 N0=98046 N1=59220 N2=23578 N3=107375 > anon=25699 N0=3804 N1=10124 N2=6540 N3=5231 > > Note: I noticed <total pages> is not equal to the sum of the rest of counters. > I might need to change the way get that counter, comments are welcomed. > Can you see if the total is greater or lesser than the actual value? Do you have any pages mlocked? > change v2..v1: > 1. add also the file and anon pages on per-node distribution. > > Signed-off-by: Ying Han <yinghan@google.com> > --- > mm/memcontrol.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 109 insertions(+), 0 deletions(-) > -- Three Cheers, Balbir -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics 2011-05-19 8:01 ` Balbir Singh @ 2011-05-19 15:36 ` Ying Han 0 siblings, 0 replies; 10+ messages in thread From: Ying Han @ 2011-05-19 15:36 UTC (permalink / raw) To: balbir Cc: KOSAKI Motohiro, Minchan Kim, Daisuke Nishimura, Tejun Heo, Pavel Emelyanov, KAMEZAWA Hiroyuki, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Johannes Weiner, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai, linux-mm [-- Attachment #1: Type: text/plain, Size: 1777 bytes --] On Thu, May 19, 2011 at 1:01 AM, Balbir Singh <balbir@linux.vnet.ibm.com>wrote: > * Ying Han <yinghan@google.com> [2011-05-18 17:55:11]: > > > The new API exports numa_maps per-memcg basis. This is a piece of useful > > information where it exports per-memcg page distribution across real numa > > nodes. > > > > One of the usecase is evaluating application performance by combining > this > > information w/ the cpu allocation to the application. > > > > The output of the memory.numastat tries to follow w/ simiar format of > numa_maps > > like: > > > > total=<total pages> N0=<node 0 pages> N1=<node 1 pages> ... > > file=<total file pages> N0=<node 0 pages> N1=<node 1 pages> ... > > anon=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ... > > > > That seems like a good idea, so +1 for we need to do this. > Thanks for the +1 :) > > > $ cat /dev/cgroup/memory/memory.numa_stat > > total=317674 N0=101850 N1=72552 N2=30120 N3=113142 > > file=288219 N0=98046 N1=59220 N2=23578 N3=107375 > > anon=25699 N0=3804 N1=10124 N2=6540 N3=5231 > > > > Note: I noticed <total pages> is not equal to the sum of the rest of > counters. > > I might need to change the way get that counter, comments are welcomed. > > > > Can you see if the total is greater or lesser than the actual value? > Do you have any pages mlocked? > As i replied Daisuke, i think the problem is some pages charged to the memcg might not on the LRU. --Ying > > > change v2..v1: > > 1. add also the file and anon pages on per-node distribution. > > > > Signed-off-by: Ying Han <yinghan@google.com> > > --- > > mm/memcontrol.c | 109 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > 1 files changed, 109 insertions(+), 0 deletions(-) > > > -- > Three Cheers, > Balbir > [-- Attachment #2: Type: text/html, Size: 2791 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH V2 1/2] memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages() 2011-05-19 0:55 [PATCH V2 1/2] memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages() Ying Han 2011-05-19 0:55 ` [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics Ying Han @ 2011-05-19 8:26 ` Johannes Weiner 1 sibling, 0 replies; 10+ messages in thread From: Johannes Weiner @ 2011-05-19 8:26 UTC (permalink / raw) To: Ying Han Cc: KOSAKI Motohiro, Minchan Kim, Daisuke Nishimura, Balbir Singh, Tejun Heo, Pavel Emelyanov, KAMEZAWA Hiroyuki, Andrew Morton, Li Zefan, Mel Gorman, Christoph Lameter, Rik van Riel, Hugh Dickins, Michal Hocko, Dave Hansen, Zhu Yanhai, linux-mm On Wed, May 18, 2011 at 05:55:10PM -0700, Ying Han wrote: > The caller of the function has been renamed to zone_nr_lru_pages(), and this > is just fixing up in the memcg code. The current name is easily to be mis-read > as zone's total number of pages. > > This patch is based on mmotm-2011-05-06-16-39 > > no change on this patch from v1. > > Signed-off-by: Ying Han <yinghan@google.com> Acked-by: Johannes Weiner <hannes@cmpxchg.org> -- 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/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-05-19 15:52 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-05-19 0:55 [PATCH V2 1/2] memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages() Ying Han 2011-05-19 0:55 ` [PATCH V2 2/2] memcg: add memory.numastat api for numa statistics Ying Han 2011-05-19 1:10 ` [PATCH][BUGFIX] memcg: fix a routine for counting pages in node (Re: " KAMEZAWA Hiroyuki 2011-05-19 2:55 ` Ying Han 2011-05-19 3:53 ` Ying Han 2011-05-19 6:22 ` Daisuke Nishimura 2011-05-19 15:23 ` Ying Han 2011-05-19 8:01 ` Balbir Singh 2011-05-19 15:36 ` Ying Han 2011-05-19 8:26 ` [PATCH V2 1/2] memcg: rename mem_cgroup_zone_nr_pages() to mem_cgroup_zone_nr_lru_pages() Johannes Weiner
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.