On Thu, May 19, 2011 at 4:51 PM, KAMEZAWA Hiroyuki < kamezawa.hiroyu@jp.fujitsu.com> wrote: > On Thu, 19 May 2011 10:32:40 -0700 > Ying Han 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= N0= N1= ... > > file= N0= N1= ... > > anon= N0= N1= ... > > > > $ cat /dev/cgroup/memory/memory.numa_stat > > total=246594 N0=18225 N1=72025 N2=26378 N3=129966 > > file=221728 N0=15030 N1=60804 N2=23238 N3=122656 > > anon=21120 N0=2937 N1=7733 N2=3140 N3=7310 > > > > Hmm ? this doesn't seem consistent....Isn't this log updated ? > Nope. This is the V3 i posted w/ updated testing result. --Ying > > Thanks, > -Kame > > > change v3..v2: > > 1. calculate the "total" based on the per-memcg lru size instead of > rss+cache. > > this makes the "total" value to be consistant w/ the per-node values > follows > > after. > > > > change v2..v1: > > 1. add also the file and anon pages on per-node distribution. > > > > Signed-off-by: Ying Han > > --- > > mm/memcontrol.c | 120 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > 1 files changed, 120 insertions(+), 0 deletions(-) > > > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > > index e14677c..268d806 100644 > > --- a/mm/memcontrol.c > > +++ b/mm/memcontrol.c > > @@ -1162,6 +1162,73 @@ 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_lru_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_nr_file_lru_pages(struct mem_cgroup *memcg) > > +{ > > + u64 total = 0; > > + int nid; > > + > > + for_each_node_state(nid, N_HIGH_MEMORY) > > + total += mem_cgroup_node_nr_file_lru_pages(memcg, nid); > > + > > + return total; > > +} > > + > > +unsigned long mem_cgroup_node_nr_anon_lru_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_nr_anon_lru_pages(struct mem_cgroup *memcg) > > +{ > > + u64 total = 0; > > + int nid; > > + > > + for_each_node_state(nid, N_HIGH_MEMORY) > > + total += mem_cgroup_node_nr_anon_lru_pages(memcg, nid); > > + > > + return total; > > +} > > + > > +unsigned long mem_cgroup_node_nr_lru_pages(struct mem_cgroup *memcg, int > nid) > > +{ > > + enum lru_list l; > > + u64 total = 0; > > + > > + for_each_lru(l) > > + total += mem_cgroup_get_zonestat_node(memcg, nid, l); > > + > > + return total; > > +} > > + > > +unsigned long mem_cgroup_nr_lru_pages(struct mem_cgroup *memcg) > > +{ > > + u64 total = 0; > > + int nid; > > + > > + for_each_node_state(nid, N_HIGH_MEMORY) > > + total += mem_cgroup_node_nr_lru_pages(memcg, nid); > > + > > + return total; > > +} > > + > > struct zone_reclaim_stat *mem_cgroup_get_reclaim_stat(struct mem_cgroup > *memcg, > > struct zone *zone) > > { > > @@ -4048,6 +4115,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_nr_lru_pages(mem_cont); > > + seq_printf(m, "total=%lu", total_nr); > > + for_each_node_state(nid, N_HIGH_MEMORY) { > > + node_nr = mem_cgroup_node_nr_lru_pages(mem_cont, nid); > > + seq_printf(m, " N%d=%lu", nid, node_nr); > > + } > > + seq_putc(m, '\n'); > > + > > + file_nr = mem_cgroup_nr_file_lru_pages(mem_cont); > > + seq_printf(m, "file=%lu", file_nr); > > + for_each_node_state(nid, N_HIGH_MEMORY) { > > + node_nr = mem_cgroup_node_nr_file_lru_pages(mem_cont, nid); > > + seq_printf(m, " N%d=%lu", nid, node_nr); > > + } > > + seq_putc(m, '\n'); > > + > > + anon_nr = mem_cgroup_nr_anon_lru_pages(mem_cont); > > + seq_printf(m, "anon=%lu", anon_nr); > > + for_each_node_state(nid, N_HIGH_MEMORY) { > > + node_nr = mem_cgroup_node_nr_anon_lru_pages(mem_cont, nid); > > + 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 +4583,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 +4660,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 > > > > > >