From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
To: mhocko@kernel.org, linux-mm@kvack.org
Cc: rientjes@google.com, oleg@redhat.com, vdavydov@parallels.com,
akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
mhocko@suse.com
Subject: Re: [PATCH 07/10] mm, oom: fortify task_will_free_mem
Date: Thu, 9 Jun 2016 22:18:28 +0900 [thread overview]
Message-ID: <201606092218.FCC48987.MFQLVtSHJFOOFO@I-love.SAKURA.ne.jp> (raw)
In-Reply-To: <1465473137-22531-8-git-send-email-mhocko@kernel.org>
Michal Hocko wrote:
> @@ -766,15 +797,12 @@ void oom_kill_process(struct oom_control *oc, struct task_struct *p,
> * If the task is already exiting, don't alarm the sysadmin or kill
> * its children or threads, just set TIF_MEMDIE so it can die quickly
> */
> - task_lock(p);
> - if (p->mm && task_will_free_mem(p)) {
> + if (task_will_free_mem(p)) {
I think it is possible that p->mm becomes NULL here.
Also, I think setting TIF_MEMDIE on p when find_lock_task_mm(p) != p is
wrong. While oom_reap_task() will anyway clear TIF_MEMDIE even if we set
TIF_MEMDIE on p when p->mm == NULL, it is not true for CONFIG_MMU=n case.
> mark_oom_victim(p);
> - try_oom_reaper(p);
> - task_unlock(p);
> + wake_oom_reaper(p);
> put_task_struct(p);
> return;
> }
> - task_unlock(p);
>
> if (__ratelimit(&oom_rs))
> dump_header(oc, p);
> @@ -940,14 +968,10 @@ bool out_of_memory(struct oom_control *oc)
> * If current has a pending SIGKILL or is exiting, then automatically
> * select it. The goal is to allow it to allocate so that it may
> * quickly exit and free its memory.
> - *
> - * But don't select if current has already released its mm and cleared
> - * TIF_MEMDIE flag at exit_mm(), otherwise an OOM livelock may occur.
> */
> - if (current->mm &&
> - (fatal_signal_pending(current) || task_will_free_mem(current))) {
> + if (task_will_free_mem(current)) {
Setting TIF_MEMDIE on current when current->mm == NULL and
find_lock_task_mm(current) != NULL is wrong.
> mark_oom_victim(current);
> - try_oom_reaper(current);
> + wake_oom_reaper(current);
> return true;
> }
next prev parent reply other threads:[~2016-06-09 13:18 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-09 11:52 [PATCH 0/10 -v4] Handle oom bypass more gracefully Michal Hocko
2016-06-09 11:52 ` [PATCH 01/10] proc, oom: drop bogus task_lock and mm check Michal Hocko
2016-06-09 11:52 ` [PATCH 02/10] proc, oom: drop bogus sighand lock Michal Hocko
2016-06-09 11:52 ` [PATCH 03/10] proc, oom_adj: extract oom_score_adj setting into a helper Michal Hocko
2016-06-09 11:52 ` [PATCH 04/10] mm, oom_adj: make sure processes sharing mm have same view of oom_score_adj Michal Hocko
2016-06-15 15:03 ` Oleg Nesterov
2016-06-09 11:52 ` [PATCH 05/10] mm, oom: skip vforked tasks from being selected Michal Hocko
2016-06-15 14:51 ` Oleg Nesterov
2016-06-16 6:24 ` Michal Hocko
2016-06-09 11:52 ` [PATCH 06/10] mm, oom: kill all tasks sharing the mm Michal Hocko
2016-06-09 11:52 ` [PATCH 07/10] mm, oom: fortify task_will_free_mem Michal Hocko
2016-06-09 13:18 ` Tetsuo Handa [this message]
2016-06-09 14:20 ` Michal Hocko
2016-06-11 8:10 ` Tetsuo Handa
2016-06-13 11:27 ` Michal Hocko
2016-06-16 12:54 ` Tetsuo Handa
2016-06-16 14:29 ` Michal Hocko
2016-06-16 15:40 ` Tetsuo Handa
2016-06-16 15:53 ` Michal Hocko
2016-06-17 11:38 ` Tetsuo Handa
2016-06-17 12:26 ` Michal Hocko
2016-06-17 13:12 ` Tetsuo Handa
2016-06-17 13:29 ` Michal Hocko
2016-06-09 11:52 ` [PATCH 08/10] mm, oom: task_will_free_mem should skip oom_reaped tasks Michal Hocko
2016-06-17 11:35 ` Tetsuo Handa
2016-06-17 12:56 ` Michal Hocko
2016-06-09 11:52 ` [PATCH 09/10] mm, oom_reaper: do not attempt to reap a task more than twice Michal Hocko
2016-06-15 14:48 ` Oleg Nesterov
2016-06-16 6:28 ` Michal Hocko
2016-06-09 11:52 ` [PATCH 10/10] mm, oom: hide mm which is shared with kthread or global init Michal Hocko
2016-06-09 15:15 ` Tetsuo Handa
2016-06-09 15:41 ` Michal Hocko
2016-06-16 13:15 ` Tetsuo Handa
2016-06-16 13:36 ` Tetsuo Handa
2016-06-15 14:37 ` Oleg Nesterov
2016-06-16 6:31 ` Michal Hocko
2016-06-13 11:23 ` [PATCH 0/10 -v4] Handle oom bypass more gracefully Michal Hocko
2016-06-13 14:13 ` Michal Hocko
2016-06-14 20:17 ` Oleg Nesterov
2016-06-14 20:44 ` Oleg Nesterov
2016-06-16 6:33 ` Michal Hocko
2016-06-15 15:09 ` Oleg Nesterov
2016-06-16 6:34 ` Michal Hocko
-- strict thread matches above, loose matches on Subject: below --
2016-06-20 12:43 [PATCH 0/10 -v5] " Michal Hocko
2016-06-20 12:43 ` [PATCH 07/10] mm, oom: fortify task_will_free_mem Michal Hocko
2016-06-03 9:16 [PATCH 0/10 -v3] Handle oom bypass more gracefully Michal Hocko
2016-06-03 9:16 ` [PATCH 07/10] mm, oom: fortify task_will_free_mem Michal Hocko
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=201606092218.FCC48987.MFQLVtSHJFOOFO@I-love.SAKURA.ne.jp \
--to=penguin-kernel@i-love.sakura.ne.jp \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@kernel.org \
--cc=mhocko@suse.com \
--cc=oleg@redhat.com \
--cc=rientjes@google.com \
--cc=vdavydov@parallels.com \
/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).