From: Nick Piggin PF_SWAPOFF processes currently cause select_bad_process to return straight away. Instead, give them high priority, so we will kill them first, however we also first ensure no parallel OOM kills are happening at the same time. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton --- mm/oom_kill.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff -puN mm/oom_kill.c~oom-swapoff-tasks-tweak mm/oom_kill.c --- a/mm/oom_kill.c~oom-swapoff-tasks-tweak +++ a/mm/oom_kill.c @@ -60,6 +60,12 @@ unsigned long badness(struct task_struct } /* + * swapoff can easily use up all memory, so kill those first. + */ + if (p->flags & PF_SWAPOFF) + return ULONG_MAX; + + /* * The memory size of the process is the basis for the badness. */ points = mm->total_vm; @@ -230,8 +236,6 @@ static struct task_struct *select_bad_pr } if (p->oomkilladj == OOM_DISABLE) continue; - if (p->flags & PF_SWAPOFF) - return p; points = badness(p, uptime.tv_sec); if (points > *ppoints || !chosen) { _