The patch titled
Subject: oom, oom_reaper: protect oom_reaper_list using simpler way
has been added to the -mm tree. Its filename is
oom-oom_reaper-protect-oom_reaper_list-using-simpler-way.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/oom-oom_reaper-protect-oom_reaper_list-using-simpler-way.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/oom-oom_reaper-protect-oom_reaper_list-using-simpler-way.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Subject: oom, oom_reaper: protect oom_reaper_list using simpler way
"oom, oom_reaper: disable oom_reaper for oom_kill_allocating_task" tried
to protect oom_reaper_list using MMF_OOM_KILLED flag. But we can do it by
simply checking tsk->oom_reaper_list != NULL.
Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/sched.h | 2 --
mm/oom_kill.c | 8 ++------
2 files changed, 2 insertions(+), 8 deletions(-)
diff -puN include/linux/sched.h~oom-oom_reaper-protect-oom_reaper_list-using-simpler-way include/linux/sched.h
--- a/include/linux/sched.h~oom-oom_reaper-protect-oom_reaper_list-using-simpler-way
+++ a/include/linux/sched.h
@@ -512,8 +512,6 @@ static inline int get_dumpable(struct mm
#define MMF_HAS_UPROBES 19 /* has uprobes */
#define MMF_RECALC_UPROBES 20 /* MMF_HAS_UPROBES can be wrong */
-#define MMF_OOM_KILLED 21 /* OOM killer has chosen this mm */
-
#define MMF_INIT_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK)
struct sighand_struct {
diff -puN mm/oom_kill.c~oom-oom_reaper-protect-oom_reaper_list-using-simpler-way mm/oom_kill.c
--- a/mm/oom_kill.c~oom-oom_reaper-protect-oom_reaper_list-using-simpler-way
+++ a/mm/oom_kill.c
@@ -542,7 +542,7 @@ static int oom_reaper(void *unused)
static void wake_oom_reaper(struct task_struct *tsk)
{
- if (!oom_reaper_th)
+ if (!oom_reaper_th || tsk->oom_reaper_list)
return;
get_task_struct(tsk);
@@ -676,7 +676,7 @@ void oom_kill_process(struct oom_control
unsigned int victim_points = 0;
static DEFINE_RATELIMIT_STATE(oom_rs, DEFAULT_RATELIMIT_INTERVAL,
DEFAULT_RATELIMIT_BURST);
- bool can_oom_reap;
+ bool can_oom_reap = true;
/*
* If the task is already exiting, don't alarm the sysadmin or kill
@@ -738,10 +738,6 @@ void oom_kill_process(struct oom_control
/* Get a reference to safely compare mm after task_unlock(victim) */
mm = victim->mm;
atomic_inc(&mm->mm_count);
-
- /* Make sure we do not try to oom reap the mm multiple times */
- can_oom_reap = !test_and_set_bit(MMF_OOM_KILLED, &mm->flags);
-
/*
* We should send SIGKILL before setting TIF_MEMDIE in order to prevent
* the OOM victim from depleting the memory reserves from the user
_
Patches currently in -mm which might be from penguin-kernel@xxxxxxxxxxxxxxxxxxx are
kernel-hung_taskc-use-timeout-diff-when-timeout-is-updated.patch
oom-oom_reaper-protect-oom_reaper_list-using-simpler-way.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
