[Bug 72742] [ILK/HSW]igt/gem_tiled_swapping randomly causes OOM killer

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=72742

--- Comment #48 from Chris Wilson <chris at chris-wilson.co.uk> ---
Alternate idea,

diff --git a/mm/vmscan.c b/mm/vmscan.c
index a9c74b409681..8c2cb1150d17 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -135,6 +135,10 @@ unsigned long vm_total_pages;      /* The total number of
pages which the VM controls
 static LIST_HEAD(shrinker_list);
 static DECLARE_RWSEM(shrinker_rwsem);

+static bool throttle_direct_reclaim(gfp_t gfp_mask,
+                                   struct zonelist *zonelist,
+                                   nodemask_t *nodemask);
+
 #ifdef CONFIG_MEMCG
 static bool global_reclaim(struct scan_control *sc)
 {
@@ -1521,7 +1525,7 @@ shrink_inactive_list(unsigned long nr_to_scan, struct
lruvec *lruvec,
         * of pages under pages flagged for immediate reclaim and stall if any
         * are encountered in the nr_immediate check below.
         */
-       if (nr_writeback && nr_writeback == nr_taken)
+       if (nr_writeback > nr_taken / 2)
                zone_set_flag(zone, ZONE_WRITEBACK);

        /*
@@ -2465,6 +2469,12 @@ static unsigned long do_try_to_free_pages(struct
zonelist *zonelist,
                                                WB_REASON_TRY_TO_FREE_PAGES);
                        sc->may_writepage = 1;
                }
+
+               if (global_reclaim(sc) &&
+                   throttle_direct_reclaim(sc->gfp_mask,
+                                           zonelist,
+                                           sc->nodemask))
+                       aborted_reclaim = true;
        } while (--sc->priority >= 0 && !aborted_reclaim);

 out:

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20140408/a5512ccb/attachment.html>