aboutsummaryrefslogtreecommitdiffstats
path: root/mm/oom_kill.c
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2006-09-26 02:31:31 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-26 11:48:49 -0400
commitaf5b912435de32fbede08cee949429823ed49781 (patch)
treeea1de1a800c6fc60537912d4dad35a3cf211c86e /mm/oom_kill.c
parent4a3ede107e422a0c53d28024b0aa902ca22a8768 (diff)
[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: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r--mm/oom_kill.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 55a05f1ef76d..f1aba7e7b760 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -60,6 +60,12 @@ unsigned long badness(struct task_struct *p, unsigned long uptime)
60 } 60 }
61 61
62 /* 62 /*
63 * swapoff can easily use up all memory, so kill those first.
64 */
65 if (p->flags & PF_SWAPOFF)
66 return ULONG_MAX;
67
68 /*
63 * The memory size of the process is the basis for the badness. 69 * The memory size of the process is the basis for the badness.
64 */ 70 */
65 points = mm->total_vm; 71 points = mm->total_vm;
@@ -230,8 +236,6 @@ static struct task_struct *select_bad_process(unsigned long *ppoints)
230 } 236 }
231 if (p->oomkilladj == OOM_DISABLE) 237 if (p->oomkilladj == OOM_DISABLE)
232 continue; 238 continue;
233 if (p->flags & PF_SWAPOFF)
234 return p;
235 239
236 points = badness(p, uptime.tv_sec); 240 points = badness(p, uptime.tv_sec);
237 if (points > *ppoints || !chosen) { 241 if (points > *ppoints || !chosen) {