Hello Greg! On Wed, Sep 04, 2013 at 11:28:59PM -0700, Greg Thelen wrote: > --- a/Documentation/cgroups/memory.txt > +++ b/Documentation/cgroups/memory.txt > @@ -571,15 +571,19 @@ an memcg since the pages are allowed to be allocated from any physical > node. One of the use cases is evaluating application performance by > combining this information with the application's CPU allocation. > > -We export "total", "file", "anon" and "unevictable" pages per-node for > -each memcg. The ouput format of memory.numa_stat is: > +Each memcg's numa_stat file includes "total", "file", "anon" and "unevictable" > +per-node page counts including "hierarchical_<counter>" which sums of all > +hierarchical children's values in addition to the memcg's own value. "[...] which sums UP [...]"? > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -5394,6 +5394,7 @@ static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft, > int nid; > unsigned long nr; > struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); > + struct mem_cgroup *iter; > > for (stat = stats; stat->name; stat++) { > nr = mem_cgroup_nr_lru_pages(memcg, stat->lru_mask); > @@ -5406,6 +5407,21 @@ static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft, > seq_putc(m, '\n'); > } > > + for (stat = stats; stat->name; stat++) { Move the struct mem_cgroup *iter declaration here? > + nr = 0; > + for_each_mem_cgroup_tree(iter, memcg) > + nr += mem_cgroup_nr_lru_pages(iter, stat->lru_mask); > + seq_printf(m, "hierarchical_%s=%lu", stat->name, nr); > + for_each_node_state(nid, N_MEMORY) { > + nr = 0; > + for_each_mem_cgroup_tree(iter, memcg) > + nr += mem_cgroup_node_nr_lru_pages( > + iter, nid, stat->lru_mask); > + seq_printf(m, " N%d=%lu", nid, nr); > + } > + seq_putc(m, '\n'); > + } > + > return 0; > } > #endif /* CONFIG_NUMA */ Rest looks fine to me. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>