mm: optimize stat output for 11% sys time reduce
Subsystems (3)
PATCH 1/1 mm: optimize stat output for 11% sys time reduce
From: Jianyue Wu <[email protected]>
Replace seq_printf/seq_buf_printf with lightweight helpers to avoid printf parsing in memcg stats output.
Key changes:
- Add memcg_seq_put_name_val() for seq_file "name value\n" formatting
- Add memcg_seq_buf_put_name_val() for seq_buf "name value\n" formatting
- Update __memory_events_show(), swap_events_show(), memory_stat_format(), memory_numa_stat_show(), and related helpers
Performance:
- 1M reads of memory.stat+memory.numa_stat
- Before: real 0m9.663s, user 0m4.840s, sys 0m4.823s
- After: real 0m9.051s, user 0m4.775s, sys 0m4.275s (~11.4% sys drop)
Tests:
- Script:
for ((i=1; i<=1000000; i++)); do
: > /dev/null < /sys/fs/cgroup/memory.stat : > /dev/null < /sys/fs/cgroup/memory.numa_stat
done
--- mm/memcontrol-v1.c | 97 ++++++++++++++++++++++++++-------------------- mm/memcontrol-v1.h | 34 ++++++++++++++++ mm/memcontrol.c | 87 ++++++++++++++++++++++------------------- 3 files changed, 137 insertions(+), 81 deletions(-)
mm/memcontrol-v1.c +55 -42
@@ -10,7 +10,7 @@#include <linux/poll.h> #include <linux/sort.h> #include <linux/file.h> -#include <linux/seq_buf.h> +#include <linux/string.h> #include "internal.h" #include "swap.h"
@@ -1795,25 +1795,33 @@ static int memcg_numa_stat_show(struct seq_file *m, void *v)mem_cgroup_flush_stats (memcg);for (stat = stats; stat < stats +ARRAY_SIZE (stats); stat++) { -seq_printf (m,"%s=%lu" , stat->name, -mem_cgroup_nr_lru_pages (memcg, stat->lru_mask, - false)); -for_each_node_state (nid,N_MEMORY ) -seq_printf (m," N%d=%lu" , nid, -mem_cgroup_node_nr_lru_pages (memcg, nid, - stat->lru_mask, false)); +seq_puts (m, stat->name); +seq_put_decimal_ull (m,"=" , + (u64 )mem_cgroup_nr_lru_pages (memcg, stat->lru_mask, + false)); +for_each_node_state (nid,N_MEMORY ) { +seq_put_decimal_ull (m," N" , nid); +seq_put_decimal_ull (m,"=" , + (u64 )mem_cgroup_node_nr_lru_pages (memcg, nid, + stat->lru_mask, false)); + }seq_putc (m,'\n' ); }for (stat = stats; stat < stats +ARRAY_SIZE (stats); stat++) { -seq_printf (m,"hierarchical_%s=%lu" , stat->name, -mem_cgroup_nr_lru_pages (memcg, stat->lru_mask, - true)); -for_each_node_state (nid,N_MEMORY ) -seq_printf (m," N%d=%lu" , nid, -mem_cgroup_node_nr_lru_pages (memcg, nid, - stat->lru_mask, true)); +seq_puts (m,"hierarchical_" ); +seq_puts (m, stat->name); +seq_put_decimal_ull (m,"=" , + (u64 )mem_cgroup_nr_lru_pages (memcg, stat->lru_mask, + true)); +for_each_node_state (nid,N_MEMORY ) { +seq_put_decimal_ull (m," N" , nid); +seq_put_decimal_ull (m,"=" , + (u64 )mem_cgroup_node_nr_lru_pages (memcg, nid, + stat->lru_mask, + true)); + }seq_putc (m,'\n' ); }
@@ -1879,17 +1887,17 @@ void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s)unsigned long nr; nr =memcg_page_state_local_output (memcg, memcg1_stats[i]); -seq_buf_printf (s,"%s %lu\n" , memcg1_stat_names[i], nr); +memcg_seq_buf_put_name_val (s, memcg1_stat_names[i], (u64 )nr); }for (i =0 ; i <ARRAY_SIZE (memcg1_events); i++) -seq_buf_printf (s,"%s %lu\n" ,vm_event_name (memcg1_events[i]), -memcg_events_local (memcg, memcg1_events[i])); +memcg_seq_buf_put_name_val (s,vm_event_name (memcg1_events[i]), + (u64 )memcg_events_local (memcg, memcg1_events[i]));for (i =0 ; i <NR_LRU_LISTS ; i++) -seq_buf_printf (s,"%s %lu\n" ,lru_list_name (i), -memcg_page_state_local (memcg,NR_LRU_BASE + i) * -PAGE_SIZE ); +memcg_seq_buf_put_name_val (s,lru_list_name (i), +memcg_page_state_local (memcg,NR_LRU_BASE + i) * +PAGE_SIZE );/* Hierarchical information */ memory = memsw =PAGE_COUNTER_MAX ;
@@ -1897,28 +1905,33 @@ void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) memory =min (memory,READ_ONCE (mi->memory.max)); memsw =min (memsw,READ_ONCE (mi->memsw.max)); } -seq_buf_printf (s,"hierarchical_memory_limit %llu\n" , - (u64 )memory *PAGE_SIZE ); -seq_buf_printf (s,"hierarchical_memsw_limit %llu\n" , - (u64 )memsw *PAGE_SIZE ); +memcg_seq_buf_put_name_val (s,"hierarchical_memory_limit" , + (u64 )memory *PAGE_SIZE ); +memcg_seq_buf_put_name_val (s,"hierarchical_memsw_limit" , + (u64 )memsw *PAGE_SIZE );for (i =0 ; i <ARRAY_SIZE (memcg1_stats); i++) {unsigned long nr; - nr =memcg_page_state_output (memcg, memcg1_stats[i]); -seq_buf_printf (s,"total_%s %llu\n" , memcg1_stat_names[i], - (u64 )nr); + nr =memcg_page_state_output (memcg, memcg1_stats[i]); +seq_buf_puts (s,"total_" ); +memcg_seq_buf_put_name_val (s, memcg1_stat_names[i], + (u64 )nr); } -for (i =0 ; i <ARRAY_SIZE (memcg1_events); i++) -seq_buf_printf (s,"total_%s %llu\n" , -vm_event_name (memcg1_events[i]), - (u64 )memcg_events (memcg, memcg1_events[i])); +for (i =0 ; i <ARRAY_SIZE (memcg1_events); i++) { +seq_buf_puts (s,"total_" ); +memcg_seq_buf_put_name_val (s, +vm_event_name (memcg1_events[i]), + (u64 )memcg_events (memcg, memcg1_events[i])); + } -for (i =0 ; i <NR_LRU_LISTS ; i++) -seq_buf_printf (s,"total_%s %llu\n" ,lru_list_name (i), - (u64 )memcg_page_state (memcg,NR_LRU_BASE + i) * -PAGE_SIZE ); +for (i =0 ; i <NR_LRU_LISTS ; i++) { +seq_buf_puts (s,"total_" ); +memcg_seq_buf_put_name_val (s,lru_list_name (i), + (u64 )memcg_page_state (memcg,NR_LRU_BASE + i) * + (PAGE_SIZE )); + }#ifdef CONFIG_DEBUG_VM {
@@ -1933,8 +1946,8 @@ void memcg1_stat_format(struct mem_cgroup *memcg, struct seq_buf *s) anon_cost += mz->lruvec.anon_cost; file_cost += mz->lruvec.file_cost; } -seq_buf_printf (s,"anon_cost %lu\n" , anon_cost); -seq_buf_printf (s,"file_cost %lu\n" , file_cost); +memcg_seq_buf_put_name_val (s,"anon_cost" , (u64 )anon_cost); +memcg_seq_buf_put_name_val (s,"file_cost" , (u64 )file_cost); }#endif }
@@ -1969,10 +1982,10 @@ static int mem_cgroup_oom_control_read(struct seq_file *sf, void *v) {struct mem_cgroup *memcg =mem_cgroup_from_seq (sf); -seq_printf (sf,"oom_kill_disable %d\n" ,READ_ONCE (memcg->oom_kill_disable)); -seq_printf (sf,"under_oom %d\n" , (bool )memcg->under_oom); -seq_printf (sf,"oom_kill %lu\n" , -atomic_long_read (&memcg->memory_events[MEMCG_OOM_KILL ])); +memcg_seq_put_name_val (sf,"oom_kill_disable" ,READ_ONCE (memcg->oom_kill_disable)); +memcg_seq_put_name_val (sf,"under_oom" , (bool )memcg->under_oom); +memcg_seq_put_name_val (sf,"oom_kill" , + (u64 )atomic_long_read (&memcg->memory_events[MEMCG_OOM_KILL ]));return 0 ; }
mm/memcontrol-v1.h +34 -0
@@ -4,6 +4,9 @@#define __MM_MEMCONTROL_V1_H#include <linux/cgroup-defs.h> +#include <linux/seq_buf.h> +#include <linux/seq_file.h> +#include <linux/sprintf.h> /* Cgroup v1 and v2 common declarations */
@@ -33,6 +36,37 @@ int memory_stat_show(struct seq_file *m, void *v);void mem_cgroup_id_get_many (struct mem_cgroup *memcg,unsigned int n);struct mem_cgroup *mem_cgroup_id_get_online (struct mem_cgroup *memcg); +/* Max 2^64 - 1 = 18446744073709551615 (20 digits) */ +#define MEMCG_DEC_U64_MAX_LEN 20 + +static inline void memcg_seq_put_name_val (struct seq_file *m,const char *name, +u64 val) +{ +seq_puts (m, name); +/* need a space between name and value */ +seq_put_decimal_ull (m," " , val); +seq_putc (m,'\n' ); +} + +static inline void memcg_seq_buf_put_name_val (struct seq_buf *s, +const char *name,u64 val) +{ +char num_buf[MEMCG_DEC_U64_MAX_LEN ]; +int num_len; + + num_len =num_to_str (num_buf,sizeof (num_buf), val,0 ); +if (num_len <=0 ) +return ; + +if (seq_buf_puts (s, name)) +return ; +if (seq_buf_putc (s,' ' )) +return ; +if (seq_buf_putmem (s, num_buf, num_len)) +return ; +seq_buf_putc (s,'\n' ); +} +/* Cgroup v1-specific declarations */ #ifdef CONFIG_MEMCG_V1
mm/memcontrol.c +48 -39
162 lines not on this page · raw message
Signature · 1 line
2.43.0