From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
To: Oleg Nesterov <oleg@redhat.com>
Cc: kosaki.motohiro@jp.fujitsu.com,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-mm <linux-mm@kvack.org>,
pageexec@freemail.hu, Solar Designer <solar@openwall.com>,
Eugene Teo <eteo@redhat.com>,
Brad Spengler <spender@grsecurity.net>,
Roland McGrath <roland@redhat.com>
Subject: Re: [resend][PATCH 4/4] oom: don't ignore rss in nascent mm
Date: Mon, 29 Nov 2010 14:25:31 +0900 (JST) [thread overview]
Message-ID: <20101129093803.829F.A69D9226@jp.fujitsu.com> (raw)
In-Reply-To: <20101125193659.GA14510@redhat.com>
> On 11/25, Oleg Nesterov wrote:
> >
> > Great! I'll send the patch tomorrow.
> >
> > Even if you prefer another fix for 2.6.37/stable, I'd like to see
> > your review to know if it is correct or not (for backporting).
>
> OK, what do you think about the patch below?
Great. Thanks a lot.
>
> Seems to work, with this patch the test-case doesn't kill the
> system (sysctl_oom_kill_allocating_task == 0).
>
> I didn't dare to change !CONFIG_MMU case, I do not know how to
> test it.
>
> The patch is not complete, compat_copy_strings() needs changes.
> But, shouldn't it use get_arg_page() too? Otherwise, where do
> we check RLIMIT_STACK?
>
Because NOMMU doesn't have variable length argv. Instead it is still
using MAX_ARG_STRLEN as old MMU code.
32 pages hard coded argv limitation naturally prevent this nascent mm
issue.
> The patch asks for the cleanups. In particular, I think exec_mmap()
> should accept bprm, not mm. But I'd prefer to do this later.
>
> Oleg.
General request. Please consider to keep Brad's reported-by tag.
>
> include/linux/binfmts.h | 1 +
> fs/exec.c | 28 ++++++++++++++++++++++++++--
> 2 files changed, 27 insertions(+), 2 deletions(-)
>
> --- K/include/linux/binfmts.h~acct_exec_mem 2010-08-19 11:35:00.000000000 +0200
> +++ K/include/linux/binfmts.h 2010-11-25 20:19:33.000000000 +0100
> @@ -33,6 +33,7 @@ struct linux_binprm{
> # define MAX_ARG_PAGES 32
> struct page *page[MAX_ARG_PAGES];
> #endif
> + unsigned long vma_pages;
> struct mm_struct *mm;
> unsigned long p; /* current top of mem */
> unsigned int
> --- K/fs/exec.c~acct_exec_mem 2010-11-25 15:16:56.000000000 +0100
> +++ K/fs/exec.c 2010-11-25 20:20:49.000000000 +0100
> @@ -162,6 +162,25 @@ out:
> return error;
> }
>
> +static void acct_arg_size(struct linux_binprm *bprm, unsigned long pages)
Please move this function into #ifdef CONFIG_MMU. nommu code doesn't use it.
> +{
> + struct mm_struct *mm = current->mm;
> + long diff = pages - bprm->vma_pages;
I prefer to cast signed before assignment. It's safer more.
> +
> + if (!mm || !diff)
> + return;
> +
> + bprm->vma_pages += diff;
> +
> +#ifdef SPLIT_RSS_COUNTING
> + add_mm_counter(mm, MM_ANONPAGES, diff);
> +#else
> + spin_lock(&mm->page_table_lock);
> + add_mm_counter(mm, MM_ANONPAGES, diff);
> + spin_unlock(&mm->page_table_lock);
> +#endif
OK, looks good.
> +}
> +
> #ifdef CONFIG_MMU
>
> static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
> @@ -186,6 +205,8 @@ static struct page *get_arg_page(struct
> unsigned long size = bprm->vma->vm_end - bprm->vma->vm_start;
> struct rlimit *rlim;
>
> + acct_arg_size(bprm, size / PAGE_SIZE);
> +
> /*
> * We've historically supported up to 32 pages (ARG_MAX)
> * of argument strings even with small stacks
> @@ -1003,6 +1024,7 @@ int flush_old_exec(struct linux_binprm *
> /*
> * Release all of the old mmap stuff
> */
> + acct_arg_size(bprm, 0);
Why do we need this unacct here? I mean 1) if exec_mmap() is success,
we don't need unaccount at all 2) if exec_mmap() is failure, an epilogue of
do_execve() does unaccount thing.
> retval = exec_mmap(bprm->mm);
> if (retval)
> goto out;
> @@ -1426,8 +1448,10 @@ int do_execve(const char * filename,
> return retval;
>
> out:
> - if (bprm->mm)
> - mmput (bprm->mm);
> + if (bprm->mm) {
> + acct_arg_size(bprm, 0);
> + mmput(bprm->mm);
> + }
>
> out_file:
> if (bprm->file) {
>
next prev parent reply other threads:[~2010-11-29 5:25 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-25 3:26 [resend][PATCH 1/4] oom: remove totalpage normalization from oom_badness() KOSAKI Motohiro
2010-10-25 3:27 ` [resend][PATCH 2/4] Revert "oom: deprecate oom_adj tunable" KOSAKI Motohiro
2010-10-25 20:40 ` David Rientjes
2010-10-26 13:01 ` KOSAKI Motohiro
2010-10-26 19:37 ` David Rientjes
2010-11-01 7:06 ` KOSAKI Motohiro
2010-11-01 19:36 ` David Rientjes
2010-11-09 2:26 ` KOSAKI Motohiro
2010-11-09 3:28 ` KOSAKI Motohiro
2010-11-15 0:24 ` KOSAKI Motohiro
2010-11-15 9:59 ` David Rientjes
2010-11-09 23:33 ` David Rientjes
2010-11-09 23:35 ` Alan Cox
2010-11-09 23:48 ` David Rientjes
2010-11-09 23:55 ` [patch] oom: document obsolete oom_adj tunable David Rientjes
2010-11-15 0:22 ` KOSAKI Motohiro
2010-11-15 10:38 ` David Rientjes
2010-11-23 7:16 ` KOSAKI Motohiro
2010-11-14 5:07 ` [resend][PATCH 2/4] Revert "oom: deprecate oom_adj tunable" KOSAKI Motohiro
2010-11-14 21:39 ` David Rientjes
2010-11-23 7:16 ` KOSAKI Motohiro
2010-11-28 1:41 ` David Rientjes
2010-11-30 13:03 ` KOSAKI Motohiro
2010-11-30 20:07 ` David Rientjes
2010-10-25 3:28 ` [resend][PATCH 3/4] move cred_guard_mutex from task_struct to signal_struct KOSAKI Motohiro
2010-10-25 17:26 ` Roland McGrath
2010-10-25 17:42 ` Oleg Nesterov
2010-10-25 17:51 ` Roland McGrath
2010-10-26 13:04 ` KOSAKI Motohiro
2010-10-26 13:18 ` Roland McGrath
2010-10-25 3:29 ` [resend][PATCH 4/4] oom: don't ignore rss in nascent mm KOSAKI Motohiro
2010-10-25 11:28 ` pageexec
2010-10-26 7:25 ` KOSAKI Motohiro
2010-11-23 14:34 ` Oleg Nesterov
2010-11-24 0:24 ` KOSAKI Motohiro
2010-11-24 11:09 ` Oleg Nesterov
2010-11-25 11:06 ` KOSAKI Motohiro
2010-11-25 14:02 ` Oleg Nesterov
2010-11-25 19:36 ` Oleg Nesterov
2010-11-29 5:25 ` KOSAKI Motohiro [this message]
2010-11-29 11:33 ` Oleg Nesterov
2010-11-29 18:23 ` Oleg Nesterov
2010-11-30 19:54 ` [PATCH 0/2] exec: more excessive argument size fixes for 2.6.37/stable Oleg Nesterov
2010-11-30 19:55 ` [PATCH 1/2] exec: make argv/envp memory visible to oom-killer Oleg Nesterov
2010-12-01 0:12 ` KOSAKI Motohiro
2010-12-01 18:07 ` Oleg Nesterov
2010-11-30 19:56 ` [PATCH 2/2] exec: copy-and-paste the fixes into compat_do_execve() paths Oleg Nesterov
2010-12-01 3:04 ` KOSAKI Motohiro
2010-11-30 20:00 ` [PATCH 0/4] exec: unify compat/non-compat code Oleg Nesterov
2010-11-30 20:00 ` [PATCH 1/4] exec: introduce get_arg_ptr() helper Oleg Nesterov
2010-11-30 20:01 ` [PATCH 2/4] exec: introduce "bool compat" argument Oleg Nesterov
2010-11-30 20:01 ` [PATCH 3/4] exec: unify compat_do_execve() code Oleg Nesterov
2010-12-01 17:37 ` (No subject header) Milton Miller
2010-12-01 18:27 ` Oleg Nesterov
2011-02-25 17:52 ` [PATCH 0/4 RESEND] exec: unify compat/non-compat code Oleg Nesterov
2011-02-25 17:52 ` [PATCH 1/5] exec: introduce get_arg_ptr() helper Oleg Nesterov
2011-02-25 17:52 ` [PATCH 2/5] exec: introduce "bool compat" argument Oleg Nesterov
2011-02-25 18:57 ` Linus Torvalds
2011-02-26 12:37 ` Oleg Nesterov
2011-02-25 17:53 ` [PATCH 3/5] exec: unify compat_do_execve() code Oleg Nesterov
2011-02-25 19:10 ` Linus Torvalds
2011-02-26 12:37 ` Oleg Nesterov
2011-02-26 12:57 ` Oleg Nesterov
2011-02-26 15:55 ` Linus Torvalds
2011-02-26 17:44 ` Oleg Nesterov
2011-03-01 20:47 ` [PATCH v2 0/5] exec: unify native/compat code Oleg Nesterov
2011-03-01 20:48 ` [PATCH v2 1/5] exec: introduce get_arg_ptr() helper Oleg Nesterov
2011-03-01 20:48 ` [PATCH v2 2/5] exec: introduce "bool compat" argument Oleg Nesterov
2011-03-01 20:48 ` [PATCH v2 3/5] exec: introduce conditional_user_ptr_t Oleg Nesterov
2011-03-01 20:49 ` [PATCH v2 4/5] exec: unify do_execve/compat_do_execve code Oleg Nesterov
2011-03-01 20:49 ` [PATCH v2 5/5] exec: document acct_arg_size() Oleg Nesterov
2011-03-01 21:39 ` [PATCH v2 0/5] exec: unify native/compat code Linus Torvalds
2011-03-02 16:26 ` [PATCH v3 0/4] " Oleg Nesterov
2011-03-02 16:27 ` [PATCH v3 1/4] exec: introduce get_arg_ptr() helper Oleg Nesterov
2011-03-03 3:01 ` KOSAKI Motohiro
2011-03-03 15:47 ` Oleg Nesterov
2011-03-03 16:07 ` Linus Torvalds
2011-03-05 20:30 ` [PATCH v4 0/4] exec: unify native/compat code Oleg Nesterov
2011-03-05 20:31 ` [PATCH v4 1/4] exec: introduce get_user_arg_ptr() helper Oleg Nesterov
2011-03-05 20:31 ` [PATCH v4 2/4] exec: introduce struct user_arg_ptr Oleg Nesterov
2011-03-05 20:31 ` [PATCH v4 3/4] exec: unify do_execve/compat_do_execve code Oleg Nesterov
2011-03-05 20:52 ` Linus Torvalds
2011-03-05 21:20 ` Oleg Nesterov
2011-03-05 20:31 ` [PATCH v4 4/4] exec: document acct_arg_size() Oleg Nesterov
2011-03-06 12:04 ` [PATCH v4 0/4] exec: unify native/compat code KOSAKI Motohiro
2011-03-06 17:01 ` [PATCH v5 " Oleg Nesterov
2011-03-06 17:02 ` [PATCH v5 1/4] exec: introduce get_user_arg_ptr() helper Oleg Nesterov
2011-03-06 17:02 ` [PATCH v5 2/4] exec: introduce struct user_arg_ptr Oleg Nesterov
2011-03-06 17:02 ` [PATCH v5 3/4] exec: unify do_execve/compat_do_execve code Oleg Nesterov
2011-03-06 17:03 ` [PATCH v5 4/4] exec: document acct_arg_size() Oleg Nesterov
2011-03-02 16:27 ` [PATCH v3 2/4] exec: introduce struct conditional_ptr Oleg Nesterov
2011-03-03 3:08 ` KOSAKI Motohiro
2011-03-02 16:27 ` [PATCH v3 3/4] exec: unify do_execve/compat_do_execve code Oleg Nesterov
2011-03-03 3:13 ` KOSAKI Motohiro
2011-03-02 16:28 ` [PATCH v3 4/4] exec: document acct_arg_size() Oleg Nesterov
2011-03-03 3:09 ` KOSAKI Motohiro
2011-03-02 16:44 ` [PATCH v3 0/4] exec: unify native/compat code Oleg Nesterov
2011-03-02 18:00 ` Linus Torvalds
2011-03-02 19:40 ` David Miller
2011-03-02 19:48 ` Linus Torvalds
2011-03-02 19:54 ` David Miller
2011-02-25 17:53 ` [PATCH 4/5] exec: unexport acct_arg_size() and get_arg_page() Oleg Nesterov
2011-02-25 17:54 ` [PATCH 5/5] exec: document acct_arg_size() Oleg Nesterov
2011-02-25 18:54 ` [PATCH 0/4 RESEND] exec: unify compat/non-compat code Linus Torvalds
2011-02-26 12:35 ` Oleg Nesterov
2010-11-30 20:01 ` [PATCH 4/4] exec: unexport acct_arg_size() and get_arg_page() Oleg Nesterov
2010-12-01 3:09 ` [PATCH 0/4] exec: unify compat/non-compat code KOSAKI Motohiro
2010-11-30 0:06 ` [resend][PATCH 4/4] oom: don't ignore rss in nascent mm KOSAKI Motohiro
2010-10-25 20:37 ` [resend][PATCH 1/4] oom: remove totalpage normalization from oom_badness() David Rientjes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101129093803.829F.A69D9226@jp.fujitsu.com \
--to=kosaki.motohiro@jp.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=eteo@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=oleg@redhat.com \
--cc=pageexec@freemail.hu \
--cc=roland@redhat.com \
--cc=solar@openwall.com \
--cc=spender@grsecurity.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).