Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760159AbZDBU50 (ORCPT ); Thu, 2 Apr 2009 16:57:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756381AbZDBU5S (ORCPT ); Thu, 2 Apr 2009 16:57:18 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:36089 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756344AbZDBU5Q (ORCPT ); Thu, 2 Apr 2009 16:57:16 -0400 Date: Thu, 2 Apr 2009 13:47:38 -0700 From: Andrew Morton To: Jiri Pirko Cc: kosaki.motohiro@jp.fujitsu.com, oleg@redhat.com, linux-kernel@vger.kernel.org, hugh@veritas.com, linux-mm@kvack.org Subject: Re: [PATCH for -mm] getrusage: fill ru_maxrss value Message-Id: <20090402134738.43d87cb7.akpm@linux-foundation.org> In-Reply-To: <20090106104839.78eb07d1@psychotron.englab.brq.redhat.com> References: <20081230201052.128B.KOSAKI.MOTOHIRO@jp.fujitsu.com> <20081231110816.5f80e265@psychotron.englab.brq.redhat.com> <20081231213705.1293.KOSAKI.MOTOHIRO@jp.fujitsu.com> <20090103175913.GA21180@redhat.com> <2f11576a0901031313u791d7dcex94b927cc56026e40@mail.gmail.com> <20090105163204.3ec9ff10@psychotron.englab.brq.redhat.com> <20090105141313.a4abd475.akpm@linux-foundation.org> <20090106104839.78eb07d1@psychotron.englab.brq.redhat.com> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 11754 Lines: 470 On Tue, 6 Jan 2009 10:48:39 +0100 Jiri Pirko wrote: > On Mon, 5 Jan 2009 14:13:13 -0800 > Andrew Morton wrote: > > > On Mon, 5 Jan 2009 16:32:04 +0100 > > Jiri Pirko wrote: > > > > > Changelog > > > v2 -> v3 > > > - in k_getrusage() use (inherited) sig->maxrss value in case of > > > RUSAGE_THREAD > > > > The patch which you sent was mysteriously truncated - the kernel/sys.c hunk > > is partly missing. So I took that bit from the earlier version of the patch. > Sorry for this. I should probably toss this Claws into the garbage can :/ > > > > Please check that the below is still identical to your version 3. > Nope - the tail is different. - Sending the patch again. Please use > the changelog text from previous send. > Thanks Andrew and again sorry for problems. > > I have a note here that this patch needs acks, but I didn't note who from. Someone ack it :) From: Jiri Pirko Make ->ru_maxrss value in struct rusage filled accordingly to rss hiwater mark. This struct is filled as a parameter to getrusage syscall. ->ru_maxrss value is set to KBs which is the way it is done in BSD systems. /usr/bin/time (gnu time) application converts ->ru_maxrss to KBs which seems to be incorrect behavior. Maintainer of this util was notified by me with the patch which corrects it and cc'ed. To make this happen we extend struct signal_struct by two fields. The first one is ->maxrss which we use to store rss hiwater of the task. The second one is ->cmaxrss which we use to store highest rss hiwater of all task childs. These values are used in k_getrusage() to actually fill ->ru_maxrss. k_getrusage() uses current rss hiwater value directly if mm struct exists. Note: exec() clear mm->hiwater_rss, but doesn't clear sig->maxrss. it is intetionally behavior. *BSD getrusage have exec() inheriting. Test progmam and test case =========================== getrusage.c ==== #include #include #include #include #include #include #include #include #include #include static void consume(int mega) { size_t sz = mega * 1024 * 1024; void *ptr; ptr = malloc(sz); memset(ptr, 0, sz); usleep(1); /* BSD rusage statics need to sleep 1 tick */ } static void show_rusage(char *prefix) { int err, err2; struct rusage rusage_self; struct rusage rusage_children; printf("%s: ", prefix); err = getrusage(RUSAGE_SELF, &rusage_self); if (!err) printf("self %ld ", rusage_self.ru_maxrss); err2 = getrusage(RUSAGE_CHILDREN, &rusage_children); if (!err2) printf("children %ld ", rusage_children.ru_maxrss); printf("\n"); } int main(int argc, char** argv) { int status; int c; int need_sleep_before_wait = 0; int consume_large_memory_at_first = 0; int create_child_at_first = 0; int sigign = 0; int create_child_before_exec = 0; int after_fork_test = 0; while ((c = getopt(argc, argv, "ceflsz")) != -1) { switch (c) { case 'c': create_child_at_first = 1; break; case 'e': create_child_before_exec = 1; break; case 'f': after_fork_test = 1; break; case 'l': consume_large_memory_at_first = 1; break; case 's': sigign = 1; break; case 'z': need_sleep_before_wait = 1; break; default: break; } } if (consume_large_memory_at_first) consume(100); if (create_child_at_first) system("./child -q"); if (sigign) signal(SIGCHLD, SIG_IGN); if (fork()) { usleep(1); if (need_sleep_before_wait) sleep(3); /* children become zombie */ show_rusage("pre_wait"); wait(&status); show_rusage("post_wait"); } else { usleep(1); show_rusage("fork"); if (after_fork_test) { consume(30); show_rusage("fork2"); } if (create_child_before_exec) { system("./child -lq"); usleep(1); show_rusage("fork3"); } execl("./child", "child", 0); exit(0); } return 0; } child.c ==== #include #include #include #include #include #include #include #include #include #include static void consume(int mega) { size_t sz = mega * 1024 * 1024; void *ptr; ptr = malloc(sz); memset(ptr, 0, sz); usleep(1); /* BSD rusage statics need to sleep 1 tick */ } static void show_rusage(char *prefix) { int err, err2; struct rusage rusage_self; struct rusage rusage_children; printf("%s: ", prefix); err = getrusage(RUSAGE_SELF, &rusage_self); if (!err) printf("self %ld ", rusage_self.ru_maxrss); err2 = getrusage(RUSAGE_CHILDREN, &rusage_children); if (!err2) printf("children %ld ", rusage_children.ru_maxrss); printf("\n"); } int main(int argc, char** argv) { int status; int c; int silent = 0; int light_weight = 0; while ((c = getopt(argc, argv, "lq")) != -1) { switch (c) { case 'l': light_weight = 1; break; case 'q': silent = 1; break; default: break; } } if (!silent) show_rusage("exec"); if (fork()) { if (light_weight) consume(400); else consume(700); wait(&status); } else { if (light_weight) consume(600); else consume(900); exit(0); } return 0; } testcase ======== 1. inherit fork? test way: % ./getrusage -lc bsd result: fork line is "fork: self 0 children 0". -> rusage sholdn't be inherit by fork. (both RUSAGE_SELF and RUSAGE_CHILDREN) 2. inherit exec? test way: % ./getrusage -lce bsd result: fork3: self 103204 children 60000 exec: self 103204 children 60000 fork3 and exec line are the same. -> rusage shold be inherit by exec. (both RUSAGE_SELF and RUSAGE_CHILDREN) 3. getrusage(RUSAGE_CHILDREN) collect grandchild statics? test way: % ./getrusage bsd result: post_wait line is about "post_wait: self 0 children 90000". -> RUSAGE_CHILDREN can collect grandchild. 4. zombie, but not waited children collect or not? test way: % ./getrusage -z bsd result: pre_wait line is "pre_wait: self 0 children 0". -> zombie child process (not waited-for child process) isn't accounted. 5. SIG_IGN collect or not test way: % ./getrusage -s bsd result: post_wait line is "post_wait: self 0 children 0". -> if SIGCHLD is ignored, children isn't accounted. 6. fork and malloc test way: % ./getrusage -lcf bsd result: fork line is "fork: self 0 children 0". fork2 line is about "fork: self 130000 children 0". -> rusage sholdn't be inherit by fork. (both RUSAGE_SELF and RUSAGE_CHILDREN) but additional memory cunsumption cause right maxrss calculation. Signed-off-by: Jiri Pirko Signed-off-by: KOSAKI Motohiro Cc: Oleg Nesterov Cc: Hugh Dickins Signed-off-by: Andrew Morton --- fs/exec.c | 7 +++++++ include/linux/sched.h | 1 + kernel/exit.c | 10 ++++++++++ kernel/fork.c | 1 + kernel/sys.c | 17 +++++++++++++++++ 5 files changed, 36 insertions(+) diff -puN fs/exec.c~getrusage-fill-ru_maxrss-value fs/exec.c --- a/fs/exec.c~getrusage-fill-ru_maxrss-value +++ a/fs/exec.c @@ -871,6 +871,13 @@ static int de_thread(struct task_struct sig->notify_count = 0; no_thread_group: + if (current->mm) { + unsigned long hiwater_rss = get_mm_hiwater_rss(current->mm); + + if (sig->maxrss < hiwater_rss) + sig->maxrss = hiwater_rss; + } + exit_itimers(sig); flush_itimer_signals(); diff -puN include/linux/sched.h~getrusage-fill-ru_maxrss-value include/linux/sched.h --- a/include/linux/sched.h~getrusage-fill-ru_maxrss-value +++ a/include/linux/sched.h @@ -588,6 +588,7 @@ struct signal_struct { unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw; unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt; unsigned long inblock, oublock, cinblock, coublock; + unsigned long maxrss, cmaxrss; struct task_io_accounting ioac; /* diff -puN kernel/exit.c~getrusage-fill-ru_maxrss-value kernel/exit.c --- a/kernel/exit.c~getrusage-fill-ru_maxrss-value +++ a/kernel/exit.c @@ -1056,6 +1056,12 @@ NORET_TYPE void do_exit(long code) if (group_dead) { hrtimer_cancel(&tsk->signal->real_timer); exit_itimers(tsk->signal); + if (tsk->mm) { + unsigned long hiwater_rss = get_mm_hiwater_rss(tsk->mm); + + if (tsk->signal->maxrss < hiwater_rss) + tsk->signal->maxrss = hiwater_rss; + } } acct_collect(code, group_dead); if (group_dead) @@ -1301,6 +1307,7 @@ static int wait_task_zombie(struct task_ struct signal_struct *psig; struct signal_struct *sig; struct task_cputime cputime; + unsigned long maxrss; /* * The resource counters for the group leader are in its @@ -1352,6 +1359,9 @@ static int wait_task_zombie(struct task_ psig->coublock += task_io_get_oublock(p) + sig->oublock + sig->coublock; + maxrss = max(sig->maxrss, sig->cmaxrss); + if (psig->cmaxrss < maxrss) + psig->cmaxrss = maxrss; task_io_accounting_add(&psig->ioac, &p->ioac); task_io_accounting_add(&psig->ioac, &sig->ioac); spin_unlock_irq(&p->parent->sighand->siglock); diff -puN kernel/fork.c~getrusage-fill-ru_maxrss-value kernel/fork.c --- a/kernel/fork.c~getrusage-fill-ru_maxrss-value +++ a/kernel/fork.c @@ -862,6 +862,7 @@ static int copy_signal(unsigned long clo sig->nvcsw = sig->nivcsw = sig->cnvcsw = sig->cnivcsw = 0; 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; task_io_accounting_init(&sig->ioac); sig->sum_sched_runtime = 0; taskstats_tgid_init(sig); diff -puN kernel/sys.c~getrusage-fill-ru_maxrss-value kernel/sys.c --- a/kernel/sys.c~getrusage-fill-ru_maxrss-value +++ a/kernel/sys.c @@ -1618,6 +1618,7 @@ static void k_getrusage(struct task_stru unsigned long flags; cputime_t utime, stime; struct task_cputime cputime; + unsigned long maxrss = 0; memset((char *) r, 0, sizeof *r); utime = stime = cputime_zero; @@ -1626,6 +1627,7 @@ static void k_getrusage(struct task_stru utime = task_utime(current); stime = task_stime(current); accumulate_thread_rusage(p, r); + maxrss = p->signal->maxrss; goto out; } @@ -1643,6 +1645,7 @@ static void k_getrusage(struct task_stru r->ru_majflt = p->signal->cmaj_flt; r->ru_inblock = p->signal->cinblock; r->ru_oublock = p->signal->coublock; + maxrss = p->signal->cmaxrss; if (who == RUSAGE_CHILDREN) break; @@ -1657,6 +1660,8 @@ static void k_getrusage(struct task_stru r->ru_majflt += p->signal->maj_flt; r->ru_inblock += p->signal->inblock; r->ru_oublock += p->signal->oublock; + if (maxrss < p->signal->maxrss) + maxrss = p->signal->maxrss; t = p; do { accumulate_thread_rusage(t, r); @@ -1672,6 +1677,18 @@ static void k_getrusage(struct task_stru out: cputime_to_timeval(utime, &r->ru_utime); cputime_to_timeval(stime, &r->ru_stime); + + if (who != RUSAGE_CHILDREN) { + struct mm_struct *mm = get_task_mm(p); + if (mm) { + unsigned long hiwater_rss = get_mm_hiwater_rss(mm); + + if (maxrss < hiwater_rss) + maxrss = hiwater_rss; + mmput(mm); + } + } + r->ru_maxrss = maxrss * (PAGE_SIZE / 1024); /* convert pages to KBs */ } int getrusage(struct task_struct *p, int who, struct rusage __user *ru) _ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/