From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-mm@kvack.org, Michal Hocko <mhocko@suse.com>,
Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Subject: [PATCH 4/4] mm, oom: Respect oom_task_origin() even if oom_kill_allocating_task case.
Date: Wed, 22 May 2019 19:08:06 +0900 [thread overview]
Message-ID: <1558519686-16057-4-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp> (raw)
In-Reply-To: <1558519686-16057-1-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp>
Currently oom_kill_allocating_task path ignores oom_task_origin() tasks.
But since oom_task_origin() is used for "notify me first using SIGKILL
(because I'm likely the culprit for this situation)", respect it.
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
---
mm/oom_kill.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 64e582e..bdd90b5 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -380,7 +380,8 @@ static const char *select_bad_process(struct oom_control *oc)
if (oom_evaluate_task(p, oc))
break;
rcu_read_unlock();
- if (sysctl_oom_kill_allocating_task && oc->chosen != (void *)-1UL) {
+ if (sysctl_oom_kill_allocating_task && oc->chosen != (void *)-1UL &&
+ oc->chosen_points != ULONG_MAX) {
list_for_each_entry(p, &oom_candidate_list,
oom_candidate_list) {
if (!same_thread_group(p, current))
--
1.8.3.1
next prev parent reply other threads:[~2019-05-22 10:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 10:08 [PATCH 1/4] mm, oom: Remove redundant OOM score normalization at select_bad_process() Tetsuo Handa
2019-05-22 10:08 ` [PATCH 2/4] mm, oom: Avoid potential RCU stall at dump_tasks() Tetsuo Handa
2019-05-22 10:08 ` [PATCH 3/4] mm, oom: Wait for OOM victims even if oom_kill_allocating_task case Tetsuo Handa
2019-05-22 10:08 ` Tetsuo Handa [this message]
2019-05-23 22:04 ` [PATCH 5/4] mm, oom: Deduplicate memcg candidates at select_bad_process() Tetsuo Handa
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=1558519686-16057-4-git-send-email-penguin-kernel@I-love.SAKURA.ne.jp \
--to=penguin-kernel@i-love.sakura.ne.jp \
--cc=akpm@linux-foundation.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.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).