Date: Tue, 16 Dec 2008 16:20:54 +0100
From: Oleg Nesterov <oleg@redhat.com>
To: Jiri Pirko <jpirko@redhat.com>
Cc: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>,
       Michael Kerrisk <mtk.manpages@googlemail.com>,
       linux-api@vger.kernel.org, Hugh Dickins <hugh@veritas.com>,
       jlim@sgi.com, kosaki.motohiro@jp.fujitsu.com
Subject: Re: [PATCH, RESEND] getrusage: fill ru_maxrss value
Message-ID: <20081216152054.GA17012@redhat.com>
References: <20081216155641.1411f8a7@psychotron.englab.brq.redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20081216155641.1411f8a7@psychotron.englab.brq.redhat.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1535
Lines: 42

On 12/16, Jiri Pirko wrote:
>
> This patch makes ->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 pages which might be correct
> as "time" application converts it to KBs.
>
> 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.
>
> We clear the ->maxrss as a part of flush_old_exec() to be consistent
> because bprm_mm_init() does not copy ->hiwater_rss.

Imho the patch is fine, but

> @@ -1598,6 +1601,15 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r)
>  out:
>  	cputime_to_timeval(utime, &r->ru_utime);
>  	cputime_to_timeval(stime, &r->ru_stime);
> +
> +	task_lock(p);
> +	if (p->mm) {
> +		unsigned long maxrss = get_mm_hiwater_rss(p->mm);
> +
> +		if (r->ru_maxrss < maxrss)
> +			r->ru_maxrss = maxrss;
> +	}
> +	task_unlock(p);

I think the code above should check "if (who != RUSAGE_CHILDREN) ?

Oleg.

--
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/