getrusage: fill ru_ixrss, ru_idrss and ru_isrss fields
Subsystems (5)
RFC PATCH 1/1 getrusage: fill ru_ixrss, ru_idrss and ru_isrss fields
Currently we always get 0 for ru_ixrss etc. fields with getrusage() or wait4(). However, GNU time (i.e. /usr/bin/time) uses these fields to report some statistics, thus we get no useful info if we don't have a chance to read /proc/<pid>/status.
Jiri worked on this many days ago, but didn't get the patch merged. After reading all the discussion in that thread [1], I rework on this, without introducing new fields for task_struct, without using CONFIG_TASK_XACCT.
In my patch, I first make vm_stat_account() independent of CONFIG_PROC_FS, so that we can continue to use it to do statistics without procfs. Then add the corresponding fields in signal_struct, and fill them in the right place with the values from mm_struct.
A quick test is here:
% strace -v -ewait4 /usr/bin/time -f '%X %p %t' cat /proc/self/status
wait4(4294967295, Name: cat
...
VmPeak: 58916 kB
VmSize: 58916 kB
VmLck: 0 kB
VmHWM: 476 kB
VmRSS: 476 kB
VmData: 172 kB VmStk: 84 kB VmExe: 20 kB
VmLib: 1444 kB
VmPTE: 40 kB
...
[{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, {ru_utime={0, 0}, ru_stime={0, 999}, ru_maxrss=512, ru_ixrss=1464, ru_idrss=172, ru_isrss=84, ru_minflt=160, ru_majflt=0, ru_nswap=0, ru_inblock=0, ru_oublock=0, ru_msgsnd=0, ru_msgrcv=0, ru_nsignals=0, ru_nvcsw=1, ru_nivcsw=1}) = 4962 --- SIGCHLD (Child exited) @ 0 (0) ---
0 0 0
Please review. Any comments are welcome.
1. http://lkml.org/lkml/2009/1/15/290
---
include/linux/mm.h +0 -7
@@ -1245,14 +1245,7 @@ typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,extern int apply_to_page_range (struct mm_struct *mm,unsigned long address,unsigned long size,pte_fn_t fn,void *data); -#ifdef CONFIG_PROC_FS void vm_stat_account (struct mm_struct *,unsigned long ,struct file *,long ); -#else -static inline void vm_stat_account (struct mm_struct *mm, -unsigned long flags,struct file *file,long pages) -{ -} -#endif /* CONFIG_PROC_FS */ #ifdef CONFIG_DEBUG_PAGEALLOC extern int debug_pagealloc_enabled;
include/linux/sched.h +25 -0
@@ -631,6 +631,7 @@ struct signal_struct {unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;unsigned long inblock, oublock, cinblock, coublock;unsigned long maxrss, cmaxrss; +unsigned long ixrss, isrss, idrss, cixrss, cisrss, cidrss;struct task_io_accounting ioac;/*
@@ -1546,6 +1547,30 @@ struct task_struct {unsigned long stack_start; }; +static inline unsigned long get_task_ixrss (struct task_struct *p) +{ +if (p->mm) +return p->mm->exec_vm * (PAGE_SIZE /1024 ); +return 0 ; +} +static inline unsigned long get_task_isrss (struct task_struct *p) +{ +if (p->mm) +return p->mm->stack_vm * (PAGE_SIZE /1024 ); +return 0 ; +} +static inline unsigned long get_task_idrss (struct task_struct *p) +{ +struct mm_struct *mm = p->mm; +unsigned long size; + +if (mm) { + size = mm->total_vm - mm->shared_vm - mm->stack_vm; +return size * (PAGE_SIZE /1024 ); + } +return 0 ; +} +/* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpumask (tsk) (&(tsk)->cpus_allowed)
kernel/exit.c +11 -1
@@ -118,6 +118,9 @@ static void __exit_signal(struct task_struct *tsk) sig->maj_flt += tsk->maj_flt; sig->nvcsw += tsk->nvcsw; sig->nivcsw += tsk->nivcsw; + sig->ixrss +=get_task_ixrss (tsk); + sig->isrss +=get_task_isrss (tsk); + sig->idrss +=get_task_idrss (tsk); sig->inblock +=task_io_get_inblock (tsk); sig->oublock +=task_io_get_oublock (tsk);task_io_accounting_add (&sig->ioac, &tsk->ioac);
@@ -946,8 +949,12 @@ NORET_TYPE void do_exit(long code)if (group_dead) {hrtimer_cancel (&tsk->signal->real_timer);exit_itimers (tsk->signal); -if (tsk->mm) +if (tsk->mm) {setmax_mm_hiwater_rss (&tsk->signal->maxrss, tsk->mm); + tsk->signal->ixrss =get_task_ixrss (tsk); + tsk->signal->isrss =get_task_isrss (tsk); + tsk->signal->idrss =get_task_idrss (tsk); + } }acct_collect (code, group_dead);if (group_dead)
@@ -1265,6 +1272,9 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p) maxrss =max (sig->maxrss, sig->cmaxrss);if (psig->cmaxrss < maxrss) psig->cmaxrss = maxrss; + psig->cixrss += sig->ixrss + sig->cixrss; + psig->cisrss += sig->isrss + sig->cisrss; + psig->cidrss += sig->idrss + sig->cidrss;task_io_accounting_add (&psig->ioac, &p->ioac);task_io_accounting_add (&psig->ioac, &sig->ioac);spin_unlock_irq (&p->real_parent->sighand->siglock);
kernel/fork.c +2 -0
@@ -891,6 +891,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk) sig->min_flt = sig->maj_flt = sig->cmin_flt = sig->cmaj_flt =0 ; sig->inblock = sig->oublock = sig->cinblock = sig->coublock =0 ; sig->maxrss = sig->cmaxrss =0 ; + sig->ixrss = sig->isrss = sig->idrss =0 ; + sig->cixrss = sig->cisrss = sig->cidrss =0 ;task_io_accounting_init (&sig->ioac); sig->sum_sched_runtime =0 ;taskstats_tgid_init (sig);
kernel/sys.c +9 -0
@@ -1331,6 +1331,9 @@ static void accumulate_thread_rusage(struct task_struct *t, struct rusage *r) r->ru_majflt += t->maj_flt; r->ru_inblock +=task_io_get_inblock (t); r->ru_oublock +=task_io_get_oublock (t); + r->ru_ixrss +=get_task_ixrss (t); + r->ru_isrss +=get_task_isrss (t); + r->ru_idrss +=get_task_idrss (t); }static void k_getrusage (struct task_struct *p,int who,struct rusage *r)
@@ -1365,6 +1368,9 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r) r->ru_inblock = p->signal->cinblock; r->ru_oublock = p->signal->coublock; maxrss = p->signal->cmaxrss; + r->ru_ixrss = p->signal->cixrss; + r->ru_isrss = p->signal->cisrss; + r->ru_idrss = p->signal->cidrss;if (who ==RUSAGE_CHILDREN )break ;
@@ -1379,6 +1385,9 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r) r->ru_majflt += p->signal->maj_flt; r->ru_inblock += p->signal->inblock; r->ru_oublock += p->signal->oublock; + r->ru_ixrss += p->signal->ixrss; + r->ru_isrss += p->signal->isrss; + r->ru_idrss += p->signal->idrss;if (maxrss < p->signal->maxrss) maxrss = p->signal->maxrss; t = p;
mm/mmap.c +0 -2
@@ -883,7 +883,6 @@ none:return NULL ; } -#ifdef CONFIG_PROC_FS void vm_stat_account (struct mm_struct *mm,unsigned long flags,struct file *file,long pages) {
@@ -899,7 +898,6 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,if (flags & (VM_RESERVED |VM_IO )) mm->reserved_vm += pages; } -#endif /* CONFIG_PROC_FS */ /* * The caller must hold down_write(¤t->mm->mmap_sem).
Quoted 97 lines
Currently we always get 0 for
ru_ixrssetc. fields withgetrusage()orwait4(). However, GNU time (i.e./usr/bin/time) uses these fields to report some statistics, thus we get no useful info if we don't have a chance to read /proc/<pid>/status.Jiri worked on this many days ago, but didn't get the patch merged. After reading all the discussion in that thread [1], I rework on this, without introducing new fields for
task_struct, without usingCONFIG_TASK_XACCT.In my patch, I first make
vm_stat_account()independent ofCONFIG_PROC_FS, so that we can continue to use it to do statistics without procfs. Then add the corresponding fields insignal_struct, and fill them in the right place with the values frommm_struct.A quick test is here:
% strace -v -ewait4
/usr/bin/time-f '%X %p %t' cat/proc/self/status
wait4(4294967295, Name: cat
...
VmPeak: 58916 kB
VmSize: 58916 kB
VmLck: 0 kB
VmHWM: 476 kB
VmRSS: 476 kBVmData: 172 kB VmStk: 84 kB VmExe: 20 kBVmLib: 1444 kB
VmPTE: 40 kB
...
[{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, {ru_utime={0, 0}, ru_stime={0, 999}, ru_maxrss=512, ru_ixrss=1464, ru_idrss=172, ru_isrss=84, ru_minflt=160, ru_majflt=0, ru_nswap=0, ru_inblock=0, ru_oublock=0, ru_msgsnd=0, ru_msgrcv=0, ru_nsignals=0, ru_nvcsw=1, ru_nivcsw=1}) = 4962 --- SIGCHLD (Child exited) @ 0 (0) ---
0 0 0Please review. Any comments are welcome.
1. http://lkml.org/lkml/2009/1/15/290
Cc Jiri Pirko <[email protected]>Cc Hugh Dickins <[email protected]>Cc KOSAKI Motohiro <[email protected]>Cc Oleg Nesterov <[email protected]>Cc Ingo Molnar <[email protected]>Signed-off-by WANG Cong <[email protected]>---
include/linux/mm.h +0
-7@@ -1245,14 +1245,7 @@ typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,extern int apply_to_page_range (struct mm_struct *mm,unsigned long address,unsigned long size,pte_fn_t fn,void *data); -#ifdef CONFIG_PROC_FS void vm_stat_account (struct mm_struct *,unsigned long ,struct file *,long ); -#else -static inline void vm_stat_account (struct mm_struct *mm, -unsigned long flags,struct file *file,long pages) -{ -} -#endif /* CONFIG_PROC_FS */ #ifdef CONFIG_DEBUG_PAGEALLOC extern int debug_pagealloc_enabled;include/linux/sched.h +14
-0@@ -631,6 +631,7 @@ struct signal_struct {unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt;unsigned long inblock, oublock, cinblock, coublock;unsigned long maxrss, cmaxrss; +unsigned long ixrss, isrss, idrss, cixrss, cisrss, cidrss;struct task_io_accounting ioac;/* @@ -1546,6 +1547,30 @@ struct task_struct {unsigned long stack_start; }; +static inline unsigned long get_task_ixrss (struct task_struct *p) +{ +if (p->mm) +return p->mm->exec_vm * (PAGE_SIZE /1024 ); +return 0 ; +} +static inline unsigned long get_task_isrss (struct task_struct *p) +{ +if (p->mm) +return p->mm->stack_vm * (PAGE_SIZE /1024 ); +return 0 ; +} +static inline unsigned long get_task_idrss (struct task_struct *p)
include/linux/sched.h struct task_struct { · line 1572
Quoted 10 lines
include/linux/sched.h +10
-0+{ +struct mm_struct *mm = p->mm; +unsigned long size; + +if (mm) { + size = mm->total_vm - mm->shared_vm - mm->stack_vm; +return size * (PAGE_SIZE /1024 ); + } +return 0 ; +}
Sorry NAK. Hugh already explained the reason. quote here
But on looking closer, there's a stronger reason to oppose this patch. You're trying to add support for the struct rusage fields
long ru_maxrss; /* maximum resident set size */
long ru_ixrss; /* integral shared memory size */
long ru_idrss; /* integral unshared data size */
long ru_isrss; /* integral unshared stack size */
And your previous patch added support for the first of those fields, correctly based on hiwater of anon_rss+file_rss already accounted. The next three fields, the subject of this patch, are named ru_XXrss:
though the 80-column comment omits to say "resident set" before "size", I believe they'd be expected to account (subdivided) resident set sizes?
your calculation is not rss nor not integral.
Quoted 7 lines · KOSAKI Motohiro
The next three fields, the subject of this patch, are named
ru_XXrss:
though the 80-column comment omits to say "resident set" before "size", I believe they'd be expected to account (subdivided) resident set sizes?your calculation is not rss nor not integral.
Hmm, I misunderstood rss here. Does it mean the memory stayed in physical mem? i.e. not swapped out.
So, if I want to get those rss statistics, I have to add some more mm_counter by myself? I only find file_rss and anon_rss in mm_struct.
Thanks.
Quoted 11 lines
Quoted 7 lines · KOSAKI Motohiro
The next three fields, the subject of this patch, are named
ru_XXrss:
though the 80-column comment omits to say "resident set" before "size", I believe they'd be expected to account (subdivided) resident set sizes?your calculation is not rss nor not integral.
Hmm, I misunderstood rss here. Does it mean the memory stayed in physical mem? i.e. not swapped out.
Yes.
Plus, 'integral' mean "tick * rss". but in dyntick environment, per tick statistics is not so easy nor low cost.
Quoted 2 lines
So, if I want to get those rss statistics, I have to add some more
mm_counterby myself? I only findfile_rssandanon_rssinmm_struct.
Hmm..
I doubt nobody use such statistics. if nobody explain real world usage, I oppose to add new counter overhead.
Quoted 8 lines · KOSAKI Motohiro
Quoted 8 lines
Quoted 7 lines · KOSAKI Motohiro
The next three fields, the subject of this patch, are named
ru_XXrss:
though the 80-column comment omits to say "resident set" before "size", I believe they'd be expected to account (subdivided) resident set sizes?your calculation is not rss nor not integral.
Quoted 7 lines
Quoted 2 lines
Hmm, I misunderstood rss here. Does it mean the memory stayed in physical mem? i.e. not swapped out.
Yes.
Plus, 'integral' mean "tick * rss". but in dyntick environment, per tick statistics is not so easy nor low cost.
Thanks for explanation!
Quoted 7 lines
Quoted 3 lines
So, if I want to get those rss statistics, I have to add some more
mm_counterby myself? I only findfile_rssandanon_rssinmm_struct.Hmm..
I doubt nobody use such statistics. if nobody explain real world usage, I oppose to add new counter overhead.
Well, this is one of the usages. :)
I just checked more, I found it's not easy to add rss statistics for stack, executable, etc... the reason is that we don't have a page flag to mark a page as used for stack etc.