path: root/mm/page_alloc.c
diff options
authorDavid Rientjes <>2009-07-29 15:02:06 -0700
committerLinus Torvalds <>2009-07-29 19:10:34 -0700
commit6583bb64fc370842b32a87c67750c26f6d559af0 (patch)
tree321681ebc6ff893318d67859b24f199b9111cbc8 /mm/page_alloc.c
parente084b2d95e48b31aa45f9c49ffc6cdae8bdb21d4 (diff)
mm: avoid endless looping for oom killed tasks
If a task is oom killed and still cannot find memory when trying with no watermarks, it's better to fail the allocation attempt than to loop endlessly. Direct reclaim has already failed and the oom killer will be a no-op since current has yet to die, so there is no other alternative for allocations that are not __GFP_NOFAIL. Acked-by: Mel Gorman <> Signed-off-by: David Rientjes <> Acked-by: Hugh Dickins <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'mm/page_alloc.c')
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ae28c22a7fd..2dbb2fc6883 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1794,6 +1794,10 @@ rebalance:
if (p->flags & PF_MEMALLOC)
goto nopage;
+ /* Avoid allocations with no watermarks from looping endlessly */
+ if (test_thread_flag(TIF_MEMDIE) && !(gfp_mask & __GFP_NOFAIL))
+ goto nopage;
/* Try direct reclaim and then allocating */
page = __alloc_pages_direct_reclaim(gfp_mask, order,
zonelist, high_zoneidx,