From: Michal Hocko <mhocko@suse.cz>
To: LKML <linux-kernel@vger.kernel.org>
Cc: <linux-mm@kvack.org>,
linux-pm@vger.kernel.org, Tejun Heo <tj@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
"\\\"Rafael J. Wysocki\\\"" <rjw@rjwysocki.net>,
David Rientjes <rientjes@google.com>,
Oleg Nesterov <oleg@redhat.com>,
Cong Wang <xiyou.wangcong@gmail.com>
Subject: [RFC 1/2] oom: add helper for setting and clearing TIF_MEMDIE
Date: Tue, 18 Nov 2014 22:10:05 +0100 [thread overview]
Message-ID: <1416345006-8284-1-git-send-email-mhocko@suse.cz> (raw)
In-Reply-To: <20141118210833.GE23640@dhcp22.suse.cz>
This patch is just a preparatory and it doesn't introduce any functional
change.
Signed-off-by: Michal Hocko <mhocko@suse.cz>
---
include/linux/oom.h | 4 ++++
kernel/exit.c | 2 +-
mm/memcontrol.c | 2 +-
mm/oom_kill.c | 16 +++++++++++++---
4 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/include/linux/oom.h b/include/linux/oom.h
index e8d6e1058723..8f7e74f8ab3a 100644
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -47,6 +47,10 @@ static inline bool oom_task_origin(const struct task_struct *p)
return !!(p->signal->oom_flags & OOM_FLAG_ORIGIN);
}
+void mark_tsk_oom_victim(struct task_struct *tsk);
+
+void unmark_tsk_oom_victim(struct task_struct *tsk);
+
extern unsigned long oom_badness(struct task_struct *p,
struct mem_cgroup *memcg, const nodemask_t *nodemask,
unsigned long totalpages);
diff --git a/kernel/exit.c b/kernel/exit.c
index 5d30019ff953..323882973b4b 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -459,7 +459,7 @@ static void exit_mm(struct task_struct *tsk)
task_unlock(tsk);
mm_update_next_owner(mm);
mmput(mm);
- clear_thread_flag(TIF_MEMDIE);
+ unmark_tsk_oom_victim(current);
}
/*
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index d6ac0e33e150..302e0fc6d121 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1735,7 +1735,7 @@ static void mem_cgroup_out_of_memory(struct mem_cgroup *memcg, gfp_t gfp_mask,
* quickly exit and free its memory.
*/
if (fatal_signal_pending(current) || current->flags & PF_EXITING) {
- set_thread_flag(TIF_MEMDIE);
+ mark_tsk_oom_victim(current);
return;
}
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 5340f6b91312..8b6e14136f4f 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -421,6 +421,16 @@ void note_oom_kill(void)
atomic_inc(&oom_kills);
}
+void mark_tsk_oom_victim(struct task_struct *tsk)
+{
+ set_tsk_thread_flag(tsk, TIF_MEMDIE);
+}
+
+void unmark_tsk_oom_victim(struct task_struct *tsk)
+{
+ clear_thread_flag(TIF_MEMDIE);
+}
+
#define K(x) ((x) << (PAGE_SHIFT-10))
/*
* Must be called while holding a reference to p, which will be released upon
@@ -444,7 +454,7 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
* its children or threads, just set TIF_MEMDIE so it can die quickly
*/
if (p->flags & PF_EXITING) {
- set_tsk_thread_flag(p, TIF_MEMDIE);
+ mark_tsk_oom_victim(p);
put_task_struct(p);
return;
}
@@ -527,7 +537,7 @@ void oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
}
rcu_read_unlock();
- set_tsk_thread_flag(victim, TIF_MEMDIE);
+ mark_tsk_oom_victim(victim);
do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true);
put_task_struct(victim);
}
@@ -650,7 +660,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
* quickly exit and free its memory.
*/
if (fatal_signal_pending(current) || current->flags & PF_EXITING) {
- set_thread_flag(TIF_MEMDIE);
+ mark_tsk_oom_victim(current);
return;
}
--
2.1.3
next prev parent reply other threads:[~2014-11-18 21:10 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-21 7:27 [PATCH 0/4 -v2] OOM vs. freezer interaction fixes Michal Hocko
2014-10-21 7:27 ` [PATCH 1/4] freezer: Do not freeze tasks killed by OOM killer Michal Hocko
2014-10-21 12:04 ` Rafael J. Wysocki
2014-10-21 7:27 ` [PATCH 2/4] freezer: remove obsolete comments in __thaw_task() Michal Hocko
2014-10-21 12:04 ` Rafael J. Wysocki
2014-10-21 7:27 ` [PATCH 3/4] OOM, PM: OOM killed task shouldn't escape PM suspend Michal Hocko
2014-10-21 12:09 ` Rafael J. Wysocki
2014-10-21 13:14 ` Michal Hocko
2014-10-21 13:42 ` Rafael J. Wysocki
2014-10-21 14:11 ` Michal Hocko
2014-10-21 14:41 ` Rafael J. Wysocki
2014-10-21 14:29 ` Michal Hocko
2014-10-22 14:39 ` Rafael J. Wysocki
2014-10-22 14:22 ` Michal Hocko
2014-10-22 21:18 ` Rafael J. Wysocki
2014-10-26 18:49 ` Pavel Machek
2014-11-04 19:27 ` Tejun Heo
2014-11-05 12:46 ` Michal Hocko
2014-11-05 13:02 ` Tejun Heo
2014-11-05 13:31 ` Michal Hocko
2014-11-05 13:42 ` Michal Hocko
2014-11-05 14:14 ` Michal Hocko
2014-11-05 15:45 ` Michal Hocko
2014-11-05 15:44 ` Tejun Heo
2014-11-05 16:01 ` Michal Hocko
2014-11-05 16:29 ` Tejun Heo
2014-11-05 16:39 ` Michal Hocko
2014-11-05 16:54 ` Tejun Heo
2014-11-05 17:01 ` Tejun Heo
2014-11-06 13:05 ` Michal Hocko
2014-11-06 15:09 ` Tejun Heo
2014-11-06 16:01 ` Michal Hocko
2014-11-06 16:12 ` Tejun Heo
2014-11-06 16:31 ` Michal Hocko
2014-11-06 16:33 ` Tejun Heo
2014-11-06 16:58 ` Michal Hocko
2014-11-05 17:46 ` Michal Hocko
2014-11-05 17:55 ` Tejun Heo
2014-11-06 12:49 ` Michal Hocko
2014-11-06 15:01 ` Tejun Heo
2014-11-06 16:02 ` Michal Hocko
2014-11-06 16:28 ` Tejun Heo
2014-11-10 16:30 ` Michal Hocko
2014-11-12 18:58 ` [RFC 0/4] OOM vs PM freezer fixes Michal Hocko
2014-11-12 18:58 ` [RFC 1/4] OOM, PM: Do not miss OOM killed frozen tasks Michal Hocko
2014-11-14 17:55 ` Tejun Heo
2014-11-12 18:58 ` [RFC 2/4] OOM, PM: make OOM detection in the freezer path raceless Michal Hocko
2014-11-12 18:58 ` [RFC 3/4] OOM, PM: handle pm freezer as an OOM victim correctly Michal Hocko
2014-11-12 18:58 ` [RFC 4/4] OOM: thaw the OOM victim if it is frozen Michal Hocko
2014-11-14 20:14 ` [RFC 0/4] OOM vs PM freezer fixes Tejun Heo
2014-11-18 21:08 ` Michal Hocko
2014-11-18 21:10 ` Michal Hocko [this message]
2014-11-18 21:10 ` [RFC 2/2] OOM, PM: make OOM detection in the freezer path raceless Michal Hocko
2014-11-27 0:47 ` Rafael J. Wysocki
2014-12-02 22:08 ` Tejun Heo
2014-12-04 14:16 ` Michal Hocko
2014-12-04 14:44 ` Tejun Heo
2014-12-04 16:56 ` Michal Hocko
2014-12-04 17:18 ` Michal Hocko
2014-12-05 16:41 ` [PATCH 0/4] OOM vs PM freezer fixes Michal Hocko
2014-12-05 16:41 ` [PATCH -v2 1/5] oom: add helpers for setting and clearing TIF_MEMDIE Michal Hocko
2014-12-06 12:56 ` Tejun Heo
2014-12-07 10:13 ` Michal Hocko
2015-01-07 17:57 ` Tejun Heo
2015-01-07 18:23 ` Michal Hocko
2014-12-05 16:41 ` [PATCH -v2 2/5] OOM: thaw the OOM victim if it is frozen Michal Hocko
2014-12-06 13:06 ` Tejun Heo
2014-12-07 10:24 ` Michal Hocko
2014-12-07 10:45 ` Michal Hocko
2014-12-07 13:59 ` Tejun Heo
2014-12-07 18:55 ` Michal Hocko
2014-12-05 16:41 ` [PATCH -v2 3/5] PM: convert printk to pr_* equivalent Michal Hocko
2014-12-05 22:40 ` Rafael J. Wysocki
2014-12-07 10:26 ` Michal Hocko
2014-12-06 13:08 ` Tejun Heo
2014-12-05 16:41 ` [PATCH -v2 4/5] sysrq: " Michal Hocko
2014-12-06 13:09 ` Tejun Heo
2014-12-05 16:41 ` [PATCH -v2 5/5] OOM, PM: make OOM detection in the freezer path raceless Michal Hocko
2014-12-06 13:11 ` Tejun Heo
2014-12-07 10:11 ` Michal Hocko
2015-01-07 18:41 ` Tejun Heo
2015-01-07 18:48 ` Michal Hocko
2015-01-08 11:51 ` Michal Hocko
2014-12-07 10:09 ` [PATCH 0/4] OOM vs PM freezer fixes Michal Hocko
2014-12-07 13:55 ` Tejun Heo
2014-12-07 19:00 ` Michal Hocko
2014-12-18 16:27 ` Michal Hocko
2014-11-05 14:55 ` [PATCH 3/4] OOM, PM: OOM killed task shouldn't escape PM suspend Michal Hocko
2014-10-26 18:40 ` Pavel Machek
2014-10-21 7:27 ` [PATCH 4/4] PM: convert do_each_thread to for_each_process_thread Michal Hocko
2014-10-21 12:10 ` Rafael J. Wysocki
2014-10-21 13:19 ` Michal Hocko
2014-10-21 13:43 ` Rafael J. Wysocki
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=1416345006-8284-1-git-send-email-mhocko@suse.cz \
--to=mhocko@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-pm@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=rientjes@google.com \
--cc=rjw@rjwysocki.net \
--cc=tj@kernel.org \
--cc=xiyou.wangcong@gmail.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).