lkml.org 
[lkml]   [2006]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2] mm: avoid unnecessary looping in out_of_memory()
Date
I see no reason to loop in out_of_memory().  If oom_kill_process()
returns 1, this may be because the task that select_bad_process()
chose is now exiting (and therefore oom_kill_task() found the ->mm
pointer of the chosen task to be NULL). out_of_memory() may as well
return to its caller, perhaps avoiding the need to shoot a process.
If the memory issues are still not resolved, out_of_memory() will be
called again so there's no reason to loop.

Signed-Off-By: David S. Peterson <dsp@llnl.gov>
---
This patch applies to kernel 2.6.17-rc2-git7 (after applying patch
1/2).

Index: git7-oom/mm/oom_kill.c
===================================================================
--- git7-oom.orig/mm/oom_kill.c 2006-04-25 16:21:48.000000000 -0700
+++ git7-oom/mm/oom_kill.c 2006-04-25 16:21:59.000000000 -0700
@@ -374,7 +374,6 @@ void out_of_memory(struct zonelist *zone
break;

case CONSTRAINT_NONE:
-retry:
/*
* Rambo mode: Shoot down a process and hope it solves whatever
* issues we may have.
@@ -393,9 +392,7 @@ retry:
panic("Out of memory and no killable processes...\n");
}

- if (oom_kill_process(p, points, "Out of memory"))
- goto retry;
-
+ cancel = oom_kill_process(p, points, "Out of memory");
break;
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2006-04-26 02:05    [W:0.021 / U:0.536 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site