Commit af5b9124 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Linus Torvalds
Browse files

[PATCH] oom: swapoff tasks tweak 



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: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4a3ede10

mm/oom_kill.c

+6 −2
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) 
		return 0;

	}



	/*

	 * 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.

	 */
@@ -230,8 +236,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints) 
		}

		if (p->oomkilladj == OOM_DISABLE)

			continue;

		if (p->flags & PF_SWAPOFF)

			return p;



		points = badness(p, uptime.tv_sec);

		if (points > *ppoints || !chosen) {