memcg: refactor mem_control_numa_stat_show()
Subsystems (4)
PATCH v3 1/2 memcg: refactor mem_control_numa_stat_show()
Refactor mem_control_numa_stat_show() to use a new stats structure for smaller and simpler code. This consolidates nearly identical code.
text data bss dec hex filename
8,055,980 1,675,648 1,896,448 11,628,076 b16e2c vmlinux.before 8,055,276 1,675,648 1,896,448 11,627,372 b16b6c vmlinux.after
---
Changelog since v2:
- rebased to v3.11
- updated commit description
mm/memcontrol.c | 57 +++++++++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 34 deletions(-)
mm/memcontrol.c +23 -34
@@ -5378,45 +5378,34 @@ static int mem_cgroup_move_charge_write(struct cgroup *cgrp,static int memcg_numa_stat_show (struct cgroup *cont,struct cftype *cft,struct seq_file *m) { +struct numa_stat { +const char *name; +unsigned int lru_mask; + }; + +static const struct numa_stat stats[] = { + {"total" ,LRU_ALL }, + {"file" ,LRU_ALL_FILE }, + {"anon" ,LRU_ALL_ANON }, + {"unevictable" ,BIT (LRU_UNEVICTABLE ) }, + {NULL ,0 }/* terminator */ + }; +const struct numa_stat *stat;int nid; -unsigned long total_nr, file_nr, anon_nr, unevictable_nr; -unsigned long node_nr; +unsigned long nr;struct mem_cgroup *memcg =mem_cgroup_from_cont (cont); - total_nr =mem_cgroup_nr_lru_pages (memcg,LRU_ALL ); -seq_printf (m,"total=%lu" , total_nr); -for_each_node_state (nid,N_MEMORY ) { - node_nr =mem_cgroup_node_nr_lru_pages (memcg, nid,LRU_ALL ); -seq_printf (m," N%d=%lu" , nid, node_nr); - } -seq_putc (m,'\n' ); - - file_nr =mem_cgroup_nr_lru_pages (memcg,LRU_ALL_FILE ); -seq_printf (m,"file=%lu" , file_nr); -for_each_node_state (nid,N_MEMORY ) { - node_nr =mem_cgroup_node_nr_lru_pages (memcg, nid, -LRU_ALL_FILE ); -seq_printf (m," N%d=%lu" , nid, node_nr); - } -seq_putc (m,'\n' ); - - anon_nr =mem_cgroup_nr_lru_pages (memcg,LRU_ALL_ANON ); -seq_printf (m,"anon=%lu" , anon_nr); -for_each_node_state (nid,N_MEMORY ) { - node_nr =mem_cgroup_node_nr_lru_pages (memcg, nid, -LRU_ALL_ANON ); -seq_printf (m," N%d=%lu" , nid, node_nr); +for (stat = stats; stat->name; stat++) { + nr =mem_cgroup_nr_lru_pages (memcg, stat->lru_mask); +seq_printf (m,"%s=%lu" , stat->name, nr); +for_each_node_state (nid,N_MEMORY ) { + nr =mem_cgroup_node_nr_lru_pages (memcg, nid, + stat->lru_mask); +seq_printf (m," N%d=%lu" , nid, nr); + } +seq_putc (m,'\n' ); } -seq_putc (m,'\n' ); - unevictable_nr =mem_cgroup_nr_lru_pages (memcg,BIT (LRU_UNEVICTABLE )); -seq_printf (m,"unevictable=%lu" , unevictable_nr); -for_each_node_state (nid,N_MEMORY ) { - node_nr =mem_cgroup_node_nr_lru_pages (memcg, nid, -BIT (LRU_UNEVICTABLE )); -seq_printf (m," N%d=%lu" , nid, node_nr); - } -seq_putc (m,'\n' );return 0 ; }#endif /* CONFIG_NUMA */
Signature · 7 lines
1.8.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
PATCH v3 2/2 memcg: support hierarchical memory.numa_stats
From: Ying Han <[email protected]>
The memory.numa_stat file was not hierarchical. Memory charged to the children was not shown in parent's numa_stat.
This change adds the "hierarchical_" stats to the existing stats. The new hierarchical stats include the sum of all children's values in addition to the value of the memcg.
Tested: Create cgroup a, a/b and run workload under b. The values of b are included in the "hierarchical_*" under a.
$ cd /sys/fs/cgroup $ echo 1 > memory.use_hierarchy $ mkdir a a/b
Run workload in a/b:
$ (echo $BASHPID >> a/b/cgroup.procs && cat /some/file && bash) &
The hierarchical_ fields in parent (a) show use of workload in a/b:
$ cat a/memory.numa_stat total=0 N0=0 N1=0 N2=0 N3=0 file=0 N0=0 N1=0 N2=0 N3=0 anon=0 N0=0 N1=0 N2=0 N3=0 unevictable=0 N0=0 N1=0 N2=0 N3=0 hierarchical_total=61 N0=0 N1=41 N2=20 N3=0 hierarchical_file=14 N0=0 N1=0 N2=14 N3=0 hierarchical_anon=47 N0=0 N1=41 N2=6 N3=0 hierarchical_unevictable=0 N0=0 N1=0 N2=0 N3=0
The workload memory usage:
$ cat a/b/memory.numa_stat total=73 N0=0 N1=41 N2=32 N3=0 file=14 N0=0 N1=0 N2=14 N3=0 anon=59 N0=0 N1=41 N2=18 N3=0 unevictable=0 N0=0 N1=0 N2=0 N3=0 hierarchical_total=73 N0=0 N1=41 N2=32 N3=0 hierarchical_file=14 N0=0 N1=0 N2=14 N3=0 hierarchical_anon=59 N0=0 N1=41 N2=18 N3=0 hierarchical_unevictable=0 N0=0 N1=0 N2=0 N3=0
---
Changelog since v2:
- reworded Documentation/cgroup/memory.txt
- updated commit description
Documentation/cgroups/memory.txt | 10 +++++++--- mm/memcontrol.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-)
Documentation/cgroups/memory.txt +7 -3
@@ -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. + +The ouput format of memory.numa_stat is: 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> ... unevictable=<total anon pages> N0=<node 0 pages> N1=<node 1 pages> ... +hierarchical_<counter>=<counter pages> N0=<node 0 pages> N1=<node 1 pages> ... -And we have total = file + anon + unevictable. +The "total" count is sum of file + anon + unevictable. 6. Hierarchy support
mm/memcontrol.c +16 -0
@@ -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++) { + 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 */
Signature · 7 lines
1.8.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Johannes Weiner
maintainerRe: [PATCH 2/2 v3] memcg: support hierarchical memory.numa_stats
Hello Greg!
Documentation/cgroups/memory.txt an memcg since the pages are allowed to be allocated from any physical · line 576
Quoted 11 lines · Greg Thelen
Documentation/cgroups/memory.txt +3
-2@@ -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 [...]"?
Quoted 11 lines
mm/memcontrol.c +1
-0@@ -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);
mm/memcontrol.c static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft, · line 5410
Quoted 4 lines
mm/memcontrol.c +1
-0@@ -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?
Quoted 7 lines
mm/memcontrol.c +7
-0+ 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)
mm/memcontrol.c static int memcg_numa_stat_show(struct cgroup *cont, struct cftype *cft, · line 5427
Quoted 10 lines
mm/memcontrol.c +7
-0+ 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 [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Johannes Weiner
maintainerHi Greg,
Quoted 12 lines · Greg Thelen
mm/memcontrol.c +12
-0+struct numa_stat { +const char *name; +unsigned int lru_mask; + }; + +static const struct numa_stat stats[] = { + {"total" ,LRU_ALL }, + {"file" ,LRU_ALL_FILE }, + {"anon" ,LRU_ALL_ANON }, + {"unevictable" ,BIT (LRU_UNEVICTABLE ) }, + {NULL ,0 }/* terminator */ + };
[...]
mm/memcontrol.c static int mem_cgroup_move_charge_write(struct cgroup *cgrp, · line 5398
Quoted 1 line
mm/memcontrol.c +1
-0+for (stat = stats; stat->name; stat++) {
Please drop the NULL terminator and use ARRAY_SIZE().
Otherwise, looks good to me.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>