mm/vmstat: add helpers to get vmstat item names for each enum type
Subsystems (5)
PATCH 1/2 mm/vmstat: add helpers to get vmstat item names for each enum type
Statistics in vmstat is combined from counters with different structure, but names for them are merged into one array.
This patch adds trivial helpers to get name for each item:
const char *zone_stat_name(enum zone_stat_item item); const char *numa_stat_name(enum numa_stat_item item); const char *node_stat_name(enum node_stat_item item); const char *writeback_stat_name(enum writeback_stat_item item); const char *vm_event_name(enum vm_event_item item);
Names for enum writeback_stat_item are folded in the middle of vmstat_text so this patch moves declaration into header to calculate offset of following items.
Also this patch reuses piece of node stat names for lru list names:
const char *lru_list_name(enum lru_list lru);
This returns common lru list names: "inactive_anon", "active_anon", "inactive_file", "active_file", "unevictable".
--- drivers/base/node.c | 9 +++------ include/linux/vmstat.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ mm/vmstat.c | 27 +++++++++----------------- 3 files changed, 62 insertions(+), 24 deletions(-)
drivers/base/node.c +3 -6
@@ -496,20 +496,17 @@ static ssize_t node_read_vmstat(struct device *dev,int n =0 ;for (i =0 ; i <NR_VM_ZONE_STAT_ITEMS ; i++) - n +=sprintf (buf+n,"%s %lu\n" , vmstat_text[i], + n +=sprintf (buf+n,"%s %lu\n" ,zone_stat_name (i),sum_zone_node_page_state (nid, i));#ifdef CONFIG_NUMA for (i =0 ; i <NR_VM_NUMA_STAT_ITEMS ; i++) - n +=sprintf (buf+n,"%s %lu\n" , - vmstat_text[i +NR_VM_ZONE_STAT_ITEMS ], + n +=sprintf (buf+n,"%s %lu\n" ,numa_stat_name (i),sum_zone_numa_state (nid, i));#endif for (i =0 ; i <NR_VM_NODE_STAT_ITEMS ; i++) - n +=sprintf (buf+n,"%s %lu\n" , - vmstat_text[i +NR_VM_ZONE_STAT_ITEMS + -NR_VM_NUMA_STAT_ITEMS ], + n +=sprintf (buf+n,"%s %lu\n" ,node_stat_name (i),node_page_state (pgdat, i));return n;
include/linux/vmstat.h +50 -0
60 lines not on this page · raw message
mm/vmstat.c +9 -18
@@ -1134,7 +1134,7 @@ const char * const vmstat_text[] = {"numa_other" , #endif -/* Node-based counters */ +/* enum node_stat_item counters */ "nr_inactive_anon" ,"nr_active_anon" , "nr_inactive_file",
@@ -1547,10 +1547,8 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,if (is_zone_first_populated (pgdat, zone)) {seq_printf (m,"\n per-node stats" );for (i =0 ; i <NR_VM_NODE_STAT_ITEMS ; i++) { -seq_printf (m,"\n %-12s %lu" , - vmstat_text[i +NR_VM_ZONE_STAT_ITEMS + -NR_VM_NUMA_STAT_ITEMS ], -node_page_state (pgdat, i)); +seq_printf (m,"\n %-12s %lu" ,node_stat_name (i), +node_page_state (pgdat, i)); } } seq_printf(m,
@@ -1583,14 +1581,13 @@ static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat, }for (i =0 ; i <NR_VM_ZONE_STAT_ITEMS ; i++) -seq_printf (m,"\n %-12s %lu" , vmstat_text[i], -zone_page_state (zone, i)); +seq_printf (m,"\n %-12s %lu" ,zone_stat_name (i), +zone_page_state (zone, i));#ifdef CONFIG_NUMA for (i =0 ; i <NR_VM_NUMA_STAT_ITEMS ; i++) -seq_printf (m,"\n %-12s %lu" , - vmstat_text[i +NR_VM_ZONE_STAT_ITEMS ], -zone_numa_state_snapshot (zone, i)); +seq_printf (m,"\n %-12s %lu" ,numa_stat_name (i), +zone_numa_state_snapshot (zone, i));#endif seq_printf (m,"\n pagesets" );
@@ -1641,12 +1638,6 @@ static const struct seq_operations zoneinfo_op = { .show = zoneinfo_show, }; -enum writeback_stat_item { -NR_DIRTY_THRESHOLD , -NR_DIRTY_BG_THRESHOLD , -NR_VM_WRITEBACK_STAT_ITEMS , -}; -static void *vmstat_start (struct seq_file *m,loff_t *pos) {unsigned long *v;
@@ -1764,7 +1755,7 @@ int vmstat_refresh(struct ctl_table *table, int write, val =atomic_long_read (&vm_zone_stat[i]);if (val <0 ) {pr_warn ("%s: %s %ld\n" , - __func__, vmstat_text[i], val); + __func__,zone_stat_name (i), val); err = -EINVAL ; } }
@@ -1773,7 +1764,7 @@ int vmstat_refresh(struct ctl_table *table, int write, val =atomic_long_read (&vm_numa_stat[i]);if (val <0 ) {pr_warn ("%s: %s %ld\n" , - __func__, vmstat_text[i +NR_VM_ZONE_STAT_ITEMS ], val); + __func__,numa_stat_name (i), val); err = -EINVAL ; } }
PATCH 2/2 mm/memcontrol: use vmstat names for printing statistics
Use common names from vmstat array when possible. This gives not much difference in code size for now, but should help in keeping interfaces consistent.
add/remove: 0/2 grow/shrink: 2/0 up/down: 70/-72 (-2)
Function old new delta memory_stat_format 984 1050 +66 memcg_stat_show 957 961 +4 memcg1_event_names 32 - -32 mem_cgroup_lru_names 40 - -40
Total: Before=14485337, After=14485335, chg -0.00%
--- include/linux/vmstat.h | 4 ++-- mm/memcontrol.c | 52 ++++++++++++++++++++---------------------------- mm/vmstat.c | 9 +++++--- 3 files changed, 29 insertions(+), 36 deletions(-)
include/linux/vmstat.h +2 -2
@@ -420,7 +420,7 @@ static inline const char *writeback_stat_name(enum writeback_stat_item item) item]; } -#ifdef CONFIG_VM_EVENT_COUNTERS +#if defined(CONFIG_VM_EVENT_COUNTERS ) || defined(CONFIG_MEMCG )static inline const char *vm_event_name (enum vm_event_item item) { return vmstat_text[NR_VM_ZONE_STAT_ITEMS +
@@ -429,6 +429,6 @@ static inline const char *vm_event_name(enum vm_event_item item)NR_VM_WRITEBACK_STAT_ITEMS + item]; } -#endif /* CONFIG_VM_EVENT_COUNTERS */ +#endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */ #endif /* _LINUX_VMSTAT_H */
mm/memcontrol.c +22 -30
115 lines not on this page · raw message
mm/vmstat.c +5 -4
@@ -1084,7 +1084,8 @@ int fragmentation_index(struct zone *zone, unsigned int order) }#endif -#if defined(CONFIG_PROC_FS ) || defined(CONFIG_SYSFS ) || defined(CONFIG_NUMA ) +#if defined(CONFIG_PROC_FS ) || defined(CONFIG_SYSFS ) || \ + defined(CONFIG_NUMA ) || defined(CONFIG_MEMCG )#ifdef CONFIG_ZONE_DMA #define TEXT_FOR_DMA (xx) xx "_dma",#else
@@ -1172,7 +1173,7 @@ const char * const vmstat_text[] = { "nr_dirty_threshold", "nr_dirty_background_threshold", -#ifdef CONFIG_VM_EVENT_COUNTERS +#if defined(CONFIG_VM_EVENT_COUNTERS ) || defined(CONFIG_MEMCG )/* enum vm_event_item counters */ "pgpgin" , "pgpgout",
@@ -1291,9 +1292,9 @@ const char * const vmstat_text[] = { "swap_ra", "swap_ra_hit", #endif -#endif /* CONFIG_VM_EVENTS_COUNTERS */ +#endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */ }; -#endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA */ +#endif /* CONFIG_PROC_FS || CONFIG_SYSFS || CONFIG_NUMA || CONFIG_MEMCG */ #if (defined(CONFIG_DEBUG_FS) && defined(CONFIG_COMPACTION)) || \ defined(CONFIG_PROC_FS)